Commit Graph

13459 Commits

Author SHA1 Message Date
Dean 48752cea1c Merge remote-tracking branch 'origin/v3-ui' into feature/automation-branching-ux 2024-10-31 15:38:34 +00:00
Sam Rose f58fbc313d
Merge branch 'v3-ui' into error-on-bulkimporting-relationship-fields 2024-10-31 15:14:13 +00:00
Sam Rose 30a3013e7f
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/automation-branching-ux 2024-10-31 15:13:17 +00:00
Adria Navarro 86aabcc629
Merge pull request #14922 from Budibase/chore/search-filter-typing
Search filter typing
2024-10-31 16:01:12 +01:00
Martin McKeaveney df8ec413f5
Merge pull request #14918 from Budibase/ai-fixes
Ai fixes
2024-10-31 14:42:46 +00:00
Michael Drury ee9a39acf5
Merge branch 'v3-ui' into error-on-bulkimporting-relationship-fields 2024-10-31 14:41:42 +00:00
Martin McKeaveney cb2f2a1f62 Merge branch 'ai-fixes' of github.com:Budibase/budibase into ai-fixes 2024-10-31 14:25:58 +00:00
Martin McKeaveney 0bc6647751 fix AI tests 2024-10-31 14:25:37 +00:00
Martin McKeaveney 3b31559915
Merge branch 'v3-ui' into ai-fixes 2024-10-31 14:08:34 +00:00
Peter Clement 9023864e65 Revert "remove validation for empty conditions"
This reverts commit d37c3ab99f.
2024-10-31 12:27:08 +00:00
Sam Rose 945cf52f02
Allow fields on count calculations. 2024-10-31 11:54:31 +00:00
Peter Clement d37c3ab99f remove validation for empty conditions 2024-10-31 11:43:15 +00:00
Adria Navarro b1eaf8ec71
Merge branch 'v3-ui' into feature/automation-branching-ux 2024-10-31 10:14:51 +01:00
Adria Navarro 20ed18a0e2
Merge branch 'master' into v3-ui 2024-10-31 10:14:41 +01:00
Sam Rose d31275ee8c
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/automation-branching-ux 2024-10-30 17:53:40 +00:00
Sam Rose 920953a4ee
Throw an error when attempting to bulkImport a relationship field into an internal table. It doesn't work yet. 2024-10-30 17:50:04 +00:00
Sam Rose e06c0629a0
Respond to PR comments. 2024-10-30 17:40:15 +00:00
mike12345567 dc1389b8fb PR comment and linting. 2024-10-30 17:39:48 +00:00
Sam Rose 3f62f19fdf
Merge branch 'v3-ui' of github.com:budibase/budibase into fix-view-calculations-with-relationships 2024-10-30 17:33:02 +00:00
Sam Rose b504f77d0f
Fix view calculations when relationships are present. 2024-10-30 17:32:49 +00:00
mike12345567 e235de54ad Fixing an issue with serving the builder, increased error rate due to requests that hit the / endpoint, these were 500ing due to a lack of app ID. 2024-10-30 17:32:39 +00:00
Martin McKeaveney 8478c3f8b0 adding assertion for AI 2024-10-30 16:29:20 +00:00
Martin McKeaveney 62caef19ca Merge branch 'v3-ui' of github.com:Budibase/budibase into ai-fixes 2024-10-30 16:17:39 +00:00
Adria Navarro 3779c7f6c7 Typing 2024-10-30 17:13:03 +01:00
Adria Navarro b510d04129 Simplify 2024-10-30 17:02:34 +01:00
Adria Navarro 7aad0d6e92 Type branch filters 2024-10-30 17:00:09 +01:00
Michael Drury c9c67841e0
Merge branch 'master' into nodemon-ignore 2024-10-30 14:26:20 +00:00
mike12345567 c7646afde0 Adding a change to nodemon configuration, this stops the services restarting twice when a build is triggered. 2024-10-30 14:23:58 +00:00
Adria Navarro d2da61e4e1
Merge branch 'v3-ui' into feature/automation-branching-ux 2024-10-30 14:19:48 +01:00
Adria Navarro 45dd00f0d3
Merge branch 'master' into v3-ui 2024-10-30 14:19:35 +01:00
Adria Navarro 6b0005bcc6 Different yarn cache between platforms 2024-10-30 13:32:43 +01:00
Adria Navarro cbb3859bac Remove --frozen-lockfile 2024-10-30 12:55:41 +01:00
Martin McKeaveney d9b685811d lint 2024-10-30 11:32:54 +00:00
Martin McKeaveney b06074128f unit test to cover 2024-10-30 11:27:49 +00:00
Martin McKeaveney 313bd9b017 add AI column from import if already defined 2024-10-30 11:21:37 +00:00
Adria Navarro edbda20f31 Add --check-files 2024-10-30 12:17:25 +01:00
Adria Navarro 1c9f4be87d
Merge branch 'v3-ui' into feature/automation-branching-ux 2024-10-30 10:35:09 +01:00
Andrew Kingston ff4d919083
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-30 09:29:24 +00:00
Adria Navarro e8771f7b51 Reenable cache and frozen-lockfile 2024-10-30 10:19:05 +01:00
mike12345567 b433f0f710 Removing yarn caching from docker builds. 2024-10-29 17:16:08 +00:00
Michael Drury 8e0ebba099
Revert "Revert to state from 2.33.4." 2024-10-29 17:11:28 +00:00
Andrew Kingston bc406e14db
Merge branch 'v3-ui' into feature/automation-branching-ux 2024-10-29 16:59:01 +00:00
Sam Rose fea668e6b6
Revert to state from 2.33.4. 2024-10-29 15:55:38 +00:00
Andrew Kingston 599370b6ed
Update tests 2024-10-29 15:19:32 +00:00
Andrew Kingston 765b3d2f97
Add tests for handling logical operators in UISearchFilter 2024-10-29 15:10:02 +00:00
mike12345567 2473f6859c Updating dockerfiles to contain the network-concurrency 1 option. 2024-10-29 14:54:36 +00:00
Sam Rose 1bfb4ee5cf
Merge branch 'v3-ui' of github.com:budibase/budibase into feature/automation-branching-ux 2024-10-29 12:33:57 +00:00
Sam Rose fa99c07a42
Merge branch 'v3-ui' of github.com:budibase/budibase into budi-8792-bigint-and-boolean-fields-dont-support-default-values 2024-10-29 12:06:43 +00:00
Adria Navarro 23c655e4d7
Merge branch 'v3-ui' into feature/automation-branching-ux 2024-10-29 12:52:31 +01:00
Sam Rose d8ff1509c5
Merge branch 'v3-ui' into fix-default-values-multi 2024-10-29 11:43:43 +00:00