Commit Graph

3819 Commits

Author SHA1 Message Date
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
Andrew Kingston 06413fda58
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-15 11:47:06 +01: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
mike12345567 5f4694d4d8 Fix for an issue found with custom role naming. 2024-10-10 16:13:32 +01:00
Sam Rose 4c4429b88a
Fix tests. 2024-10-10 15:49:00 +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 3e0408d3b9 Add new flag 2024-10-10 10:34:35 +02: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
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
Adria Navarro 85ef2f1d2c Fix build issue 2024-10-09 17:08:45 +02:00
Adria Navarro b3efea95bf Undo base permissions 2024-10-09 17:08:45 +02:00
Adria Navarro 577ab5b6ce Fix tests 2024-10-09 17:08:45 +02:00
Adria Navarro ebd762cdb6 Fixes 2024-10-09 17:08:35 +02:00
Adria Navarro 56459b2736 Type 2024-10-09 16:55:59 +02:00
Sam Rose 9d70b123e5
Remove IP tag. 2024-10-09 15:22:38 +01: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 26f2deb234
Set proxy setting on Koa application. 2024-10-09 13:34:43 +01:00
Sam Rose a4090243ec
Fix lint. 2024-10-09 13:17:55 +01:00
Sam Rose adad73a9e2
Fix tests. 2024-10-09 13:10:52 +01:00
Sam Rose 10f3816810
Merge branch 'master' of github.com:budibase/budibase into logged-out-search-fix 2024-10-09 12:57:21 +01:00
Sam Rose eee2991b09
Rejib IP fetching. 2024-10-09 12:57:14 +01:00
Sam Rose 20f55e3795
Still fetch flags when the user is not logged in. 2024-10-09 12:29:17 +01:00
Michael Drury 64492dca2a
Merge branch 'master' into fix/related-rows-dont-exist 2024-10-09 12:18:37 +01:00
Adria Navarro d811b9527f Fix limit issues 2024-10-09 10:44:04 +02:00
Adria Navarro 8b0c84b2ea In memory filters 2024-10-09 10:32:39 +02:00
Martin McKeaveney 7b683cfc50 merge and typing 2024-10-08 17:38:23 +01:00
Sam Rose 2b47789fc8
Merge branch 'master' into feature-flag-helper 2024-10-08 14:42:09 +01:00
melohagan e3c6b60211
Remove unused properties (#14732)
* Remove unused properties

* lint
2024-10-08 12:56:48 +00:00
Sam Rose 635d268eea
Merge branch 'master' of github.com:budibase/budibase into feature-flag-helper 2024-10-08 11:14:11 +01:00
Sam Rose a4a90d7456
Fix tests. 2024-10-08 09:56:51 +01:00
Sam Rose 11804f6ddd
Create a feature flag helper for tests. 2024-10-07 18:18:04 +01:00
Sam Rose 6e4e76e21c
Merge branch 'master' into graceful-sqs-5xx-error-handling 2024-10-07 17:05:07 +01:00
melohagan db25511948
Changes relating to adding accountName to Account entity (#14712)
* Remove unused code

* Typing compromise because Account extends CreateAccount

* Update account-portal

* Update account-portal
2024-10-07 12:26:55 +02:00
Sam Rose 27578db4b7
Fix SQS error handling. 2024-10-07 09:48:33 +01:00