Commit Graph

36625 Commits

Author SHA1 Message Date
Budibase Staging Release Bot 62bd87bbfb Bump version to 3.0.4 2024-11-05 14:23:11 +00:00
Andrew Thompson 53955c183b
Merge pull request #14968 from Budibase/budi-8820-conditional-automation-step-options-always-rendering-send
fix for conditional automation step options always showing
2024-11-05 13:58:58 +00:00
Martin McKeaveney b548619003 Merge branch 'budi-8820-conditional-automation-step-options-always-rendering-send' of github.com:Budibase/budibase into budi-8820-conditional-automation-step-options-always-rendering-send 2024-11-05 13:54:56 +00:00
Martin McKeaveney fc6773537c update pro 2024-11-05 13:54:41 +00:00
Andrew Thompson b129959b1f
Merge branch 'master' into budi-8820-conditional-automation-step-options-always-rendering-send 2024-11-05 13:54:22 +00:00
Martin McKeaveney 3ed740ea85
Merge pull request #14965 from Budibase/ai-config-fixes-2
further AI config updates for case where there's no configuration
2024-11-05 13:52:20 +00:00
Andrew Thompson 5009172131
Merge branch 'master' into budi-8820-conditional-automation-step-options-always-rendering-send 2024-11-05 13:34:46 +00:00
Adria Navarro b95303403b
Merge branch 'master' into feature/automation-branching-ux 2024-11-05 14:16:05 +01:00
Adria Navarro 58a12e14c5
Release feature/automation-branching-ux to QA 2024-11-05 14:14:01 +01:00
Martin McKeaveney b3c01a28c2 init variable 2024-11-05 12:22:29 +00:00
andz-bb ebf5933882 fix for conditional automation step options always showing 2024-11-05 12:19:45 +00:00
Sam Rose d1e83ce4f7
Rebase onto chore/sqs-always-on 2024-11-05 12:12:45 +00:00
Adria Navarro 06a0ad7910
Disable major update 2024-11-05 12:12:06 +00:00
Martin McKeaveney f42b4ced46 lint + tests 2024-11-05 12:02:56 +00:00
Martin McKeaveney a197a2ead9 lint 2024-11-05 11:58:05 +00:00
Martin McKeaveney a8aa0d0822 fix tests 2024-11-05 11:50:28 +00:00
Martin McKeaveney a7b52b0a9a fix test 2024-11-05 11:34:43 +00:00
Martin McKeaveney 08ef3a249a update pro 2024-11-05 11:15:25 +00:00
Adria Navarro 40d19a5d06
Merge pull request #14966 from Budibase/BUDI-8746/multiple-many-to-many-relationships-between-two-tables
Support setting multiple many to many relationships between two tables
2024-11-05 12:13:53 +01:00
Martin McKeaveney e4181ecacf merge 2024-11-05 11:09:56 +00:00
Martin McKeaveney b2c2ff10be
Merge branch 'master' into feature/automation-branching-ux 2024-11-05 11:05:29 +00:00
Adria Navarro 04de771cf5
Merge branch 'master' into BUDI-8746/multiple-many-to-many-relationships-between-two-tables 2024-11-05 11:59:16 +01:00
Martin McKeaveney 7623c0ce07 further AI config updates for case where there's no configuration 2024-11-05 10:54:33 +00:00
Adria Navarro 3cb653eb01 Fix initial setup 2024-11-05 11:54:09 +01:00
Dean e0dfc0ea10 Optional chaining for selectedAutomation 2024-11-05 10:48:57 +00:00
Adria Navarro 6505f518c8 Don't allow same foreign keys 2024-11-05 11:31:46 +01:00
Adria Navarro 94d3466113 Allow setting multiple many-to-many relationships 2024-11-05 11:24:23 +01:00
Adria Navarro ee4fbf0db2
Merge pull request #14953 from Budibase/chore/cleanup-TABLES_DEFAULT_ADMIN-flag
Remove TABLES_DEFAULT_ADMIN flag
2024-11-05 10:52:47 +01:00
Adria Navarro 326b59efc8
Merge branch 'master' into chore/cleanup-TABLES_DEFAULT_ADMIN-flag 2024-11-05 10:36:23 +01:00
Adria Navarro af2da7c6d8
Merge pull request #14956 from Budibase/ci/disable-major-update-run
Disable major update from actions
2024-11-05 10:36:14 +01:00
Adria Navarro c183048bae
Merge branch 'master' into ci/disable-major-update-run 2024-11-05 10:36:04 +01:00
Dean bbb2c20b6e Removed comment and debug console log 2024-11-05 09:35:43 +00:00
Adria Navarro 0a678016b3
Merge branch 'master' into chore/sqs-always-on 2024-11-05 10:35:41 +01:00
Adria Navarro a2046eddf4
Merge branch 'master' into chore/cleanup-TABLES_DEFAULT_ADMIN-flag 2024-11-05 10:35:20 +01:00
Dean 1ac6244951 Merge remote-tracking branch 'origin/master' into feature/automation-branching-ux 2024-11-05 09:11:08 +00:00
Budibase Staging Release Bot 41e3a40782 Bump version to 3.0.3 2024-11-05 00:13:23 +00:00
Martin McKeaveney 2d8a321421
Merge pull request #14959 from Budibase/flag-ai-correctly-for-premium
Flag ai correctly for premium
2024-11-04 23:30:06 +00:00
Martin McKeaveney 53b28218cf feature flag support in AI test 2024-11-04 22:55:04 +00:00
Martin McKeaveney 7c918302a9 update all areas where ai flags come from license to come from feature flag 2024-11-04 22:27:43 +00:00
Martin McKeaveney 7b867abd19 flag ai with feature flags correctly 2024-11-04 22:15:41 +00:00
Sam Rose 5ac76a7761
Merge branch 'master' into ci/disable-major-update-run 2024-11-04 16:54:59 +00:00
Andrew Kingston 52b48db5eb
Merge pull request #14954 from Budibase/fix-filter-count-conditions
Fix issue counting number of filters when legacy structure is used
2024-11-04 16:48:58 +00:00
Sam Rose b8483afcec
Merge branch 'master' into chore/cleanup-TABLES_DEFAULT_ADMIN-flag 2024-11-04 16:41:23 +00:00
Andrew Kingston 074ece6eae
Merge branch 'master' into fix-filter-count-conditions 2024-11-04 16:41:09 +00:00
Andrew Kingston 9adec99c59
Merge branch 'fix-filter-count-conditions' of github.com:Budibase/budibase into fix-filter-count-conditions 2024-11-04 16:40:34 +00:00
Dean 04e79bcd42 Merge remote-tracking branch 'origin/master' into feature/automation-branching-ux 2024-11-04 16:33:38 +00:00
Sam Rose fd1a18a1e9
Merge pull request #14957 from Budibase/redis-persistence-opt-in
Add USE_DEFAULT_REDIS_CONFIG environment variable to single image to disable our config customisations.
2024-11-04 16:13:05 +00:00
Sam Rose 2d8e5a069d
Merge branch 'master' into redis-persistence-opt-in 2024-11-04 16:08:43 +00:00
Adria Navarro 6b98ec0e22
Merge branch 'master' into chore/sqs-always-on 2024-11-04 17:06:40 +01:00
Adria Navarro ff7733f396
Merge branch 'master' into ci/disable-major-update-run 2024-11-04 17:06:08 +01:00