Commit Graph

29239 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
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 109c586b84 remove log 2024-10-15 10:11:46 +01:00
Martin McKeaveney 1d2d096ab0 PR comments 2024-10-15 10:05:03 +01:00
Martin McKeaveney 0fe61f36bb lint 2024-10-15 00:57:01 +01:00
Martin McKeaveney c19c61ee9a fix csv test 2024-10-15 00:52:48 +01:00
Martin McKeaveney b563acbc1c remove AI field from assertion 2024-10-14 23:58:41 +01:00
Martin McKeaveney 9d5e60669d Remove AI column from row export 2024-10-14 23:49:46 +01:00
Martin McKeaveney 95d8ad854c lint and types 2024-10-14 23:36:33 +01:00
mike12345567 a56a228042 Fixes based on test case. 2024-10-14 18:57:54 +01:00
mike12345567 26ee50b10b Adding test case for multi-inheritance 2024-10-14 18:57:46 +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
Sam Rose 2637336bd6
Merge branch 'master' into update-docker-compose-for-sqs 2024-10-14 15:41:09 +01:00
Adria Navarro 7ea2c187a7 Simplify 2024-10-14 16:17:24 +02:00
Adria Navarro b3cea00ab3
Merge branch 'master' into BUDI-8699/view-joins-with-any-and-all-not-working-correctly 2024-10-14 16:07:32 +02:00
Andrew Kingston bb5b94f667
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-14 14:38:33 +01:00
Andrew Kingston 2b9ca50923
Merge pull request #14790 from Budibase/fix-view-join-parser
Fix view join parser for non-array values any "many" types
2024-10-14 14:31:20 +01:00
Sam Rose da12da6fe1
Merge branch 'master' into update-docker-compose-for-sqs 2024-10-14 14:28:52 +01:00
Adria Navarro b744de6e62
Merge branch 'master' into fix/inconsistent-column-schemas 2024-10-14 15:10:58 +02:00
Andrew Kingston 3fb59c2eef
Merge pull request #14777 from Budibase/default-values-for-user-column
Add default value toggle for both single and multi user columns
2024-10-14 14:08:43 +01:00
Andrew Kingston 0ba7f7eeca
Merge pull request #14792 from Budibase/fix-view-queryui-transform
Prevent view queryUI transforms mutating state
2024-10-14 13:15:35 +01:00
Andrew Kingston 8ff1dd5caa
Merge branch 'v3-ui' of github.com:Budibase/budibase into default-values-for-user-column 2024-10-14 13:13:18 +01:00
Andrew Kingston 4d460c2a46
Don't mutate views when transforming queryUI to make API happy 2024-10-14 12:58:15 +01:00
mike12345567 243391d6cb Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-14 12:57:22 +01:00
Sam Rose 7cb62f7e44
Merge branch 'master' into multi-user-default 2024-10-14 12:55:28 +01:00
Adria Navarro 31cfb1176d
Merge branch 'master' into fix/inconsistent-column-schemas 2024-10-14 13:26:00 +02:00
Andrew Kingston 37e601254c
Fix crash when many-type related column value is non-array 2024-10-14 12:20:53 +01:00
Adria Navarro 874df3f54d Fix wrong schema while fetching from datasource 2024-10-14 13:20:34 +02:00
Sam Rose 7c9b61181f
Fix lint. 2024-10-14 12:15:45 +01:00
Sam Rose e9ad3e58be
Support default values on multi-user columns. 2024-10-14 12:14:41 +01:00
Martin McKeaveney 6b38efa0bd
Merge branch 'master' into fix-container-on-click-grid 2024-10-14 12:09:20 +01:00
Adria Navarro 61967b6b4b Fix invalid schema 2024-10-14 13:01:20 +02:00
Adria Navarro 1052f36084 Fix invalid schemas while fetching 2024-10-14 13:00:26 +02:00
Martin McKeaveney cf8f7db36d PR comments 2024-10-14 11:22:15 +01:00
Adria Navarro a6cb1d072a Fix sql alias test 2024-10-14 10:40:08 +02:00
Adria Navarro ca7a7bcef9 Fix tests 2024-10-14 10:40:08 +02:00
Adria Navarro f73b7d4824 More tests 2024-10-14 10:40:08 +02:00
Adria Navarro bfdead820c Cleanup tests 2024-10-14 10:40:08 +02: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
Adria Navarro f192a30da0 More tests 2024-10-14 10:40:08 +02:00
Adria Navarro 37450823bb More tests 2024-10-14 10:40:08 +02:00
Adria Navarro cb78e0bc13 Add extra tests 2024-10-14 10:40:08 +02:00
Martin McKeaveney 5798b42454 updating submodule references 2024-10-14 09:24:31 +01:00