1
0
Fork 0
mirror of synced 2024-08-12 00:22:02 +12:00
Commit graph

21693 commits

Author SHA1 Message Date
Dean
66fda3db09 Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config 2023-10-25 09:15:37 +01:00
José Vte. Calderón
bc1999fe30
Merge branch 'master' into feature/sync-quotas-2 2023-10-25 10:02:09 +02:00
Andrew Kingston
4fb18baf17 Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns 2023-10-25 08:48:21 +01:00
Andrew Kingston
b88be9b1df
Merge branch 'master' into feature/form-block-description 2023-10-25 08:45:34 +01:00
jvcalderon
65111c81ef Reactivate sync quotas migration 2023-10-25 08:44:59 +02:00
Michael Drury
9983d67163 Adding mimetype for client library response (correcting from octet-stream). 2023-10-24 22:13:56 +01:00
Michael Drury
5fabe32434 Making sure client endpoint available in prod. 2023-10-24 20:35:25 +01:00
Michael Drury
c6b377c565
Revert "Revert "Client library fetching through server"" 2023-10-24 18:13:36 +01:00
Michael Drury
e2e5c9044c
Revert "Client library fetching through server" 2023-10-24 18:12:20 +01:00
Sam Rose
0f5c2cff00
Handle a couple more edge cases more gracefully. 2023-10-24 18:06:25 +01:00
Sam Rose
fb998502bb
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-24 17:34:41 +01:00
Sam Rose
a8ae16852c
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4 2023-10-24 17:34:19 +01:00
Sam Rose
f4c6ab7f48
Make sure the user cannot enter the same column name as the old column for the migrated column. 2023-10-24 17:33:49 +01:00
Michael Drury
2888335724
Merge branch 'master' into fix/client-lib-fetching 2023-10-24 17:31:44 +01:00
mike12345567
701d30abb4 Don't pass through default tenant ID. 2023-10-24 17:30:57 +01:00
mike12345567
ba5b1d7cfa Adding tenant ID to query string and fixing test cases. 2023-10-24 17:27:58 +01:00
Sam Rose
d3670ddf21
Add an input to allow the user to choose the new column name. 2023-10-24 17:22:49 +01:00
mike12345567
b53158ac08 Moving the client library to be retrieved using the same mechanism as we do in development, through the server instance (same as the builder itself). This should help with the CDN issues that we have been having, although attachments are still currently affected. 2023-10-24 16:25:14 +01:00
jvcalderon
102a082484 Update pro submodule 2023-10-24 17:18:13 +02:00
jvcalderon
cea1c04b73 Creators count functionality 2023-10-24 17:16:44 +02:00
Sam Rose
2f0a40e9bb
Introduce modal to show warning to users, and toast to show success. 2023-10-24 15:18:46 +01:00
Andrew Kingston
ea7b3381c2 Merge branch 'master' of github.com:Budibase/budibase into grid-inline-searching 2023-10-24 13:37:44 +01:00
Adria Navarro
969ab79a61
Merge branch 'master' into feature/buttongroup-component 2023-10-24 14:30:09 +02:00
Andrew Kingston
7e3d59a582
Merge branch 'master' into grid-inline-searching 2023-10-24 13:30:07 +01:00
Andrew Kingston
7c19e9ed96
Merge branch 'master' into fix-table-metadata 2023-10-24 11:34:52 +01:00
jvcalderon
5c1710b5da Update pro submodule 2023-10-24 12:15:28 +02:00
jvcalderon
dbc903f3e6 Remove console.log 2023-10-24 12:03:07 +02:00
jvcalderon
980a46abb3 Merge branch 'master' into feature/per-creator-migration 2023-10-24 11:03:02 +02:00
jvcalderon
f643bc5ee8 Keep only migrations 2023-10-24 10:24:00 +02:00
Andrew Kingston
d82aec9f31
Merge branch 'master' into feature/form-block-description 2023-10-24 08:56:14 +01:00
Andrew Kingston
76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-24 08:55:51 +01:00
Andrew Kingston
00450dc59b
Merge branch 'master' into feature/form-block-settings-reflow 2023-10-24 08:55:37 +01:00
Andrew Kingston
654e6539bb
Merge branch 'master' into fix-table-metadata 2023-10-24 08:55:23 +01:00
Andrew Kingston
b6a8e6c0cf
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-24 08:54:54 +01:00
Adria Navarro
52b86b44cb
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-24 09:54:19 +02:00
Andrew Kingston
c5537dd58c Prettier 2023-10-24 08:46:55 +01:00
Andrew Kingston
f355933bf3 Add grid support for old views with groupBy specified, and any other datasource that has a custom means of determining a datasource schema 2023-10-24 08:26:57 +01:00
Sam Rose
a701933f48
Frontend changes for the user column migration work. 2023-10-23 17:57:25 +01:00
Dean
08a22f1525 Show 'Creator' instead of 'Admin' for the global user role picker 2023-10-23 16:47:05 +01:00
Sam Rose
42e31d19fb
Merge master. 2023-10-23 16:18:51 +01:00
Adria Navarro
3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
jvcalderon
bc4dd8e1c9 Update pro submodule 2023-10-23 15:43:44 +02:00
Adria Navarro
453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro
e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro
3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
Adria Navarro
3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro
0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Andrew Kingston
73f3b76c01 Update default column visibility check 2023-10-23 12:40:29 +01:00
Dean
cf8a634a72 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-23 12:34:31 +01:00
jvcalderon
a22aea63a3 Update pro submodule 2023-10-23 13:33:56 +02:00
jvcalderon
a285fb1d40 Missed code in merge 2023-10-23 13:33:27 +02:00
jvcalderon
648410348d [Revert] [Added] Per user per creator changes 2023-10-23 13:27:59 +02:00
Sam Rose
5e6ed0fd67
Implement many-to-one user column migration. 2023-10-23 11:54:27 +01:00
Adria Navarro
4ee1fd0f7a Default to package.json 2023-10-23 12:23:44 +02:00
Sam Rose
febfab0927
Fix tests/types. 2023-10-23 10:48:10 +01:00
Sam Rose
9e279be4c3
Put pro back to where it was. 2023-10-23 10:35:41 +01:00
Sam Rose
06f0a8da1a
Update pro submodule. 2023-10-23 09:59:11 +01:00
Sam Rose
9dd16381a7
Merge base branch. 2023-10-23 09:52:17 +01:00
Sam Rose
86458dc321
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-2 2023-10-23 09:50:40 +01:00
Sam Rose
2d26597d07
Fix tests after merge. 2023-10-23 09:49:57 +01:00
Sam Rose
a563cf3594
Merge master. 2023-10-23 09:39:34 +01:00
Adria Navarro
e7459bb5e7 Fix test 2023-10-20 20:42:58 +02:00
Adria Navarro
71869badfa Fix tests 2023-10-20 19:19:35 +02:00
Adria Navarro
d1f0e8fca0 Fix tests 2023-10-20 17:53:40 +02:00
Adria Navarro
e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
Adria Navarro
5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro
9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
Adria Navarro
13a8b20ea9
Merge branch 'master' into update-pro-ref 2023-10-20 17:04:04 +02:00
Adria Navarro
8a939dd3e6 Update pro submodule ref 2023-10-20 17:02:24 +02:00
mike12345567
8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01:00
mike12345567
04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Dean
871891c2a2 Parse view v1 schema to fix builder crashed caused by 'groupedby' views 2023-10-20 15:35:16 +01:00
Adria Navarro
56ae857d49 Add version to dev .env 2023-10-20 16:21:48 +02:00
Adria Navarro
961913b88a Use version from environment 2023-10-20 16:21:35 +02:00
Andrew Kingston
9a72c418c9 Remove duplicate comment 2023-10-20 14:13:30 +01:00
Michael Drury
8e76618a85
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 12:45:18 +01:00
Andrew Kingston
3bfa6e9d60
Merge branch 'master' into grid-inline-searching 2023-10-20 12:32:07 +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
940801d8ea
Merge branch 'master' into grid-all-datasources 2023-10-20 11:54:42 +01:00
Dean
49389c2f35 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-20 11:31:51 +01:00
Andrew Kingston
db286d431a Fix dependsOn logic for gridblock after renaming setting key 2023-10-20 11:20:14 +01:00
Andrew Kingston
fa90629139 Improve grid datasource backwards compatibility 2023-10-20 11:14:24 +01:00
Dean
22a8f7bfae Lint, removed dependancy import 2023-10-20 11:09:00 +01:00
Andrew Kingston
7fd7943a5a Remove required prop from gridblock to ensure backwards compatiblity 2023-10-20 11:07:37 +01:00
Dean
45d1551083 PR feedback 2023-10-20 11:03:59 +01:00
Andrew Kingston
452dc92356 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-20 10:41:08 +01:00
Dean
3e51557281 Feedback update, add tag to getsections fn definition 2023-10-20 10:38:34 +01:00
Dean
7de000e5df Lint 2023-10-20 10:15:33 +01:00
Dean
276ec8c71b Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-20 10:10:57 +01:00
Dean
f135af1957 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-20 09:45:29 +01:00
Dean
3e9104a4d1 Refactored naming logic into common area in the event that there is no title. 2023-10-20 09:44:42 +01:00
Andrew Kingston
8d2530d4c8 Swap let for const 2023-10-20 09:19:05 +01:00
Andrew Kingston
357f495c0d Respect grid visibility and ordering by default when rendering tables 2023-10-20 09:14:15 +01:00
Andrew Kingston
880c509f64 Always use custom table columns if provided to ensure we allow showing hidden columns if requested. Use grid visibility and order metadata by default in tables 2023-10-20 09:13:42 +01:00
Andrew Kingston
ff257abab3 Update copy for table column widths to inform user that a unit is required 2023-10-20 09:09:32 +01:00
Andrew Kingston
d0b71ada08 Ensure BBUI table component ignores numeric widths that are invalid 2023-10-20 09:08:45 +01:00
Adria Navarro
806685014b
Merge branch 'master' into BUDI-7641/remove-npm-from-apps-worker-docker 2023-10-20 10:07:33 +02:00
Adria Navarro
6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Sam Rose
a3ad8780de
Implement many-to-many user column migrations. 2023-10-19 17:28:55 +01:00
mike12345567
d1b551c6aa Type fixes. 2023-10-19 16:56:45 +01:00
Adria Navarro
a30982177f Update pro 2023-10-19 17:06:26 +02:00
Dean
c983d844d3 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-19 12:30:59 +01:00
Dean
f59d622291 Moved buttons section below fields 2023-10-19 12:28:28 +01:00
mike12345567
470735cc97 Updating types across old table utilities. 2023-10-19 12:26:29 +01:00
Dean
3b0a9fdfcb Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow 2023-10-19 12:11:43 +01:00
mike12345567
f072a77d9f Updating throw. 2023-10-19 12:03:49 +01:00
mike12345567
54d976f750 Fixing PR comments. 2023-10-19 12:02:49 +01:00
Dean
b6de1c544b Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow 2023-10-19 12:01:00 +01:00
Dean
ad54b31667 Moved label align and button size into styles section of form block. Added tagged component settings section to the style section. General settings and sections now have a tag property for filtering. 2023-10-19 12:00:47 +01:00
Andrew Kingston
94654e9888 Allow manifest key to initially collapse settings sections 2023-10-19 11:31:56 +01:00
Andrew Kingston
a069b343e9 Allow settings sections to be collapsible 2023-10-19 11:29:37 +01:00
Adria Navarro
35f7aa0955
Merge branch 'master' into BUDI-7641/remove-npm-from-apps-worker-docker 2023-10-19 12:02:45 +02:00
Adria Navarro
63a26ac823 Fix dependencies 2023-10-19 11:16:52 +02:00
Adria Navarro
3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
Sam Rose
77729737bc
First test passes! 2023-10-19 09:47:50 +01:00
mike12345567
9bd67595ec Merge branch 'master' of github.com:Budibase/budibase into refactor/improve-table-sdk 2023-10-18 19:05:23 +01:00
mike12345567
2d5818ae33 Updating datasource controller to use SDK rather than calling through controllers. 2023-10-18 18:58:58 +01:00
mike12345567
25ad78a94e Adding utilities. 2023-10-18 18:58:27 +01:00
mike12345567
8d1163e50d Adding external SDK, updating external controllers. 2023-10-18 18:58:19 +01:00
mike12345567
6bfa9d407b Adding internal SDK, updating internal table controllers. 2023-10-18 18:57:52 +01:00
mike12345567
291a97a078 Moving getters. 2023-10-18 18:57:30 +01:00
mike12345567
35e6452ecb Adding basic structure for the external/internal SDK. 2023-10-18 18:57:19 +01:00
Sam Rose
6517150f32
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 18:05:18 +01:00
Sam Rose
1771b5905a
Most of the way to getting my first test passing. 2023-10-18 18:02:10 +01:00
Sam Rose
6ae5451fdf
Create failing test. 2023-10-18 16:56:55 +01:00
Andrew Kingston
9d62affe07 Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns 2023-10-18 16:00:59 +01:00
Andrew Kingston
16a361b366 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-18 16:00:31 +01:00
Andrew Kingston
41e72a28c9
Merge branch 'master' into grid-all-datasources 2023-10-18 15:59:12 +01:00
Andrew Kingston
05133d7e69 Ensure data section grid sort column options are properly filtered down 2023-10-18 15:44:27 +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
mike12345567
13dadbcc7d Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-18 15:22:00 +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
Sam Rose
c84abb3e86
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 15:15:06 +01:00
Sam Rose
c25de74e17
Action Michael's feedback about the structure of this feature. 2023-10-18 15:14:34 +01:00
Adria Navarro
ba053490dc Npm-less images 2023-10-18 16:08:54 +02: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
Andrew Kingston
93d717d2e9 Fix add new row setting not being enough to edit new rows with also enabling edit rows flag 2023-10-18 14:25:59 +01:00
Andrew Kingston
faa70b79b6 Fix on click actions not working when using non DS+ datasources and edit row setting is hidden but enabled 2023-10-18 14:21:09 +01:00
Michael Drury
93464f3fcf
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:23:40 +01:00
Michael Drury
30fadf0138
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:05:33 +01:00
jvcalderon
362ac27422 Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 14:04:24 +02:00
jvcalderon
44474b063a Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 13:43:11 +02:00
jvcalderon
5b2f55a592 Per user per creator changes 2023-10-18 13:36:34 +02:00
Dean
0d67f000f0 Initial reflow of the block settings 2023-10-18 12:19:24 +01:00
Sam Rose
5747f30b5f
Precondition checks to make sure the migration is from the right column to the right column. 2023-10-18 12:04:50 +01:00
Michael Drury
1d951a5d79
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 12:04:32 +01:00
Michael Drury
b98f313754
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 12:04:22 +01:00
Sam Rose
f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files 2023-10-18 11:45:52 +01:00
Michael Drury
b697872cf8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 11:44:56 +01:00
Dean
0ce44d8540 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-18 11:37:51 +01:00
Michael Drury
0c9f483c39
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 11:31:53 +01:00
Dean
a064512224 Added description field to the formblock 2023-10-18 11:14:16 +01:00
Adria Navarro
06ae3fb52c Log warn 2023-10-18 12:07:50 +02:00
mike12345567
68e8630d85 Improving the typing around the ExternalRequest object, which has implications throughout the row API and SDK, cleaning up where possible based on it. 2023-10-18 10:57:04 +01:00
Sam Rose
3634687442
Create endpoint and controller function for user column migration. 2023-10-18 10:31:36 +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
ea1853c78c Remove sentry from the backend 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
Andrew Kingston
dadb368279 Lint and add hover styles for deleting prompts 2023-10-18 08:31:29 +01:00
Andrew Kingston
c37538d611 Use CSS content-visibility to improve rendering performance by hiding offscreen grid cells 2023-10-18 08:17:18 +01:00
Andrew Kingston
4e703fdfcc Remove concept of rendered columns from grid and instead render all columns 2023-10-18 08:17:03 +01:00
Andrew Kingston
5e8e4add4a Make it less painful to delete columns 2023-10-18 08:16:59 +01:00
Andrew Kingston
71712d422a Fix alert when duplicate auto columns exist 2023-10-18 08:16:56 +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
Michael Drury
65ab26ca97
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 17:02:51 +01:00
Sam Rose
767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
mike12345567
cad637a0c1 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-17 15:46:58 +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
e1ba96c5d0
Merge branch 'master' into feature/buttongroup-component 2023-10-17 14:08:26 +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
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
Michael Drury
b8c1a054f8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 11:03:30 +01: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
Andrew Kingston
74cab11191 Improve grid sorting labels to account for date types and provide better labels 2023-10-16 17:17:14 +01:00
Andrew Kingston
a857eb266c Ensure keyboard events while inline searching are not captured by the main grid keyboard manager 2023-10-16 17:12:25 +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
7f33b28294 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-16 16:49:01 +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
8c0ed39652 submodule 2023-10-16 14:53:57 +01: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
Andrew Kingston
ddda57fa2a Review comments and simplification 2023-10-16 12:01:07 +01:00