Commit Graph

3836 Commits

Author SHA1 Message Date
deanhannigan 2795eca672
Merge branch 'master' into v3-ui 2024-10-21 15:01:02 +01:00
mike12345567 f857e2a3e9 Adding BUDIBASE_AI feature flag. 2024-10-21 12:56:59 +01:00
mike12345567 24dbb0cef9 Merge branch 'master' of github.com:Budibase/budibase into fix/all-feature-flag-enum 2024-10-18 18:24:02 +01:00
mike12345567 b94498e583 Backporting types from v3 to support updating pro submodule. 2024-10-18 17:29:22 +01:00
mike12345567 87bdd68afa Updating to use enum for feature flags across the board. 2024-10-18 17:07:35 +01:00
mike12345567 94789ff03d Adding all feature flags to enum, just so there is a simple reference to see all feature flags that are available. 2024-10-18 16:51:23 +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 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 bd10a3d831 Missed comment. 2024-10-17 17:00:40 +01:00
mike12345567 2ae1836b9a PR comments. 2024-10-17 16:58:51 +01:00
mike12345567 3da3bccc01 Some fixes for traverser. 2024-10-17 16:27:47 +01:00
mike12345567 cfc5848d14 Improving how traversal is performed for role inheritance. 2024-10-17 16:10:32 +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 c1128ffe2a Fix test 2024-10-17 12:20:17 +02:00
Adria Navarro 7bb69d7ffd Add tests 2024-10-17 12:17:01 +02:00
Adria Navarro 8008d2ced1 Fix all references 2024-10-17 11:53:20 +02:00
Adria Navarro 1155be4530 Fix 2024-10-17 11:52:03 +02:00
Adria Navarro 15bb730c59 Remove power role for apps created at >= 3.0.0 2024-10-17 11:37:41 +02:00
Adria Navarro 8cdc5be38e Store proper version even on local 2024-10-17 11:36:02 +02:00
mike12345567 c40e4a7288 fixing rbac 2024-10-16 21:13:35 +01:00
mike12345567 9c92288f7f Fixing some issues with finding roles. 2024-10-16 21:13:19 +01:00
Adria Navarro b6874f52f6 Fix many-to-one 2024-10-16 16:16:39 +02:00
Adria Navarro 3ea8e240e4 Fix one-to-many 2024-10-16 14:05:48 +02:00
Adria Navarro 960fa33559 Merge branch 'fix/multiple-relationships-same-table' into chore/negated-join-filters 2024-10-16 13:34:19 +02:00
Adria Navarro b01564c934 Fix multiple relations to same table for external 2024-10-16 10:21:17 +02:00
mike12345567 9fceef0fc2 Some more fixes and test case for screen access. 2024-10-15 17:53:48 +01:00
Adria Navarro 8a6dbef249 Fix sqs 2024-10-15 18:50:58 +02:00
mike12345567 ca72dffb1f Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-15 13:34:39 +01:00
Andrew Kingston 9b009f9728
Merge branch 'master' into v3-ui 2024-10-15 11:58:20 +01:00
Adria Navarro 2f2cfb392d
Merge branch 'master' into chore/negated-join-filters 2024-10-15 12:04:30 +02:00
Adria Navarro 57da952f69 Fix "parenthesis" 2024-10-15 11:34:35 +02:00
Adria Navarro 76d0107d4d Handle empty relationships 2024-10-15 10:10:15 +02:00
mike12345567 a56a228042 Fixes based on test case. 2024-10-14 18:57:54 +01:00
Martin McKeaveney 97a7649930 merging with v3-ui branch 2024-10-14 18:47:13 +01:00
Martin McKeaveney 30215ea9be tests, pr comments 2024-10-14 18:38:34 +01:00
mike12345567 676cb3f92e Handling role numbering. 2024-10-14 18:00:41 +01:00
Sam Rose 867ba12f8a
Merge branch 'update-docker-compose-for-sqs' of github.com:budibase/budibase into update-docker-compose-for-sqs 2024-10-14 17:24:44 +01:00
Sam Rose 58b4a37fca
Enable SQS in code instead of in env vars. 2024-10-14 17:20:36 +01:00
Adria Navarro 7ea2c187a7 Simplify 2024-10-14 16:17:24 +02:00
mike12345567 243391d6cb Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-14 12:57:22 +01:00
Adria Navarro cf089eff26 Fix ors 2024-10-14 10:40:08 +02:00
Adria Navarro 2311f8aa50 Don't break or conditions on nested joins 2024-10-14 10:40:08 +02:00
mike12345567 324616be59 Finishing multi-inheritance test case and getting accessibility to be detected correctly. 2024-10-10 18:15:23 +01:00
Sam Rose 964f8222ba
Allow sorting by calculation fields. 2024-10-10 17:10:07 +01: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
Michael Drury 799ad63568
Merge branch 'master' into fix/custom-role-naming 2024-10-10 16:15:14 +01:00