Commit Graph

3461 Commits

Author SHA1 Message Date
Adria Navarro 9c460424a9 Merge branch 'master' into BUDI-8270/validation-for-search-api
# Conflicts:
#	packages/server/package.json
#	packages/server/src/api/controllers/row/index.ts
#	packages/server/src/api/routes/tests/search.spec.ts
#	yarn.lock
2024-11-20 18:11:49 +01:00
mike12345567 f7c89fd20a Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-11-20 17:04:35 +00:00
Adria Navarro ed6d434843 Fix 2024-11-20 16:14:03 +01:00
mike12345567 2da873c6a1 Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-11-20 15:02:06 +00:00
Adria Navarro 414d79d73c Fix types 2024-11-20 14:16:26 +01:00
Adria Navarro 8519cfc495 Fix typing 2024-11-20 14:05:57 +01:00
Adria Navarro 0d5bac67db Merge branch 'master' into BUDI-8270/validation-for-search-api 2024-11-20 13:59:16 +01:00
Martin McKeaveney 803247f87b lint 2024-11-20 12:15:23 +00:00
Martin McKeaveney d0ad87d504 revert curlconverter 2024-11-20 11:40:53 +00:00
Martin McKeaveney 79c515e57d types 2024-11-19 19:02:22 +00:00
Adria Navarro 4445ef89a9 Merge branch 'master' into security-updates 2024-11-19 18:49:47 +01:00
Martin McKeaveney c563bb64b5 remove snowflake-promise lib, update curlconverter to use dynamic import 2024-11-19 14:54:06 +00:00
Sam Rose 62297fbbfc
Fix mongo query tests. 2024-11-19 11:45:25 +00:00
mike12345567 895d109f41 Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-11-18 14:05:55 +00:00
Adria Navarro 2dee07c2bb
Merge branch 'master' into chore/sqs-always-on 2024-11-18 10:29:09 +01:00
mike12345567 cdf7cb9fab Final update to view mapping and typing. 2024-11-15 17:54:14 +00:00
mike12345567 82c7c089cb Updating schema. 2024-11-15 17:24:21 +00:00
Martin McKeaveney f72809a30a
Merge branch 'master' into csp-updates 2024-11-15 14:55:23 +00:00
Adria Navarro e9d7e28196
Merge branch 'master' into chore/sqs-always-on 2024-11-12 09:46:48 +01:00
Martin McKeaveney 1543e6dc2b env variable for turning off csp 2024-11-10 13:08:51 +00:00
mike12345567 ce529d2f45 Some final updates to view public API, adding test cases. 2024-11-08 18:04:53 +00:00
Martin McKeaveney 9996fc7f12 CSP nonce E2E 2024-11-08 17:40:29 +00:00
mike12345567 a1c319a5d1 Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-11-08 17:16:46 +00:00
andz-bb 33656a4ae5 prevent attachment column updates when importing budibase templates 2024-11-08 14:04:51 +00:00
mike12345567 ff410c1857 Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-11-07 14:18:38 +00:00
Adria Navarro 0a678016b3
Merge branch 'master' into chore/sqs-always-on 2024-11-05 10:35:41 +01:00
Martin McKeaveney 7b867abd19 flag ai with feature flags correctly 2024-11-04 22:15:41 +00:00
Adria Navarro 6b98ec0e22
Merge branch 'master' into chore/sqs-always-on 2024-11-04 17:06:40 +01:00
Adria Navarro 476ffd3336 Fix enrichment when having AI columns 2024-11-04 16:16:20 +01:00
Adria Navarro 7235fd9d5c Merge from master 2024-11-04 10:25:38 +01:00
mike12345567 b3ee266023 Adding test case for creation, updating validator. 2024-11-01 17:53:26 +00:00
mike12345567 583100c9dc Merge branch 'v3-ui' of github.com:Budibase/budibase into views-openapi 2024-11-01 14:58:29 +00:00
mike12345567 23f2df938e Removing un-necessary statement. 2024-11-01 14:31:33 +00:00
mike12345567 c72ca658b9 Fixing an issue with sample data being added to an app due to the changes to bulk import. 2024-11-01 14:30:14 +00:00
mike12345567 9d85661893 Finishing specs to explain how to configure a calculation view. 2024-10-31 17:42:46 +00:00
Sam Rose 6f92b395af
Merge branch 'v3-ui' into fix-flaky-export-test 2024-10-31 17:39:46 +00:00
Sam Rose 78554bdc7c
Fix flaky export test. 2024-10-31 17:16:06 +00:00
mike12345567 cf84191995 Merge branch 'v3-ui' of github.com:Budibase/budibase into views-openapi 2024-10-31 16:35:25 +00:00
Sam Rose f58fbc313d
Merge branch 'v3-ui' into error-on-bulkimporting-relationship-fields 2024-10-31 15:14:13 +00:00
Martin McKeaveney df8ec413f5
Merge pull request #14918 from Budibase/ai-fixes
Ai fixes
2024-10-31 14:42:46 +00:00
Michael Drury ee9a39acf5
Merge branch 'v3-ui' into error-on-bulkimporting-relationship-fields 2024-10-31 14:41:42 +00:00
mike12345567 ae82c9bae5 Merge branch 'v3-ui' of github.com:Budibase/budibase into views-openapi 2024-10-31 14:34:12 +00:00
mike12345567 91528ca525 Merge branch 'v3-ui' of github.com:Budibase/budibase into views-openapi 2024-10-31 14:23:00 +00:00
Martin McKeaveney 3b31559915
Merge branch 'v3-ui' into ai-fixes 2024-10-31 14:08:34 +00:00
Sam Rose 945cf52f02
Allow fields on count calculations. 2024-10-31 11:54:31 +00:00
Adria Navarro 20ed18a0e2
Merge branch 'master' into v3-ui 2024-10-31 10:14:41 +01:00
Sam Rose 920953a4ee
Throw an error when attempting to bulkImport a relationship field into an internal table. It doesn't work yet. 2024-10-30 17:50:04 +00:00
mike12345567 dc1389b8fb PR comment and linting. 2024-10-30 17:39:48 +00:00
Sam Rose b504f77d0f
Fix view calculations when relationships are present. 2024-10-30 17:32:49 +00:00
mike12345567 e235de54ad Fixing an issue with serving the builder, increased error rate due to requests that hit the / endpoint, these were 500ing due to a lack of app ID. 2024-10-30 17:32:39 +00:00
mike12345567 037a33dc7d Updating specs to correct some issues with app ID. 2024-10-30 17:12:48 +00:00
mike12345567 dd0764eb60 Putting view mapping in place, updating openAPI spec. 2024-10-30 14:08:03 +00:00
Martin McKeaveney d9b685811d lint 2024-10-30 11:32:54 +00:00
Martin McKeaveney b06074128f unit test to cover 2024-10-30 11:27:49 +00:00
mike12345567 c055e2ae72 Adding fetch endpoint for views (will be used by search for views in Public API). 2024-10-28 18:09:04 +00:00
Adria Navarro 5cf0e334c2
Merge branch 'master' into v3-ui 2024-10-28 16:37:17 +01:00
mike12345567 6fe4f16845 Merge branch 'master' of github.com:Budibase/budibase into views-openapi 2024-10-28 14:19:29 +00:00
Adria Navarro d36b810efc Fix flakiness 2024-10-28 14:28:53 +01:00
Adria Navarro 641ceea92e Fix checks 2024-10-28 13:57:53 +01:00
Adria Navarro d944e3a8f9 Cleanup 2024-10-28 13:53:44 +01:00
Adria Navarro 95de01c86c Simplifying lookups 2024-10-28 13:17:07 +01:00
mike12345567 eeb78b2c45 Getting schemas correct for views. 2024-10-25 17:51:52 +01:00
mike12345567 f8f9c4da8e Work in progress - this is the scaffolding for views to be added to the public API. 2024-10-25 17:32:42 +01:00
Andrew Kingston c110cb628d
Merge pull request #14858 from Budibase/remove-lightest-and-dark-themes
Remove lightest and dark themes and add core types and utils for themes
2024-10-25 16:01:44 +01:00
Adria Navarro 00eedbf726 Fix deletions 2024-10-25 16:57:50 +02:00
Adria Navarro 96be447817 Fix many to many 2024-10-25 15:22:57 +02:00
Adria Navarro b05f35f58f
Merge pull request #14859 from Budibase/BUDI-8774/row-actions-dont-get-deleted-when-removing-a-datasource
Delete row actions when removing a datasource
2024-10-24 18:04:52 +02:00
Adria Navarro 637c13c1af Proper typing for emitTable 2024-10-24 13:44:20 +02:00
Adria Navarro 342d70b326 Proper typing 2024-10-24 13:42:01 +02:00
Adria Navarro 47e16dd844 Typing emitter 2024-10-24 13:07:13 +02:00
Adria Navarro 7b0419773c Implement deletion 2024-10-24 12:08:17 +02:00
Andrew Kingston 249f44dc11
Use new default app theme constant when creating apps 2024-10-24 10:13:42 +01:00
Andrew Kingston 4c112d51e6
Move themes to shared core, add enum and type 2024-10-24 09:24:11 +01:00
Adria Navarro 8466f8883c
Merge pull request #14854 from Budibase/chore/simplify-automation-data
Trigger info data in the frontend
2024-10-23 17:15:21 +02:00
Adria Navarro 11b2e40836 Remove 2024-10-23 16:37:55 +02:00
mike12345567 e28357c451 Linting. 2024-10-23 15:21:37 +01:00
mike12345567 8f21802e6e Refactor, correct to the BuiltinPermissionID rather than PermissionLevel, these are different. 2024-10-23 15:08:59 +01:00
mike12345567 c6a413f399 Quick fix for role validation, permissionId is no longer required. 2024-10-23 14:47:06 +01:00
Adria Navarro 64db4db3b3
Merge pull request #14849 from Budibase/BUDI-8770/row-action-automation-names-are-not-updated-in-automation
Row action name cleanup
2024-10-23 15:06:00 +02:00
Andrew Kingston 45dbfd2e35
Merge pull request #14577 from Budibase/new-rbac-ui
New RBAC UI
2024-10-23 12:19:53 +01:00
Adria Navarro 8f99072552 Reuse 2024-10-23 13:08:22 +02:00
Adria Navarro 015854f1a2 Dont persist row action name 2024-10-23 12:49:42 +02:00
Adria Navarro 7781e75491 Simplify row action permissions response 2024-10-23 12:47:06 +02:00
Adria Navarro 076f21108f Remove unnecessary row action update endpoint 2024-10-23 12:30:23 +02:00
Adria Navarro 23cf44b242
Merge branch 'master' into v3-ui 2024-10-22 18:23:26 +02:00
Adria Navarro 91e3c87a9c Fix typo 2024-10-22 17:59:03 +02:00
Michael Drury 9575095da3
Merge pull request #14844 from Budibase/fix/multi-inheritance-preview-role
Preview role - multi-inheritance fixes
2024-10-22 16:48:14 +01:00
Adria Navarro d73643f0b3 Allow serving old versions locally 2024-10-22 17:42:36 +02:00
mike12345567 0b2ac578c0 linting. 2024-10-22 16:27:53 +01:00
mike12345567 74870663e2 Addressing PR comments. 2024-10-22 16:02:20 +01:00
Adria Navarro b85a28fdf6 Fixes 2024-10-22 16:19:25 +02:00
mike12345567 eb349b5fb3 Linting. 2024-10-22 15:15:18 +01:00
mike12345567 f3d54f1b7d Adding test cases. 2024-10-22 13:54:54 +01:00
mike12345567 00fe28e557 Simplifying retrieval of role hierarchy for accessible endpoint. 2024-10-22 13:05:22 +01:00
Adria Navarro e1640cccf9 Change api type back 2024-10-22 14:04:57 +02:00
Andrew Kingston 69969e8cc5
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-22 12:47:15 +01:00
Adria Navarro 020927ae6c Fix types 2024-10-22 13:19:04 +02:00
Peter Clement bce430b57c pr comments 2024-10-22 12:03:16 +01:00
Adria Navarro 838d11e253 Update only for templates 2024-10-22 13:01:33 +02:00
Adria Navarro 77c4140e76 Type useTemplate as bool 2024-10-22 12:49:34 +02:00
Adria Navarro 5fe2a1d33e Rename and pass just required data 2024-10-22 12:23:36 +02:00
Adria Navarro 8dee7b2c45 Remove obsolete templateString 2024-10-22 11:56:19 +02:00
Peter Clement abe725a3b9 Merge remote-tracking branch 'origin/master' into feat/support-user-in-automation-context 2024-10-22 10:53:17 +01:00
Peter Clement 09695fabd6 extract necessary user bindings and add types 2024-10-22 10:52:52 +01:00
Adria Navarro cb5082a0c0 Fix check 2024-10-22 10:25:09 +02:00
Adria Navarro 87dbe66ccc Update user column data on import 2024-10-22 10:23:27 +02:00
deanhannigan 2795eca672
Merge branch 'master' into v3-ui 2024-10-21 15:01:02 +01:00
Adria Navarro 42f27bacb2 Cleanup SQS feature usages 2024-10-21 15:19:36 +02:00
mike12345567 87bdd68afa Updating to use enum for feature flags across the board. 2024-10-18 17:07:35 +01:00
Peter Clement a26b64bb03 pass user through to automation context 2024-10-18 15:08:18 +01:00
Andrew Kingston 761c9d3c18
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-18 11:46:18 +01:00
Andrew Kingston eaa0465539
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-18 11:45:12 +01:00
Andrew Kingston 609bc3fb79
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-18 08:53:05 +01:00
Andrew Kingston 02a60ba55d
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-18 08:52:47 +01:00
mike12345567 47de88f42f Destroy test case. 2024-10-17 17:47:55 +01:00
Michael Drury aaf5debc52
Merge branch 'master' into feature/role-multi-inheritance 2024-10-17 17:01:27 +01:00
mike12345567 2ae1836b9a PR comments. 2024-10-17 16:58:51 +01:00
Adria Navarro ca974cf2f5 Renames 2024-10-17 16:30:25 +02:00
mike12345567 b2e718504c Adri PR comments. 2024-10-17 15:17:36 +01:00
mike12345567 2d7afa59c8 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-17 14:57:25 +01:00
Andrew Kingston b57c8cc50d
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-17 14:36:34 +01:00
Adria Navarro 32b9d22ba0
Merge branch 'master' into budi-8755-hide-power-role-for-v3-apps 2024-10-17 12:52:05 +02:00
Adria Navarro ab517bf86d Persist created version 2024-10-17 10:32:17 +02:00
mike12345567 c40e4a7288 fixing rbac 2024-10-16 21:13:35 +01:00
mike12345567 3399093163 Role save API returns role ID in correct format. 2024-10-16 21:13:28 +01:00
mike12345567 9c92288f7f Fixing some issues with finding roles. 2024-10-16 21:13:19 +01:00
mike12345567 02d4c2d607 fixing rbac 2024-10-16 17:26:48 +01:00
Adria Navarro 8b9bb784c4 Initial appMetadata sdk usage 2024-10-16 17:06:15 +02:00
mike12345567 edf6d95eec Role save API returns role ID in correct format. 2024-10-16 15:46:03 +01:00
mike12345567 477bdf22e9 Fixing some issues with finding roles. 2024-10-16 15:18:37 +01:00
Andrew Kingston d37804e870
Merge branch 'master' into v3-ui 2024-10-16 15:09:27 +01:00
Adria Navarro ef21c7135f
Merge branch 'master' into fix/multiple-relationships-same-table 2024-10-16 15:15:52 +02:00
Andrew Kingston 54a0e3396c
Merge branch 'feature/role-multi-inheritance' of github.com:Budibase/budibase into new-rbac-ui 2024-10-16 12:28:12 +01:00
mike12345567 189b176060 Test for loops in role save API. 2024-10-16 12:27:15 +01:00
Sam Rose 86c105e1c8
Ensure external tables always have a sourceId. 2024-10-16 12:20:41 +01:00
Adria Navarro ba80880ab6 Fix 2024-10-16 13:02:53 +02:00
Adria Navarro 830ed0cda2 Fix undefineds 2024-10-16 12:51:20 +02:00
Adria Navarro 7266fb3c1b Run tests for all 2024-10-16 12:38:38 +02:00
Adria Navarro 2d460f1955 Fix supporting filter using table names 2024-10-16 12:26:13 +02:00
Adria Navarro b01564c934 Fix multiple relations to same table for external 2024-10-16 10:21:17 +02:00
Andrew Kingston f7f300b251
Merge branch 'feature/role-multi-inheritance' of github.com:Budibase/budibase into new-rbac-ui 2024-10-15 13:43:56 +01:00
mike12345567 ca72dffb1f Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-15 13:34:39 +01:00
mike12345567 bb43049d55 Adding loop protection. 2024-10-15 12:07:31 +01:00
Andrew Kingston 06413fda58
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-15 11:47:06 +01:00
Martin McKeaveney 97a7649930 merging with v3-ui branch 2024-10-14 18:47:13 +01:00
Andrew Kingston bb5b94f667
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-14 14:38:33 +01:00
Adria Navarro 874df3f54d Fix wrong schema while fetching from datasource 2024-10-14 13:20:34 +02:00
mike12345567 f907cccc58 Merge branch 'fix/custom-role-naming' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-10 16:28:06 +01:00
Adria Navarro e783676d69
Merge branch 'master' into v3-ui 2024-10-10 17:27:15 +02:00
Sam Rose 4c4429b88a
Fix tests. 2024-10-10 15:49:00 +01:00
Sam Rose a00a64bb6e
Properly clean up row actions on table deletion. 2024-10-10 14:56:38 +01:00
Adria Navarro 11a8f638b1
Merge branch 'master' into BUDI-8270/validation-for-search-api 2024-10-10 15:39:26 +02:00
mike12345567 4719b16116 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-10 14:38:18 +01:00
Adria Navarro 5cad93ff75 Fix 2024-10-10 15:15:54 +02:00
Adria Navarro 60a5f4a2e7 Types 2024-10-10 15:11:11 +02:00
Andrew Kingston d1bc83ab0a
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-10 13:59:03 +01:00
Sam Rose 4031971456
Merge branch 'master' into view-calculation-no-deletes 2024-10-10 12:39:15 +01:00
mike12345567 3a2b22d446 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-10 11:47:19 +01:00
Adria Navarro eea9eade5c Start types 2024-10-10 10:46:58 +02:00
Sam Rose 55be64b371
Only check visible fields when checking group by view calculations. 2024-10-10 09:16:43 +01:00
Sam Rose b42334fde1
Merge branch 'master' into view-calculation-no-deletes 2024-10-10 09:02:31 +01:00
Andrew Kingston 72dd3a1d59
Fix resolution of builderSocket 2024-10-09 18:57:47 +01:00
Andrew Kingston f4e149fd92
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-09 18:50:28 +01:00
Andrew Kingston 88a7128da3
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-09 18:49:34 +01:00
Sam Rose cc07b1407b
Merge branch 'master' into view-calculation-no-deletes 2024-10-09 17:09:03 +01:00
mike12345567 6a25f66f3c Merge branch 'fix/budi-8715-sql-relationships-many-side' of github.com:Budibase/budibase into fix/budi-8715-sql-relationships-many-side 2024-10-09 17:04:46 +01:00
mike12345567 00048a2d3e Addressing PR comments. 2024-10-09 17:04:27 +01:00
Michael Drury 01e458b568
Merge branch 'master' into fix/budi-8715-sql-relationships-many-side 2024-10-09 17:00:48 +01:00
mike12345567 70ab14319d Adding test case for removing from many side of relationships in SQL. 2024-10-09 16:51:11 +01:00
Adria Navarro d01462221f Set default permissions 2024-10-09 17:08:45 +02:00
Adria Navarro ebd762cdb6 Fixes 2024-10-09 17:08:35 +02:00
Sam Rose 26a8fabfef
Prevent deleting rows through a calculation view. 2024-10-09 16:05:49 +01:00
Adria Navarro aa0a1737c8 Fix tests 2024-10-09 16:55:32 +02:00
Adria Navarro 9f84262940 Clean 2024-10-09 16:55:32 +02:00
Sam Rose 4cde2f26ad wip, tests broken 2024-10-09 16:55:32 +02:00
mike12345567 d62d5b7043 Fixing an issue with removing relationships from the many side of a table in SQL, this was not correctly updating the other table. 2024-10-09 15:09:38 +01:00
Sam Rose 71fdae3383
Merge branch 'master' into view-calculation-readonly 2024-10-09 14:19:07 +01:00
Adria Navarro 3b01f404dd Fix imports 2024-10-09 13:49:58 +02:00
Adria Navarro 80ae7cbe0b Rename 2024-10-09 13:21:22 +02:00
Adria Navarro 15d124bfaf Move internal creation to sdk 2024-10-09 12:58:10 +02:00
Adria Navarro 9d06c705ac Remove ContextUser usages in favor of just ids 2024-10-09 12:47:43 +02:00
Sam Rose 0182d4a09f
Make sure calculation views cannot be used to write or modify rows. 2024-10-08 17:55:42 +01:00
Martin McKeaveney 7b683cfc50 merge and typing 2024-10-08 17:38:23 +01:00
Andrew Kingston 76ce8b5fd5
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-08 14:06:26 +01:00
Sam Rose f4b430e27c
Remove uiMetadata from ViewV2, it's not needed now we have the type field. 2024-10-07 16:38:18 +01:00
Sam Rose 672469526e
Mark calculation views explicitly instead of figuring it out implicitly. 2024-10-07 16:33:14 +01:00
Andrew Kingston fda5fdc16e
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-07 10:46:50 +01:00
Martin McKeaveney a583b824c2
Merge pull request #14700 from Budibase/view-ui-metadata
Add uiMetadata to viewV2
2024-10-07 10:23:02 +01:00
Adria Navarro 6c2c422fa5 Merge branch 'master' into v3-ui 2024-10-04 15:51:40 +02:00
Sam Rose 55008c4bb5
Merge branch 'master' into view-ui-metadata 2024-10-04 14:32:03 +01:00
Adria Navarro bb6bd1711a Add extra tests 2024-10-04 14:03:03 +02:00
Adria Navarro 9063e73f88 Fix tests 2024-10-04 14:02:56 +02:00
Adria Navarro 4c4f766a6a Endpoint to allow/disallow runs from table 2024-10-04 14:02:48 +02:00
Adria Navarro 8764a8c6e8 Return allowed run from table 2024-10-04 14:02:30 +02:00
Adria Navarro baa5a86ebb Rename allowedViews to allowedSources 2024-10-04 14:01:46 +02:00
Andrew Kingston afca86cf8f
Merge branch 'master' into view-ui-metadata 2024-10-04 09:45:34 +01:00
Sam Rose e39ced99d9
Merge branch 'master' into js-stack-traces 2024-10-04 09:44:59 +01:00
Sam Rose 831c81a99c
Fix automation tests. 2024-10-04 09:31:42 +01:00
Andrew Kingston 215e359615
Add uiMetadata to viewV2 2024-10-04 09:29:41 +01:00
mike12345567 bfbc576ed1 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-03 17:22:09 +01:00