1
0
Fork 0
mirror of synced 2024-08-08 14:48:13 +12:00
Commit graph

4701 commits

Author SHA1 Message Date
mike12345567
7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567
ba5e390b3f Quick PR comments. 2023-08-17 17:44:59 +01:00
mike12345567
95b8a4ea10 Adding feature flagging, the option to only start the automations, or the API, meaning we can split the service if needed. 2023-08-17 16:39:25 +01:00
Adria Navarro
5b29e879a4 Fix dev when no pro loaded 2023-08-10 16:03:37 +03:00
mike12345567
33257db010 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-09 11:39:46 +01:00
melohagan
a5fb25e41e Allow null for firstName and lastName (#11482) 2023-08-09 10:38:04 +01:00
Adria Navarro
12d6911ae3 Update docker images to 18.x 2023-08-07 14:38:16 +03:00
Adria Navarro
1ef8d118cb Remove unnecessary package.json/gitHead 2023-08-02 12:04:54 +02:00
Adria Navarro
fcba916f0c Add bail in jest 2023-08-02 11:25:52 +02:00
Adria Navarro
c279849340 Fix orders on server/worker 2023-08-02 10:17:58 +02:00
Adria Navarro
4b5751003f Revert "Remove composite"
This reverts commit f9115f1554bbadadc3a0ef91d00d170fa05e45b6.
2023-08-01 19:23:48 +02:00
Adria Navarro
5347504c12 Fix nodemon watch 2023-08-01 19:23:31 +02:00
Adria Navarro
250a4e890f Remove composite 2023-08-01 19:23:23 +02:00
Adria Navarro
e011ccd0c4 Merge branch 'develop' into chore/typecheck_tests 2023-08-01 16:49:06 +01:00
Adria Navarro
96c598688f Run tests checks for worker 2023-08-01 12:52:12 +02:00
Adria Navarro
202963c864 Fix type tests 2023-08-01 12:52:12 +02:00
mike12345567
dce38908c9 PR comments (backend). 2023-08-01 10:56:47 +01:00
mike12345567
7a74ce98f1 Moving user functions in UserDB to fully static as none of the class properties ever change - simplifying currying. 2023-07-31 18:46:21 +01:00
mike12345567
31f9693185 Quick update to SCIM now that user functionality is available from backend-core. 2023-07-31 17:10:27 +01:00
mike12345567
8522cb94d3 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-28 17:10:43 +01:00
Adria Navarro
6d5eef4e42 Update 2023-07-28 17:11:48 +02:00
Adria Navarro
d332c30b58 Remove ts-jest 2023-07-28 17:11:48 +02:00
Adria Navarro
baf1c1ff07 Update swc deps 2023-07-28 17:11:48 +02:00
Adria Navarro
95f66ebd9d Fix types 2023-07-28 17:11:48 +02:00
Adria Navarro
5f1565886f Unify jest 2023-07-28 17:11:48 +02:00
mike12345567
72438f531d Update for worker, get builder endpoints working for app builders. 2023-07-28 15:39:59 +01:00
mike12345567
1403bf26c6 Quick fixes based on raising PR, types and tests. 2023-07-28 13:58:20 +01:00
mike12345567
454f832b75 Updates after running through tests, adding mocking of app builders feature for test cases to work. 2023-07-28 12:58:05 +01:00
mike12345567
2080126da2 Final cleanup when running services. 2023-07-27 18:58:09 +01:00
mike12345567
c8712eda00 Fixing some missing functions. 2023-07-27 18:53:58 +01:00
mike12345567
812f1af5ca Moving app builder API into pro, along with the changes involved with achieving this. 2023-07-27 18:46:55 +01:00
mike12345567
d8f50f139e Frontend update for app builders, handling when in the builder portal and don't have any app access, as well as allowing viewing of apps from the portal. 2023-07-27 17:52:56 +01:00
mike12345567
eefac0fe08 Quick updates based on latest lerna version, as well as some fixes after running through flows (post refactoring). 2023-07-26 18:13:18 +01:00
mike12345567
64a5426d36 Updates to remove app builder concept, denying access to app creation for app builders. 2023-07-26 17:32:21 +01:00
mike12345567
c277b065db Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:40:17 +01:00
mike12345567
8253ad0a2e Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:24:29 +01:00
Adria Navarro
de0f3f7463 Merge branch 'develop' into backmerge-master-20230726 2023-07-26 12:50:52 +01:00
Adria Navarro
2e54b40d55 Build backend-core before dev script 2023-07-26 12:48:33 +02:00
mike12345567
43bfb943a3 Some fixes post testing. 2023-07-25 18:52:59 +01:00
mike12345567
66fbdfe4e8 Breaking out pro components back into the worker user SDK, and attempting to separate the pro components as much as possible from the user SDK itself, so that it can be easily re-created in other services. 2023-07-25 18:39:40 +01:00
mike12345567
90371b9d69 Refactoring users core to move into backend, allowing app builder endpoints to move into pro. 2023-07-25 17:48:57 +01:00
Rory Powell
8590f865b5 Merge branch 'master' into merge-master 2023-07-25 15:32:16 +01:00
Rory Powell
a477feaada Lint 2023-07-25 14:14:24 +01:00
Rory Powell
143e6597db Fix issues with tests when running with pro from npm 2023-07-25 13:18:56 +01:00
mike12345567
d9c8e26f65 Re-writing APIs based on most recent discussion about RBAC and per app builders. 2023-07-24 18:29:46 +01:00
mike12345567
c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
Rory Powell
5c4d29e349 Merge branch 'develop' into feature/offline-license 2023-07-24 10:06:04 +01:00
mike12345567
87d80e08f5 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-21 17:34:27 +01:00
Rory Powell
797f281f6d OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-20 21:24:40 +01:00
Rory Powell
55efb6e618 fix pro mock 2023-07-20 21:24:40 +01:00
Rory Powell
c8fc67d230 Lint 2023-07-20 21:24:19 +01:00
Rory Powell
34d9f1c4f8 Request / response renames 2023-07-20 21:22:54 +01:00
Rory Powell
90e869dc04 /api/global/license/offline/identifier API 2023-07-20 21:21:39 +01:00
Rory Powell
c0568b9153 api / license.spec.ts updates 2023-07-20 21:21:39 +01:00
Rory Powell
20c87b44b1 Allow pro to be mocked in worker 2023-07-20 21:21:39 +01:00
Rory Powell
6c3d01375b Move license keys to their own module 2023-07-20 21:21:39 +01:00
Rory Powell
7c18a7a443 db / licenseInfo.spec.ts 2023-07-20 21:21:39 +01:00
Rory Powell
8e2a551a15 Be more explicit about offline license vs offline license token 2023-07-20 21:21:39 +01:00
Rory Powell
0e80766125 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-20 21:21:39 +01:00
Rory Powell
6aeb31c355 Move OFFLINE_MODE to backend-core environment 2023-07-20 21:21:39 +01:00
Rory Powell
5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
mike12345567
85dea47a31 Moving user admin/builder functions to shared-core for frontend to use. 2023-07-19 16:19:34 +01:00
mike12345567
39746e0bf0 Main body of work to handle the new approach of per app builders support. 2023-07-18 16:57:48 +01:00
Andrew Kingston
cd8414e6a1 Fix getting started checklist links 2023-07-18 16:14:59 +01:00
mike12345567
e30509c4f9 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-18 11:32:38 +01:00
Adria Navarro
2698e47ec4 Type internal db.get 2023-07-18 11:41:51 +02:00
Rory Powell
22b2edb2bf OpenAPI 3.0 docs for offline license and license key endpoints 2023-07-17 20:55:26 +01:00
mike12345567
a04443c059 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-17 18:06:04 +01:00
Rory Powell
31422cd3ec fix pro mock 2023-07-14 20:56:50 +01:00
Rory Powell
4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Adria Navarro
6e2a8e0ab9 Rename .log extensions 2023-07-11 13:09:51 +02:00
Adria Navarro
0b5717cde5 Renamings 2023-07-11 10:44:10 +02:00
Adria Navarro
fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Adria Navarro
b64ea43d20 System logs only for self hosted 2023-07-11 10:44:10 +02:00
Adria Navarro
bb28d09eab Add logs endpoint 2023-07-11 10:44:09 +02:00
Rory Powell
7c4fe15781 Request / response renames 2023-07-10 16:12:19 +01:00
Rory Powell
574c361f6b /api/global/license/offline/identifier API 2023-07-08 13:07:10 +01:00
Rory Powell
7831579e98 api / license.spec.ts updates 2023-07-07 21:15:40 +01:00
Rory Powell
19d3e12177 Allow pro to be mocked in worker 2023-07-07 16:55:11 +01:00
Rory Powell
1fa5cd519c Move license keys to their own module 2023-07-07 11:48:12 +01:00
Rory Powell
700d8131d1 db / licenseInfo.spec.ts 2023-07-07 11:34:10 +01:00
Rory Powell
d02f474fd1 Be more explicit about offline license vs offline license token 2023-07-06 21:26:46 +01:00
Rory Powell
efe53bb217 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-06 20:46:25 +01:00
Rory Powell
586bca16d0 Move OFFLINE_MODE to backend-core environment 2023-07-06 20:44:48 +01:00
mike12345567
6d24a30d91 Basic refactor work, the types required for the new API endpoints. 2023-07-05 18:28:04 +01:00
Adria Navarro
f2d41addbd Unify prettier 2023-06-28 14:33:51 +01:00
Michael Drury
f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Dean
eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567
8882801315 Fixing lookup of custom role by ID in test case. 2023-06-26 17:01:50 +01:00
Dean
8f9a1d4bba PR feedback 2023-06-26 10:23:57 +01:00
Dean
10108fb543 Null checking logo configs 2023-06-26 10:22:03 +01:00
Dean
6f24772f49 PR Feedback 2023-06-23 16:40:40 +01:00
Dean
ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
Adria Navarro
2f548d834f Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-23 10:43:57 +01:00
mike12345567
38be94fa07 Fix for test case. 2023-06-20 12:36:05 +01:00
Adria Navarro
50d082c385 Merge branch 'develop' into chore/refactor_pro_as_package 2023-06-20 11:14:05 +01:00
mike12345567
3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
Michael Drury
c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
Adria Navarro
acfe69a3d5 Remove the doble deep format references 2023-06-19 18:34:51 +01:00
mike12345567
289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00