1
0
Fork 0
mirror of synced 2024-07-14 18:55:45 +12:00
Commit graph

11321 commits

Author SHA1 Message Date
Andrew Kingston c25b8a1448 Expose schema context from grid and allow usage in buttons 2023-11-07 14:10:16 +00:00
Andrew Kingston 9f285b32a7 Allow using ephemeral action context for 'buttons' type settings 2023-11-07 13:21:13 +00:00
melohagan f28eb054f3
Set the relationship type (#12275)
* Set the relationship type

* Add users type

* Set user relationship type saveColumn

* Set relationshipType for users type on save

* Add relatioshipType to schema

* Refactor

* Check isUsersColumn

* Make relationshipType optional

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-11-07 11:59:51 +00:00
Andrew Kingston 20f9fd5d1b Merge branch 'master' of github.com:Budibase/budibase into grid-buttons 2023-11-07 11:28:42 +00:00
Michael Drury c128f70c89
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:08:27 +00:00
Dean 7303aaebda Merge remote-tracking branch 'origin/master' into fix/export-data-ui 2023-11-07 09:09:51 +00:00
Martin McKeaveney 2e521ae62c
Merge branch 'master' into form-block-field-layout 2023-11-06 17:59:35 +00:00
Adria Navarro bdd33ac2f5 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 15:59:36 +01:00
Adria Navarro 004e0a5f11 Update jest 2023-11-06 14:24:33 +01:00
Dean 6d3b4243e5 Merge remote-tracking branch 'origin/master' into fix/export-data-ui 2023-11-06 13:13:25 +00:00
Dean 561778cf6a Fixes for exported data UI. Filtered out unnecessary onEmptyFilter filter. 2023-11-06 12:58:47 +00:00
mike12345567 c43bfda45d Fix for user invitations throwing a 501 error due to the way the search was being performed. 2023-11-06 12:38:10 +00:00
Andrew Kingston db8a6a842c
Merge branch 'master' into new-branding 2023-11-06 11:25:16 +00:00
Adria Navarro 3809503a99
Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 11:35:15 +01:00
Andrew Kingston ca891467f3
Merge branch 'master' into form-block-field-layout 2023-11-06 10:10:02 +00:00
Peter Clement 7b7b2a12ea fix issue with stepNames being undefined 2023-11-06 10:06:32 +00:00
Adria Navarro 0bea3ccbbe
Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 10:48:47 +01:00
Andrew Kingston 2cc92803e3 Merge branch 'master' of github.com:Budibase/budibase into new-branding 2023-11-06 09:42:58 +00:00
Andrew Kingston 4b2cc0cb55 Merge branch 'new-branding' of github.com:Budibase/budibase into new-branding 2023-11-06 09:42:42 +00:00
Andrew Kingston 727a9a7154 Remove beta button 2023-11-06 09:41:59 +00:00
Adria Navarro fb9215d2e4 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 10:32:56 +01:00
Andrew Kingston fb1258072c
Merge branch 'master' into new-branding 2023-11-06 09:11:54 +00:00
Peter Clement 635008e173 unique name enforcement for automations 2023-11-03 11:05:05 +00:00
Peter Clement f1802eb41c update modal sizing for automation test data 2023-11-03 10:04:51 +00:00
Mihail Hadzhiev cf2c8796d4
Merge branch 'master' into form-block-field-layout 2023-11-03 10:20:44 +02:00
mike12345567 2dd5a1a344 Merge branch 'feat/automation-naming-ux-updates' of github.com:Budibase/budibase into feat/automation-naming-ux-updates 2023-11-02 17:12:25 +00:00
mike12345567 1125701d02 Merge branch 'master' of github.com:Budibase/budibase into feat/automation-naming-ux-updates 2023-11-02 17:08:43 +00:00
Michael Drury e319c6e3f8
Merge branch 'master' into fix/relationship-issue-one-to-many 2023-11-02 16:32:15 +00:00
Adria Navarro 8c90b9ddfb Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-02 13:35:17 +01:00
Conor Webb c4ff4eb8bb Updated folder name, fixed ui bug. 2023-11-02 10:00:40 +00:00
Peter Clement 6a4c71cd67 Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-11-02 09:19:19 +00:00
Peter Clement ee9ea375f9 use constants 2023-11-02 09:18:45 +00:00
Andrew Kingston 0921bcf333 Add button setting to grid and allow removing all buttons 2023-11-01 11:40:27 +00:00
Conor Webb 9c71ccd2c4 Moved DataSourceSelect into related folder. Changed SelectedItem name. Updated DataSourceSelect imports. 2023-11-01 09:34:10 +00:00
Conor Webb 6cf1b13a0c Feedback related amends. 2023-11-01 09:30:54 +00:00
Conor Webb b2aca0c4a6
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-11-01 07:56:32 +00:00
Martin McKeaveney 0afdff9cb6
Merge branch 'master' into feat/automation-naming-ux-updates 2023-10-31 17:19:14 +00:00
Peter Clement a9db61fdc2 remove users list option 2023-10-31 16:34:01 +00:00
Peter Clement 7cba4d3fb2 formatting found in testing 2023-10-31 16:29:43 +00:00
Conor Webb df688b0596 Fixed linting issues. 2023-10-31 14:36:50 +00:00
Andrew Kingston 5d29046fea
Merge branch 'master' into form-block-field-layout 2023-10-31 14:35:20 +00:00
Michael Drury c0b2c9e448
Merge branch 'master' into fix/relationship-issue-one-to-many 2023-10-31 14:27:52 +00:00
Conor Webb bb19e48a6d Added new DataSourceSelect component. 2023-10-31 14:22:15 +00:00
Andrew Kingston 1146f7e19a Merge branch 'new-branding' of github.com:Budibase/budibase into new-branding 2023-10-31 13:59:47 +00:00
Andrew Kingston 7c1f71745e Update email link and button colours and sort apps in portal side bar 2023-10-31 13:58:59 +00:00
Andrew Kingston c73117e336
Merge branch 'master' into new-branding 2023-10-31 13:56:44 +00:00
Peter Clement b65b601918 remove label 2023-10-31 13:52:28 +00:00
Peter Clement 82c0e3d450 Fix issue with directional relationship being swapped 2023-10-31 13:43:54 +00:00
Peter Clement 8b3eafbede
Merge branch 'master' into feat/automation-naming-ux-updates 2023-10-31 13:08:17 +00:00
Peter Clement 81ca48a331 tidy up and issues found in testing 2023-10-31 13:05:04 +00:00
Andrew Kingston 9e18c666ad Restructure user list page a bit 2023-10-31 12:10:31 +00:00
Conor Webb 0dfe520193
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-10-31 12:04:50 +00:00
Andrew Kingston d5629bb4ec Use proper search structure for users fetch in portal users page 2023-10-31 11:51:46 +00:00
Andrew Kingston fe60aced31 Fix 501 when clearing user search field 2023-10-31 11:50:29 +00:00
Andrew Kingston 560c51aed5 Fix button padding 2023-10-31 11:47:06 +00:00
Andrew Kingston bec32399ef
Merge branch 'master' into form-block-field-layout 2023-10-31 11:32:11 +00:00
Andrew Kingston a857b4aca6 Update help button to use indigo 2023-10-31 11:25:29 +00:00
Andrew Kingston e8f5980905 Update images in emails, readme and a few other usages 2023-10-31 11:13:19 +00:00
Andrew Kingston d9bce880ec Update BB logo across product 2023-10-31 10:58:32 +00:00
Peter Clement 9838c7ad02 Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-31 10:06:31 +00:00
Adria Navarro 18b8d6d3ef Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-31 09:55:30 +01:00
Conor Webb 3d3523b2c0
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-10-31 07:31:05 +00:00
Michael Drury 9643d9c0e2
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-30 17:41:44 +00:00
Sam Rose ca9491ce67
Surface error message from attachments API to user. 2023-10-30 16:55:57 +00:00
Sam Rose 436d6a1585
Revert frontend changes to filter out file extensions in the upload box. 2023-10-30 14:39:12 +00:00
Peter Clement b963bd03e4 fixing undefined name and border issues 2023-10-30 12:55:24 +00:00
Conor Webb e9f0baa12f Added conditional logic to prevent checkmark from appearing on other selects outside of types. 2023-10-30 12:17:36 +00:00
Conor Webb 8f5646a1ed Fixed linting issue. 2023-10-30 10:15:53 +00:00
Conor Webb 0461d86545 Refactored select to match designs used elsewhere. 2023-10-30 09:57:08 +00:00
Sam Rose 00aca08741
Merge branch 'master' of github.com:Budibase/budibase into bug/budi-7689-cdn-issues-attachment-filtering 2023-10-30 09:46:03 +00:00
Adria Navarro 1ec80d074f Fix vite builder 2023-10-27 23:38:11 +02:00
Sam Rose f1aa32e446
Truncate file size on the grid, validate extension in the attachment API. 2023-10-27 17:19:39 +01:00
Sam Rose 5539ff9c9c
Apply valid file types to RowFieldControl and AttackmentField. 2023-10-27 16:53:32 +01:00
Adria Navarro 3ed2aa1d77 Revert major update 2023-10-27 16:59:49 +02:00
Andrew Kingston 35194e4710
Merge branch 'master' into form-block-field-layout 2023-10-27 15:26:43 +01:00
Andrew Kingston 77fa373a90 Remove ability to select fields in preview because it is not compatible with field configuration changes 2023-10-27 15:09:17 +01:00
Adria Navarro 7b7dc84a8e Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 16:05:43 +02:00
Adria Navarro a56babd83a Revert major update 2023-10-27 15:32:57 +02:00
Peter Clement 38fe8375ce fix bindings references being updated 2023-10-27 13:47:34 +01:00
Michael Drury c0a9b0a678
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-27 13:36:52 +01:00
Michael Drury 2bfdd9769e
Merge pull request #12177 from Budibase/feature/make-table-source-id-required
Make sourceId property of table required (for all table types)
2023-10-27 13:35:47 +01:00
Andrew Kingston 8612404f48 Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout 2023-10-27 11:49:39 +01:00
Andrew Kingston b1f2337849 Hide field layout settings for normal field components, and only show them when editing from within a form block 2023-10-27 11:42:01 +01:00
Peter Clement b1dabe7dc5 missing binding 2023-10-27 11:22:34 +01:00
Conor Webb 2b691c169f Ran Prettier to fix linting issue. 2023-10-27 11:13:24 +01:00
Conor Webb d0ea6edad3 Added selected class to data provider options. 2023-10-27 10:55:19 +01:00
Peter Clement bade344834 Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-27 10:46:26 +01:00
Peter Clement 8a7a2abd61 styling / pr comments 2023-10-27 10:45:58 +01:00
Adria Navarro c072c2da47 Update vite packages 2023-10-27 11:07:58 +02:00
Dean 4b1e7359b0 Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-27 10:00:02 +01:00
Adria Navarro 6abb1b5f70 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 10:57:07 +02:00
Andrew Kingston 1d5fc3a175
Merge branch 'master' into fix/view1-sortable-column-config 2023-10-27 09:19:06 +01:00
Peter Clement 89a242f354 fix issue with readable bindings not displayinng correctly 2023-10-27 09:13:27 +01:00
Dean e7fcd08fc6 Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-27 09:03:46 +01:00
Andrew Kingston c61e4fe708
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-27 08:12:31 +01:00
Andrew Kingston acc1e6f14c Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout 2023-10-27 08:07:57 +01:00
mike12345567 d13cc80022 Removing update to gitignore. 2023-10-26 18:23:39 +01:00
mike12345567 fd29b8d949 PR comments. 2023-10-26 17:27:40 +01:00
Peter Clement 35e7dc948d Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-26 16:11:42 +01:00
Peter Clement d864eaa9ea pr comments 2023-10-26 16:05:15 +01:00
mike12345567 ed0670a008 Major update to make the table.type always 'table' and then adding a new sourceType which states what source the table came from, external or internal. Don't want to keep using a type that should be static as two different things. 2023-10-26 13:19:09 +01:00
Gerard Burns 44f9c64ed7
Prevent the key user being used in rest queries (#12072)
* Add warning about unusable user binding

* linting

* remove unnecessary safe nav operators

* change regex to capture property access of user binding
2023-10-26 13:06:25 +01:00
Adria Navarro 3b3586d2bd
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-26 12:58:35 +02:00
Peter Clement 73a7b8eb50 fix formatting of selectors 2023-10-26 11:27:34 +01:00
Peter Clement 8203139c69 fix bug in adding trigger 2023-10-26 11:27:20 +01:00
Gerard Burns 5909b4a7c7
Add template for grid blocks (#12086)
* wip

* linting

---------

Co-authored-by: Mihail Hadzhiev <102024164+MihailHadzhiev2022@users.noreply.github.com>
2023-10-26 11:24:43 +01:00
Mihail Hadzhiev 3473aa61ff
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-26 12:58:52 +03:00
Mihail Hadzhiev e5ff023881
Merge branch 'master' into feature/buttongroup-component 2023-10-26 12:50:47 +03:00
Peter Clement 3eba7990f9 fix bug with smtp name containing parentheses 2023-10-26 10:23:51 +01:00
Dean 6032216e2f Added fix for scenario where componentdefinition was queried befor it existed. Fix to ensure an empty general settings block is not shown 2023-10-26 10:13:22 +01:00
Dean 3b7ed3a7f2 Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow 2023-10-26 09:56:17 +01:00
Andrew Kingston a74f78f31b
Merge branch 'master' into feature/buttongroup-component 2023-10-26 09:14:40 +01:00
Andrew Kingston 0d9e9caff6
Merge branch 'master' into refactor-grid-columns 2023-10-26 08:53:17 +01:00
Sam Rose c9e3b7a348
Remove the previous attempt at syncing grid state, it is no longer needed. 2023-10-25 16:00:14 +01:00
Sam Rose 0ac6b17ff0
Remove stray console.log 2023-10-25 15:33:53 +01:00
Sam Rose 5779e97e6e
Add column name input validation. 2023-10-25 15:29:56 +01:00
Sam Rose fbf60ece4f
Merge base branch. 2023-10-25 14:58:37 +01:00
Andrew Kingston a3226bc905
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-25 14:43:05 +01:00
Sam Rose 70f39b6b6b
Fix missing sourceId on Table sent to the websocket. 2023-10-25 14:41:23 +01:00
Dean 8db0b300fd Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-25 14:26:58 +01:00
Peter Clement 9bc94aa703 remove autocomplete 2023-10-25 14:09:59 +01:00
Andrew Kingston 62f4c3e85b
Merge branch 'master' into refactor-grid-columns 2023-10-25 13:57:22 +01:00
Dean 536a27541f Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-25 13:27:54 +01:00
Peter Clement edb511cbce update field styling and ux for individual blocks 2023-10-25 13:27:01 +01:00
Peter Clement 7910205807 update styling of flow items 2023-10-25 13:26:56 +01:00
Peter Clement aad6ab4fb4 update bindings to use names 2023-10-25 13:26:48 +01:00
Peter Clement a209280daa naming automations 2023-10-25 13:26:42 +01:00
Peter Clement 5f2b4f3ef9 initial styling and input updates for naming 2023-10-25 13:26:33 +01:00
Dean d4ff67b999 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-25 12:34:13 +01:00
Dean b952892c42 Generalised the fix as not all calculations will have a groupby per PR feedback 2023-10-25 12:08:56 +01:00
Dean 66fda3db09 Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config 2023-10-25 09:15:37 +01: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
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 d3670ddf21
Add an input to allow the user to choose the new column name. 2023-10-24 17:22:49 +01:00
Sam Rose 2f0a40e9bb
Introduce modal to show warning to users, and toast to show success. 2023-10-24 15:18:46 +01:00
Adria Navarro 969ab79a61
Merge branch 'master' into feature/buttongroup-component 2023-10-24 14:30:09 +02:00
Andrew Kingston 76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-24 08:55:51 +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
Dean 08a22f1525 Show 'Creator' instead of 'Admin' for the global user role picker 2023-10-23 16:47:05 +01:00
Andrew Kingston 365f9dee62 Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout 2023-10-23 09:15:02 +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
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
Dean 22a8f7bfae Lint, removed dependancy import 2023-10-20 11:09:00 +01:00
Dean 45d1551083 PR feedback 2023-10-20 11:03:59 +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 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 291ecd45fe Allow form block fields to be clicked from within the preview 2023-10-20 09:38:55 +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
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
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 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
Adria Navarro ac9c99aebc Remove sentry packages 2023-10-18 10:50:18 +02:00
Adria Navarro 862fbff45d Remove SENTRY_DSN references 2023-10-18 10:49:15 +02:00
Adria Navarro c281e3ee73 Remove sentry client 2023-10-18 10:49:15 +02:00
Adria Navarro 9838c368eb Unify more packages 2023-10-18 10:49:15 +02:00
Adria Navarro ae729e4466 Fix tests 2023-10-18 10:49:15 +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 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
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 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
Andrew Kingston ddda57fa2a Review comments and simplification 2023-10-16 12:01:07 +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