Commit Graph

25710 Commits

Author SHA1 Message Date
Sam Rose 767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
mike12345567 70c5272ad9 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-17 15:46:34 +01:00
Budibase Staging Release Bot bbda776c49 Bump version to 2.11.36 2023-10-17 14:39:22 +00:00
Michael Drury 8871c8b245
Merge pull request #12085 from Budibase/fix-single-image
Fix single image
2023-10-17 15:07:16 +01:00
Adria Navarro 697e733f82 Fix timeout 2023-10-17 15:25:27 +02:00
Adria Navarro ea20217fbc Use build 2023-10-17 14:31:08 +02:00
Sam Rose 31b9527487
Merge pull request #12050 from Budibase/fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if
Surface errors when importing tables from a datasource, don't surface errors from tables that have been filtered out.
2023-10-17 13:24:56 +01:00
Michael Drury b3b323f040
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 12:27:27 +01:00
Michael Drury 92dd6cce2d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-17 12:17:24 +01:00
Michael Drury 5bc8905e1a
Merge pull request #12078 from Budibase/fix/12068-autocolumn-data-ui-fixes
Fix autocolumn addition/editing in data UI
2023-10-17 12:16:50 +01:00
Sam Rose 946a7b6d0d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-17 11:43:20 +01:00
Andrew Kingston 65a9ea2cc1
Merge branch 'master' into grid-all-datasources 2023-10-17 11:33:49 +01:00
Michael Drury 3c33bda026
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 11:29:20 +01:00
Michael Drury ba04cd5f07
Merge branch 'master' into fix/12068-autocolumn-data-ui-fixes 2023-10-17 11:24:29 +01:00
Budibase Staging Release Bot 8fc4745772 Bump version to 2.11.35 2023-10-17 10:22:18 +00:00
Michael Drury 0f0e3329ee
Merge branch 'master' into fix/12068-autocolumn-data-ui-fixes 2023-10-17 11:04:48 +01:00
Michael Drury b8c1a054f8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 11:03:30 +01:00
Adria Navarro 73ff2fc58d Merge pull request #12081 from Budibase/clean-wrong-nodemodule
Clean wrong nodemodule
2023-10-17 11:33:48 +02:00
Adria Navarro cf75c46b74 Clean wrong node_module commit 2023-10-17 11:25:47 +02:00
Adria Navarro ddfae2ab91 Clean wrong node_module commit 2023-10-17 11:25:08 +02:00
Adria Navarro faceb4e8db Merge pull request #11954 from Budibase/BUDI-7573/use_existing_image_cache
New image for single images
2023-10-17 11:20:30 +02:00
Adria Navarro beb3136312 Fix sentry import 2023-10-17 10:59:46 +02:00
mike12345567 7dcd6767f9 Fixes for adding autocolumns, it was not possible to select auto column type and fixing icon, as well as display of column when editing it - this corrects a few issues in this area as auto columns did not have a correct fieldId and also did not have a valid field definition. 2023-10-16 18:37:56 +01:00
mike12345567 fefd5fa0dc Quick fix for drag and drop behaviour of relationship cells, appears empty cells were causing things to break in the re-render. 2023-10-16 17:41:20 +01:00
Sam Rose 39292e88a8 Correct error message to say sheets when it's a Google sheet. 2023-10-16 17:11:51 +01:00
Andrew Kingston 1cb0817a0b Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 16:47:14 +01:00
Andrew Kingston 5c7bde95ab Update conditional setting rendering to support nested paths and multiple values, and hide grid block CRUD when using non DS+ 2023-10-16 16:46:49 +01:00
Sam Rose b7ff1d60f1 Wire up the frontend to show the new datasource errors. 2023-10-16 16:36:42 +01:00
Sam Rose 37fe91e488 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-16 16:05:45 +01:00
Adria Navarro 8e64fb9858 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:46:14 +02:00
Michael Drury 64f4701b57 Merge pull request #12060 from Budibase/fix/12046-nav-links-overwrite-app
App overwrite - take new apps navigation
2023-10-16 15:45:45 +01:00
Michael Drury b86bcb7f4b Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-16 15:30:25 +01:00
Andrew Kingston e0b748a7bc Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 15:29:46 +01:00
Adria Navarro 6343b47480 Remove test action trigger 2023-10-16 16:18:13 +02:00
Adria Navarro 26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney bc0b2f5d6e Merge pull request #12027 from Budibase/develop
develop -> master
2023-10-16 15:12:30 +01:00
Michael Drury 0409bda13d Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-16 15:10:52 +01:00
Martin McKeaveney 8c0ed39652 submodule 2023-10-16 14:53:57 +01:00
Adria Navarro 50a1a28a32 Replace localhost for 127.0.0.1 2023-10-16 15:52:10 +02:00
Adria Navarro 01f15c2666 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 15:45:59 +02:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Michael Drury 5e00a0d0dd Merge branch 'master' into fix/internal-db-enrich-perf 2023-10-16 13:54:10 +01:00
Martin McKeaveney 342454651a Merge pull request #12048 from Budibase/preparing-develop-master-ci-migration
Preparing develop master ci migration
2023-10-16 12:27:27 +01:00
Martin McKeaveney b51b01a765 Merge branch 'preparing-develop-master-ci-migration' of github.com:Budibase/budibase into preparing-develop-master-ci-migration 2023-10-16 12:22:31 +01:00
Martin McKeaveney b22f7804db allow close-featurebranch to be done through workflow dispatch 2023-10-16 12:21:45 +01:00
Martin McKeaveney ae0f307188 Merge branch 'master' into preparing-develop-master-ci-migration 2023-10-16 11:25:45 +01:00
Adria Navarro a3ae503d74 workflow_dispatch 2023-10-16 12:24:56 +02:00
Martin McKeaveney 4337463402 remove develop reference in feature branch close job 2023-10-16 11:06:54 +01:00
Martin McKeaveney f2dbb4106d update CI job to remove references to develop 2023-10-16 11:04:33 +01:00
Martin McKeaveney 81c3831c82 Merge branch 'preparing-develop-master-ci-migration' of github.com:Budibase/budibase into preparing-develop-master-ci-migration 2023-10-16 11:01:02 +01:00