Commit Graph

35776 Commits

Author SHA1 Message Date
Andrew Kingston fa8d01b7af
Merge branch 'v3-ui' of github.com:Budibase/budibase into new-rbac-ui 2024-10-16 09:40:52 +01: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
Sam Rose 859982912d
Merge pull request #14797 from Budibase/preserve-redis-singleimage 2024-10-15 13:27:12 +01:00
Sam Rose a03824a1af
Merge branch 'master' of github.com:budibase/budibase into preserve-redis-singleimage 2024-10-15 12:48:44 +01:00
Sam Rose 68498a0c54
Write Redis data to the persistent data dir in single image. 2024-10-15 12:46:27 +01:00
mike12345567 bb43049d55 Adding loop protection. 2024-10-15 12:07:31 +01:00
Christos Alexiou 6321108297
Merge pull request #14788 from Budibase/ops/match-license-type-on-env
Move conditionals to env section
2024-10-15 14:04:24 +03:00
Andrew Kingston 9b009f9728
Merge branch 'master' into v3-ui 2024-10-15 11:58:20 +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 a13cd079ae
Merge pull request #14711 from Budibase/budi-8677-ai-column-type-v1
Budi 8677 ai column type v1
2024-10-15 11:34:50 +01:00
Martin McKeaveney 109c586b84 remove log 2024-10-15 10:11:46 +01:00
Sam Rose b1fa4a2e8d
Merge pull request #13999 from Budibase/update-docker-compose-for-sqs
Release SQS for self-host users (single image, docker compose, Kubernetes)
2024-10-15 10:08:01 +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 dd81e246bf
Allow customisation of SQS URL to match CouchDB URL. 2024-10-14 17:28:25 +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 61558aff77
Update Helm chart for SQS. 2024-10-14 17:24:14 +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 0786807ec1
Merge pull request #14770 from Budibase/BUDI-8699/view-joins-with-any-and-all-not-working-correctly
View joins with any and all not working correctly
2024-10-14 16:29:54 +02: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
Sam Rose c9d42a0e29
Add SQS feature flags, remove scarf.sh URLs. 2024-10-14 14:51:17 +01: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 490c4ae392
Merge pull request #14791 from Budibase/fix/inconsistent-column-schemas
Fixing inconsistent column schemas
2024-10-14 15:23:01 +02: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 ba5ce266b7
Merge pull request #14793 from Budibase/fix-relationship-cell
Fix relationship cell containing reference to deleted code
2024-10-14 13:11:30 +01:00
Sam Rose 48bafedf1b
Merge pull request #14789 from Budibase/multi-user-default 2024-10-14 13:08:01 +01:00
Andrew Kingston 5f59bf9f23
Fix leftover reference to deleted code 2024-10-14 13:05:38 +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
Martin McKeaveney c2f9ed5c01
Merge pull request #14768 from Budibase/fix-container-on-click-grid
Add on click events for grid layout containers
2024-10-14 12:21:13 +01:00
Andrew Kingston 37e601254c
Fix crash when many-type related column value is non-array 2024-10-14 12:20:53 +01:00