Commit Graph

11002 Commits

Author SHA1 Message Date
Michael Drury 8e76618a85
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 12:45:18 +01:00
mike12345567 bc8e84b815 Fixing datasource error states causing a datasource to fail to be built fully - this was simply a frontend issue of the error not being handled on creation. 2023-10-20 12:19:04 +01:00
Andrew Kingston 41e72a28c9
Merge branch 'master' into grid-all-datasources 2023-10-18 15:59:12 +01:00
Andrew Kingston fb69c3a0da Add new shared core util for determining whether columns can be sort columns or not 2023-10-18 15:38:37 +01:00
Martin McKeaveney 62e902398e
Merge branch 'master' into budi-7640-testimonials-arent-removed-from-forgot-passwordreset 2023-10-18 15:15:49 +01:00
Andrew Kingston bdc2bcd97d Add support for multiple dependsOn constraints in the manifest and fix issue with nullish dependsOn contraints 2023-10-18 14:41:42 +01:00
Michael Drury 0894353cc9
Merge branch 'master' into chore/remove-sentry-references 2023-10-18 10:25:43 +01:00
mike12345567 a325e39377 Removing un-used statement. 2023-10-18 10:20:32 +01:00
mike12345567 489c67511c PR comments. 2023-10-18 10:04:26 +01:00
Adria Navarro 616792013f Lint 2023-10-18 10:54:37 +02:00
Adria Navarro 3fd2973152 Remove sentry packages 2023-10-18 10:51:09 +02:00
Adria Navarro 572cac2552 Remove SENTRY_DSN references 2023-10-18 10:51:09 +02:00
Adria Navarro e35f1b79e2 Remove sentry client 2023-10-18 10:51:09 +02:00
Conor Webb 56ecd339a7 Added testimonial check to reset and forgot pages. 2023-10-18 09:20:06 +01:00
mike12345567 1299917e94 Quick fix for datasource deletion, due to the datasource defaulting to an empty object it appeared like a datasource had been set and the UI would attempt to render with this empty state. When not selected move off of the selected datasource page instead and handle the datasource not being selected. 2023-10-17 17:35:10 +01:00
mike12345567 70c5272ad9 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-17 15:46:34 +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
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 0f0e3329ee
Merge branch 'master' into fix/12068-autocolumn-data-ui-fixes 2023-10-17 11:04:48 +01: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
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 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 26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
mike12345567 cef71ff708 Adding test cases for navbar update. 2023-10-13 18:03:10 +01:00
mike12345567 6a4877159d Quick fix to make sure that the important components of the app metadata are correctly updated - as well as adjusting the import modal to check if the export is encrypted. 2023-10-13 17:43:14 +01:00
Andrew Kingston 73ca87dfb6 Fix issue with sort setting 2023-10-13 17:04:45 +01:00
mike12345567 03371005c1 PR comments - addressing API.searchUser updates. 2023-10-13 12:23:28 +01:00
Sam Rose a3cb9d7567 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-13 10:20:54 +01:00
Sam Rose 85b3af2971 Refactor DatasourcePlus's buildSchema to return a value, rather than rely on member variables. 2023-10-12 16:27:18 +01:00
mike12345567 7b8e23eb82 Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache 2023-10-12 11:08:12 +01:00
Andrew Kingston 4ed3767324 Merge branch 'develop' into grid-all-datasources 2023-10-12 08:31:09 +01:00
mike12345567 f1b73058c2 Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:49:39 +01:00
Martin McKeaveney 0040db27b2 Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-11 17:32:40 +01:00
Michael Drury 95423fdabc Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 17:27:01 +01:00
Michael Drury e5eb3c98f2 Merge branch 'develop' into grid-all-datasources 2023-10-11 17:21:54 +01:00
mike12345567 d14a773925 Merge branch 'develop' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 14:02:48 +01:00
Dean 059bed1cfa Merge remote-tracking branch 'origin/master' into fix/selected-by-user-obscured-nav-item 2023-10-11 10:13:42 +01:00
Andrew Kingston efa2386fd5 Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 07:57:03 +01:00
Michael Drury 5937f2139a Merge branch 'develop' into feat/relationship-configuration 2023-10-10 16:49:50 +01:00
Adria Navarro 193b8785ee Reset display field if required 2023-10-10 16:17:03 +02:00
Adria Navarro 6124139295 Don't allow selecting unvalid display columns 2023-10-10 16:13:21 +02:00