Commit Graph

4835 Commits

Author SHA1 Message Date
Adria Navarro ef914882d4 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-07 19:06:33 +01:00
Martin McKeaveney 5dd6c40a29
Merge branch 'master' into fix/update-bull-queue-parameters 2023-11-06 18:02:49 +00:00
Adria Navarro bdd33ac2f5 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 15:59:36 +01:00
Adria Navarro 004e0a5f11 Update jest 2023-11-06 14:24:33 +01:00
mike12345567 86f7bd192f Moving audit log init to be part of the server startup. 2023-11-03 14:55:56 +00:00
Andrew Kingston 1146f7e19a Merge branch 'new-branding' of github.com:Budibase/budibase into new-branding 2023-10-31 13:59:47 +00:00
Andrew Kingston 7c1f71745e Update email link and button colours and sort apps in portal side bar 2023-10-31 13:58:59 +00:00
Andrew Kingston c73117e336
Merge branch 'master' into new-branding 2023-10-31 13:56:44 +00:00
Andrew Kingston e8f5980905 Update images in emails, readme and a few other usages 2023-10-31 11:13:19 +00:00
Adria Navarro 18b8d6d3ef Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-31 09:55:30 +01:00
Adria Navarro a80ea2f2c0 Clean scripts 2023-10-30 14:38:26 +01:00
Adria Navarro 24eed537ed Fix timeouts 2023-10-30 12:00:55 +01:00
Adria Navarro b0ef79bbd9 Build for both amd and arm platforms 2023-10-30 11:36:32 +01:00
Adria Navarro 725e3aa4ef Use image v2 on build:docker 2023-10-30 10:11:06 +01:00
Adria Navarro 7b7dc84a8e Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 16:05:43 +02:00
Adria Navarro 6abb1b5f70 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 10:57:07 +02:00
Sam Rose 5a80487c77
Fix redirect loop when accessing a group as a global builder but not an admin. 2023-10-26 17:54:26 +01:00
Adria Navarro 8db0ff79a6 Increase yarn timeouts 2023-10-26 12:44:52 +02:00
Adria Navarro 453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Adria Navarro d1f0e8fca0 Fix tests 2023-10-20 17:53:40 +02:00
Adria Navarro e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
Adria Navarro 5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro 9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
mike12345567 8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01:00
mike12345567 04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Adria Navarro 56ae857d49 Add version to dev .env 2023-10-20 16:21:48 +02:00
Adria Navarro 6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Adria Navarro 63a26ac823 Fix dependencies 2023-10-19 11:16:52 +02:00
Adria Navarro 3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
Adria Navarro ba053490dc Npm-less images 2023-10-18 16:08:54 +02:00
Sam Rose f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files 2023-10-18 11:45:52 +01:00
Adria Navarro 3fd2973152 Remove sentry packages 2023-10-18 10:51:09 +02:00
Adria Navarro ea1853c78c Remove sentry from the backend 2023-10-18 10:51:09 +02:00
Adria Navarro ac9c99aebc Remove sentry packages 2023-10-18 10:50:18 +02:00
Adria Navarro 0b1bfdee6b Remove sentry from the backend 2023-10-18 10:49:15 +02:00
Adria Navarro dd526c92e6 Unify supertest 2023-10-18 10:49:15 +02:00
Adria Navarro 0f862088d2 Unify lodash 2023-10-18 10:49:15 +02:00
Adria Navarro c9b7c861f4 Unify packages 2023-10-18 10:49:15 +02:00
Sam Rose 767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
Adria Navarro 26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
mike12345567 bd182d5b3b Test cases for updated API. 2023-10-12 19:19:05 +01:00
mike12345567 16d551542e Frontend component of updating the API and accounting for default value not being in the paginated results of the relationship picker. 2023-10-12 19:00:53 +01:00
mike12345567 7b8e23eb82 Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache 2023-10-12 11:08:12 +01:00
mike12345567 f1b73058c2 Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:49:39 +01:00
mike12345567 ff89a15eea Updating jest types - old version was causing some weird errors in Webstorm. 2023-10-10 18:12:28 +01:00
Adria Navarro 16752bb437 More cleanups 2023-10-03 22:37:00 +02:00
Adria Navarro 429530a34d Clean predocker steps 2023-10-03 19:55:23 +02:00
Adria Navarro 62e1a12fe4 Log errors on retry 2023-10-02 13:01:25 +02:00
Martin McKeaveney 65af2ed7c2 backmerge from master 2023-09-27 17:06:57 +01:00
Adria Navarro 41c56217c4 Merge branch 'develop' into chore/clean_unused_dependencies 2023-09-26 18:30:39 +02:00
Adria Navarro f600ad7711 Editing scripts 2023-09-26 18:08:37 +02:00
Adria Navarro c68cfc5042 Remove unused devDependencies on worker 2023-09-26 16:37:10 +02:00
Adria Navarro 7feaf58f7f Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro aee590bbba Update lint 2023-09-25 09:42:48 +02:00
Martin McKeaveney 6d4e3082e3 type tidy up and lint 2023-09-24 22:07:40 +01:00
Martin McKeaveney b979b29313 e2e secure microsoft auth 2023-09-23 00:10:12 +01:00
Adria Navarro 02ab0a134e Update ts to 5.x 2023-09-22 18:17:19 +02:00
mike12345567 5f82b79d40 Removing test logs. 2023-09-14 11:42:04 +01:00
mike12345567 26c6393f06 Adding retries to 409 test. 2023-09-14 11:11:05 +01:00
mike12345567 4ca9ea97b6 Get server/worker tests to run. 2023-09-14 10:55:41 +01:00
Adria Navarro 3b69acc166 Merge branch 'develop' into update-node-types 2023-09-07 19:50:39 +02:00
Michael Drury fe39bdfbfb Merge branch 'develop' into fix/shared-core-dev 2023-09-07 16:33:05 +01:00
Adria Navarro 7bd91ebb7f Fix 2023-09-07 16:25:13 +02:00
Adria Navarro 205d33f172 Clean cypress refs 2023-09-07 15:37:22 +02:00
Adria Navarro f691987e65 Update node types 2023-09-07 11:21:41 +02:00
mike12345567 c361588bd4 Updating the yarn dev process to not include a removal of the dist directory as part of the streamed watchers - this seems to create a problem for shared core and moving this up a level to a parallel run before the watchers massively improves stability. 2023-09-06 18:17:44 +01:00
Peter Clement 70c71c13bf remove redudant delete 2023-09-05 12:20:39 +01:00
Peter Clement c16fd53b0a add developer label back and improve invite flow 2023-09-05 09:58:05 +01:00
Peter Clement 6d3a7727eb fixes for perr app builder and refactoring based on comments 2023-09-05 09:25:06 +01:00
Peter Clement 24abd91600 Fix issue around adding of admin users 2023-09-04 09:37:10 +01:00
Peter Clement ddf9e734f4 pr comments and bug fixes 2023-08-31 10:36:27 +01:00
Peter Clement 7c8914207b fix invite user flow 2023-08-30 16:43:24 +01:00
Peter Clement 8b8bce186c builder side panel changes to support inviting creators 2023-08-29 14:41:56 +01:00
mike12345567 67104d7cb3 Quick hacks to try and help with the stability of some failing tests. 2023-08-23 18:05:58 +01:00
mike12345567 11f56c2632 Updating error message in test. 2023-08-23 15:22:25 +01:00
Michael Drury 5a00b87343 Merge branch 'develop' into feature/group-per-app-builders 2023-08-23 15:07:45 +01:00
mike12345567 cad787a909 Removing old docker-compose.test.yaml that was causing flakiness and getting worker using mock redis. 2023-08-23 15:07:12 +01:00
mike12345567 656870db8b Adding last of support for per app group builder support, enriching the user on self return, as well as adding the functionality required to server middlewares. 2023-08-22 18:14:08 +01:00
Adria Navarro 5dca30986e Merge branch 'develop' into chore/fix_os_contributor 2023-08-21 10:27:22 +03:00
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