Commit Graph

10491 Commits

Author SHA1 Message Date
Rory Powell 5bd756e65e Merge branch 'master' into merge-master 2023-07-10 16:13:21 +01:00
Rory Powell 407f1bbb0a Lint 2023-07-10 15:04:46 +01:00
Andrew Kingston 4948086952 Fix issue in develop 2023-07-10 14:50:07 +01:00
Andrew Kingston f79b298a36 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-07-10 14:48:19 +01:00
Rory Powell 836fdf492c Fix curl import 2023-07-10 14:40:00 +01:00
Martin McKeaveney 5bebbfa82c Merge pull request #11143 from diogenesbrussels/diogenesbrussels-hb-help-link
The handlebars help link opens in another window
2023-07-10 14:25:28 +01:00
Andrew Kingston d98c0bdcea Add option to open app preview in new tab 2023-07-10 13:53:37 +01:00
Andrew Kingston 52cd16f42d Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-07-10 13:05:09 +01:00
Andrew Kingston dcf392fc94 Remove testing stuff 2023-07-10 11:51:32 +01:00
Andrew Kingston ca375b7c39 Lint 2023-07-10 11:51:07 +01:00
Dean 2aa68612b6 Linting 2023-07-10 09:49:00 +01:00
Dean db501fb10a Enabled collaboration behaviour in the automation section 2023-07-10 09:30:15 +01:00
Rory Powell 974b7d8514 Integrate UI with identifier API 2023-07-08 13:08:51 +01:00
mike12345567 faf34788ca Merge branch 'master' of github.com:Budibase/budibase into develop 2023-07-07 16:16:54 +01:00
Andrew Kingston ce90f9cd25 Improve position of user avatar tooltips 2023-07-07 16:05:23 +01:00
Andrew Kingston 62e452dfe7 Update user avatars and selection state for collaboration 2023-07-07 15:45:18 +01:00
melohagan 7a06fcee0f Add BigInt type support (#11145)
* Add BigInt type

* Allow BigInt columns to be added

* Sort fixes

* Add BigInt field
2023-07-07 15:11:41 +01:00
Andrew Kingston 99ef4f2992 Add new temporary tooltip component. Improve tooltips and user avatars 2023-07-07 14:46:41 +01:00
Andrew Kingston 35150af784 Update multiple usages of tooltips to use new tooltip 2023-07-07 12:09:23 +01:00
Dean ca40d39d50 Added presence check for the entities object when fetching tables 2023-07-07 11:21:40 +01:00
Andrew Kingston e3f73473c3 Update only user check to account for 0 users 2023-07-07 09:13:26 +01:00
Rory Powell 1fde82bd81 Aesthetic UI updates 2023-07-06 21:58:20 +01:00
Martin McKeaveney abce52d846 merge 2023-07-06 21:58:19 +01:00
Rory Powell 1ba3665ed4 Updates to upgrade page to change config based on offlineMode value 2023-07-06 20:47:12 +01:00
Gerard Burns 808e0d1ef2 Linting improvements (#11119) 2023-07-05 18:00:50 +01:00
Dean 3ae4493903 Filter out old or unused bindings when editing update state button actions 2023-07-05 17:35:20 +01:00
Andrew Kingston 0ef0da6b78 Merge pull request #11135 from Budibase/design-collab
Multi-user collaboration for everything except automations
2023-07-05 16:32:24 +01:00
mike12345567 68c000a2db Merge branch 'master' of github.com:Budibase/budibase into develop 2023-07-05 16:18:34 +01:00
Olivier@Diogenes b6b7200d71 The handlebars help link opens in another window 2023-07-05 15:15:57 +02:00
Gerard Burns 1f59986a87 Use constant for keeping modal open (#11067) 2023-07-05 13:49:39 +01:00
mike12345567 3fef064bcc Quick fix for datasource plus table fetching, make sure the UI lists the tables that the user has requested and no extras. 2023-07-05 10:49:27 +01:00
Andrew Kingston 3e025049d6 Merge branch 'develop' of github.com:Budibase/budibase into design-collab 2023-07-05 10:14:51 +01:00
Andrew Kingston 5d4cd2b4b8 Lint 2023-07-05 10:10:59 +01:00
Andrew Kingston 21cbc751a5 Tidy up screen replacement logic 2023-07-05 10:02:46 +01:00
Andrew Kingston 6603f2fe65 Fix typo in tooltip 2023-07-05 09:56:07 +01:00
Andrew Kingston d1a089f22c Fix publish action from command palette 2023-07-05 09:31:37 +01:00
Andrew Kingston 5c65bc28e1 Add transition to user invite side panel 2023-07-05 09:19:22 +01:00
Andrew Kingston aedd04b98a Fix issue with location of socket metadata 2023-07-05 09:02:10 +01:00
Gerard Burns d4f2364ca4 Fix google sheets import (#11131) 2023-07-04 16:52:20 +01:00
Andrew Kingston 8f601a2c58 Disable reverting to published app version when not the only builder 2023-07-04 15:31:13 +01:00
Andrew Kingston 236aca3489 Disable restoring backups while not the only user 2023-07-04 14:24:33 +01:00
Andrew Kingston f007ec3c58 Add tooltip to side nav items, disable delete and update when not the only user, add transitions to tooltips 2023-07-04 13:54:53 +01:00
Andrew Kingston ec25ccfea0 Fix disabled tooltip in name and url settings 2023-07-04 13:24:18 +01:00
Andrew Kingston 4b9c5dff96 Ensure app can only be updated when you're the only user 2023-07-04 13:19:46 +01:00
Andrew Kingston 99bf0ca03b Sync publish and unpublish events between all users 2023-07-04 13:18:38 +01:00
Gerard Burns 64129fa6b9 Replace screen creation modal with page 2023-07-04 12:01:03 +01:00
Andrew Kingston 44efcee58e Fix tooltip sizes for roles and fix pointer events on nav items 2023-07-04 11:33:06 +01:00
Andrew Kingston dae2c0cfba Fix datasource navigator padding, add other user selection state to design section 2023-07-04 11:28:02 +01:00
melohagan 74b3b3dcc3 Add section setting to field group (#11110)
* Add section setting to field group

* Left aligned fix for oneColumn only

* Only use section for above label position
2023-07-04 10:46:53 +01:00
Andrew Kingston f3ecbca6b4 Merge branch 'develop' of github.com:Budibase/budibase into design-collab 2023-07-04 10:17:51 +01:00
Andrew Kingston 7be2d6896e Add indicators to show selected state in data section 2023-07-04 08:58:14 +01:00
melohagan c9589c1edc Apply column order for Grid block (#11099)
* Apply column order for Grid block

* Refactor

* Do not allow column reorder for Grid block

* Refactor
2023-07-04 08:34:59 +01:00
Adria Navarro 28fa5e4e23 Merge pull request #11106 from Budibase/BUDI-7240/refetch_relationships
BUDI-7240 - Refetch relationships
2023-07-03 15:30:13 +01:00
Dean 22ae329a2a Fix to ensure screens are listed in the navigateTo button action and that any URL configured there is trimmed 2023-07-03 14:48:36 +01:00
Gerard Burns 1274bc32c3 New Design Empty State 2023-07-03 14:12:01 +01:00
Dean 64216f61a9 Added custom tab keybinding to support autocomplete and default editor tab behaviour 2023-07-03 12:48:17 +01:00
Adria Navarro 2cbead8bc4 Fetch relationships 2023-07-03 11:47:42 +01:00
Andrew Kingston d80cca9a11 Allow all users into the design section, enable multi dev collab on screens, improve routing 2023-07-03 11:14:07 +01:00
Adria Navarro 6cb664060e Refetch tables on many to many 2023-07-03 10:13:42 +01:00
Adria Navarro d655e6cbe5 Populate selected tables 2023-06-30 11:43:51 +01:00
deanhannigan 8aabbad269 Merge pull request #11070 from Budibase/fix/general-embed-fixes
General embed fixes
2023-06-30 11:32:20 +01:00
Dean cd43a1a2c2 Clear validation processing when crossing into a side panel component 2023-06-30 09:48:07 +01:00
Dean a5dae87fa9 App update validation updates 2023-06-29 16:51:32 +01:00
Michael Drury 67bee6704b Merge pull request #10803 from GitStartHQ/BUDIOSS-29
Fix CSV encoding issue
2023-06-29 11:15:40 +01:00
Michael Drury b94dab2fab Merge pull request #10640 from GitStartHQ/BUDIOSS-22
[BUDI-7013] Do not allow Webhook automations to be duplicated
2023-06-29 11:15:16 +01:00
Dean 8d98f6ac02 Removed the publish check from the delete app button 2023-06-29 10:47:47 +01:00
Dean 854950581c App metadata screen fixes, copy code button casing and delete app button hidden on publish 2023-06-29 09:53:13 +01:00
Peter Clement 1bb626b726 Merge pull request #11056 from Budibase/features/app-action-automation-ui
Updated Button Action UI for trigger automation
2023-06-29 09:22:33 +01:00
Michael Drury 72e7373073 Merge pull request #11058 from Budibase/feature/budi-7076
Datasource settings tab for SQL databases and SQL schema export functionality
2023-06-28 17:56:03 +01:00
mike12345567 664fb3965c Fixing notification update in EditRoles. 2023-06-28 17:40:50 +01:00
mike12345567 81c8bee81e Quick fix to stop custom role names from being updated. 2023-06-28 17:17:24 +01:00
mike12345567 d8fae3a348 Adding SQL export functionality and settings tab for SQL databases. 2023-06-28 16:52:45 +01:00
Peter Clement 61853e447f remove log 2023-06-28 16:37:17 +01:00
Peter Clement 8c7657a1b6 css tidy 2023-06-28 16:35:40 +01:00
Peter Clement 847684daf1 update sync automation css 2023-06-28 15:59:04 +01:00
Peter Clement c5df68973e update Trigger Automation button action to be more intuitive 2023-06-28 15:05:46 +01:00
Adria Navarro fe86428cc4 Display fields 2023-06-28 14:33:52 +01:00
Adria Navarro 47d6113fee Submit nested 2023-06-28 14:33:52 +01:00
Adria Navarro a95a5f1cb2 Populate fields 2023-06-28 14:33:52 +01:00
Adria Navarro 7037ee6a9f Reuse fields 2023-06-28 14:33:52 +01:00
Adria Navarro 758b4f8254 Allow open by default for field groups 2023-06-28 14:33:52 +01:00
Adria Navarro 352ea72c53 Select and conditional fields 2023-06-28 14:33:52 +01:00
Adria Navarro 534b4fffb4 Allow hiding config 2023-06-28 14:33:52 +01:00
Peter Clement 0114710332 Merge pull request #10992 from Budibase/fix/disable-looping-button
Fix duplicate loop block issue
2023-06-28 12:58:51 +01:00
Gerard Burns 099eee5f8c Fix table selection (#11050) 2023-06-28 12:14:23 +01:00
mike12345567 25d0f3f518 Adding settings tab for SQL datasources. 2023-06-28 11:59:53 +01:00
Andrew Kingston 801f5655ac Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:50:51 +01:00
Gerard Burns 80efb355bd Prompt to create queries (#11045) 2023-06-27 16:49:33 +01:00
Michael Drury f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Andrew Kingston 7308abec0a Merge pull request #11041 from Budibase/feature/iframe-geo-and-fullscreen-permissions
Added fullscreen and geolocation permissions to iframe embed
2023-06-27 16:14:43 +01:00
Andrew Kingston 8c9d4a9126 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:09:59 +01:00
Gerard Burns 9c712de995 lint 2023-06-27 15:51:23 +01:00
Gerard Burns c749209172 PR Feedback 2023-06-27 15:49:17 +01:00
Gerard Burns 363db1d4d9 PR Feedback 2023-06-27 15:20:39 +01:00
mike12345567 fc537a0aab Further PR comments. 2023-06-27 14:56:24 +01:00
Gerard Burns 4387eb2a67 Update datasource config to use tabs 2023-06-27 14:33:11 +01:00
Andrew Kingston 8587aef506 Tidy 2023-06-27 14:25:09 +01:00
Dean 6c7c28f9f1 Added permissions for the embed iframe to support fullscreen and geolocation features 2023-06-27 14:23:25 +01:00
Andrew Kingston a7c6f9a60a Allow deleting external tables that you created 2023-06-27 12:11:58 +01:00
Andrew Kingston 17e7a2d59e Ensure tables and queries are kept in sync when datasource changes occur 2023-06-27 12:03:51 +01:00
Dean eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
Andrew Kingston 9e3711a4c6 Fix data check logic 2023-06-26 18:14:12 +01:00
Andrew Kingston 73ea1022eb Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 18:13:56 +01:00
Andrew Kingston 4d3ea4cc3e Merge pull request #11029 from Budibase/use-modal-for-editing-datasources-v3
Use modal for editing datasources v3
2023-06-26 18:11:16 +01:00
Andrew Kingston b7603f8bf1 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 17:56:11 +01:00
deanhannigan e2625ec1a7 Merge pull request #11030 from Budibase/feature/existing-user-invite-messaging-updates
Extended email duplicate messaging to the create user flow
2023-06-26 17:21:05 +01:00
deanhannigan 1e86f3ac16 Merge pull request #11027 from Budibase/fix/existing-email-invite-messaging
Fix for builder invite error handling and updated messaging
2023-06-26 17:20:28 +01:00
deanhannigan 8dd1ab2cb0 Merge pull request #11032 from Budibase/feature/remove-cloud-flags-for-auth-branding
Removed cloud flag restriction on auth branding pages
2023-06-26 17:02:11 +01:00
Andrew Kingston a3204ad17a Update data section routing to properly handle datasource entities/table sync and handle having no data 2023-06-26 16:34:22 +01:00
Dean b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
Dean 65d7e2397e Removed cloud flag restriction on auth branding pages 2023-06-26 15:50:14 +01:00
Gerard Burns 6b36b8824e PR Feedback 2023-06-26 15:49:42 +01:00
Dean 47c4f72415 Extended email duplicate messaging updates to the create user flow 2023-06-26 14:33:37 +01:00
Gerard Burns 601a855f13 filter out REST fields 2023-06-26 14:32:14 +01:00
Gerard Burns 88582b871e replace use of datasources.save with datasources.update 2023-06-26 14:15:04 +01:00
Gerard Burns f3d5e2b4a0 remove builderstore/datasource 2023-06-26 13:44:23 +01:00
Gerard Burns 3771ab2ffc Update datasource config editing 2023-06-26 13:31:16 +01:00
mike12345567 b94801d10a Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-role-readable-ids 2023-06-26 12:39:41 +01:00
Dean 46e889fd72 Fix for invite error handling and updated messaging 2023-06-26 12:38:13 +01:00
Andrew Kingston 6d38bdcd64 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 11:32:54 +01:00
Andrew Kingston 325818748e Merge pull request #10962 from Budibase/grid-block
Grid block
2023-06-26 11:32:04 +01:00
Andrew Kingston 2a2215f485 Display users table as its own option at the very top of the datasource list 2023-06-26 10:50:54 +01:00
Andrew Kingston 5f407259dc Enable component nesting validation for new apps 2023-06-26 10:39:38 +01:00
Gerard Burns 1606ca0c84 Refactor Datasource Creation Modal (#10783) 2023-06-26 09:52:02 +01:00
Andrew Kingston 8bfb909280 Fix scroll overflow in binding drawer 2023-06-26 09:22:40 +01:00
Andrew Kingston aebc3b2bb8 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-26 09:05:06 +01:00
Andrew Kingston 3f0fac43ea Add padding to secondary user header to match tab spacing 2023-06-26 08:58:25 +01:00
Andrew Kingston 5d14bb70c6 Ensure builder websocket is only instantiated once 2023-06-26 08:58:06 +01:00
Andrew Kingston d3d2f5fa75 Merge pull request #11008 from R2bEEaton/develop
Small Spelling Fix
2023-06-26 08:25:54 +01:00
melohagan 8325b5bb1e Add count to duplicate errors (#10920)
* Add count to duplicate errors

* Lint: Remove unused prop
2023-06-23 18:34:05 +01:00
Dean 6f24772f49 PR Feedback 2023-06-23 16:40:40 +01:00
mike12345567 3d3efadb37 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-23 15:19:49 +01:00
Dean a61cf5fa45 Merge remote-tracking branch 'origin/master' into fix/oidc-custom-icons-fixed 2023-06-23 14:58:47 +01:00
Dean ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
Ryan Eaton 22a8b2cbaa spelling fix 2023-06-23 09:22:05 -04:00
Dean fd8400bee5 PR feedback and removed some comments 2023-06-23 11:56:59 +01:00
deanhannigan 6cbe89bce8 Merge pull request #11002 from Budibase/feature/existing-user-invite-messaging-updates
Updated messaging when attempting to invite existing users.
2023-06-23 11:56:09 +01:00
Andrew Kingston 007b6d605b Merge pull request #10917 from Budibase/fix/datasource-409
Fix datasource conflicts
2023-06-23 11:54:15 +01:00
melohagan a97518ff39 Scroll to field button action (#10901)
* Scroll To Field WIP

* Scroll to the label
2023-06-23 11:51:49 +01:00
Dean 672f1d36e4 Updated the invite response messaging for requests that contain users who are already registered 2023-06-23 09:47:39 +01:00
deanhannigan 2cfb2716f3 Merge pull request #10994 from Budibase/fix/markdown-editor-icons
Added FontAwesome icons used by EasyMDE
2023-06-23 09:05:49 +01:00
mike12345567 5373b867e1 Fix for #10949 - the relationship types were always locked to be the same, which means that the foreign key wasn't being updated correctly as the backend was not aware of which side was the one-to-many side. 2023-06-22 12:32:39 +01:00
Dean 959d3729dc Added config for FontAwesome icons used by EasyMDE in the builder 2023-06-22 12:28:12 +01:00
Peter Clement 77f5567d3a fix duplicate loop block issue 2023-06-22 11:41:23 +01:00
Andrew Kingston bcbeae2279 Rework grid buttons, removing add row and add column buttons, and compression height and width into new size button 2023-06-22 08:16:59 +01:00
mike12345567 45120c60ba Getting basic regex in place to make sure role names can be IDs. 2023-06-21 17:08:54 +01:00
Dean 2bdf855217 Removed app publish state tracking 2023-06-20 17:25:20 +01:00
Dean ac315938f5 Removed comment 2023-06-20 15:08:26 +01:00
Dean f178b86266 Linting 2023-06-20 15:02:53 +01:00
Dean 3607774d7e Added camera permission to the default embed iframe 2023-06-20 14:29:10 +01:00
Michael Drury 958cabee52 Merge pull request #10921 from Budibase/fix/airgap-templates-call
update airgap script and enable support for offline mode
2023-06-20 13:51:10 +01:00
Dean f04f42546a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 12:33:48 +01:00
Dean 602ea9bc4e General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. 2023-06-20 12:33:18 +01:00
Adria Navarro cdd15fd75f Merge pull request #10953 from Budibase/budi-7115-sql-schema-export
BUDI-7115 - Sql schema export
2023-06-20 11:57:46 +01:00
Dean c1248eed12 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 10:08:18 +01:00
mike12345567 3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
mike12345567 e0c21864b8 Merge branch 'develop' of github.com:Budibase/budibase into fix/add-automation-step 2023-06-19 18:53:36 +01:00
Andrew Kingston 9fd04cc2c7 Update multiple settings components to enable more generic usage of column selectors and remove some bespoke copy from generic components. Enable display names for grid columns 2023-06-19 18:49:57 +01:00
Andrew Kingston 7b75d7f13d Update column editor and filter editor to make action buttons full width 2023-06-19 18:32:03 +01:00
Adria Navarro 76ac28f550 Do not rquire min length for all password fields 2023-06-19 17:56:12 +01:00
Andrew Kingston 5350cdf346 Revert testing whitelist 2023-06-19 17:45:07 +01:00
Andrew Kingston 9d8b5e99af Add column setting to grid 2023-06-19 17:38:44 +01:00
Adria Navarro fe2d63f741 Fix lint 2023-06-19 17:33:10 +01:00
Peter Clement 832ee22c0a fix issue with adding automation step 2023-06-19 11:43:00 +01:00
Adria Navarro a0bfebf53d Merge pull request #10894 from Budibase/budi-7010/frontend-encrypt-app-imports
BUDI-7010 - Frontend decrypt app imports
2023-06-19 11:18:38 +01:00
Andrew Kingston 68f21274ed Add settings to grid block for filtering and sorting, and refactor grid logic to allow external control of these stores 2023-06-19 09:54:24 +01:00
Dean 1d184a27cb Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-19 09:11:20 +01:00
Andrew Kingston 6438d23bed Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-19 08:20:42 +01:00
Andrew Kingston 07c79ec592 Fix fonts not loading in builder preview in dev 2023-06-16 14:46:34 +01:00
Dean 8a44baf24b Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-16 12:31:02 +01:00
Dean 2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Andrew Kingston 9e881d071b Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-16 12:09:52 +01:00
Andrew Kingston 224ff4dcbf Merge pull request #10929 from Budibase/fix/font-paths
Fix font paths so they work in both dev and prod
2023-06-16 12:07:09 +01:00
Andrew Kingston 67ef740532 Fix font paths so they work in both dev and prod 2023-06-16 10:34:34 +01:00
Rory Powell 5f716a62a4 Revert "Merge branch 'develop' into master"
This reverts commit 67fb9de7f4, reversing
changes made to ebec885b0a.
2023-06-16 10:13:43 +01:00
Adria Navarro aafb294749 Fix linting issues 2023-06-16 10:08:31 +01:00
Andrew Kingston 70eda7ff81 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-16 10:02:42 +01:00
Martin McKeaveney 7c49dd716c remove console log 2023-06-15 15:29:29 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
Dean 3843b98cf8 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 12:51:25 +01:00
Adria Navarro 2e2b200b45 Merge pull request #10883 from Budibase/budi-7010/frontend-encrypt-app-exports
BUDI-7010 - Frontend encrypt app exports
2023-06-15 12:40:32 +01:00
Adria Navarro df3afe2a7c Merge pull request #10918 from Budibase/budi-5262/support_pg_client_cert
Budi 5262 - Support pg client cert
2023-06-15 12:40:16 +01:00
Dean c876568865 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 12:02:29 +01:00
Adria Navarro b7f0387577 Merge branch 'develop' into budi-5262/support_pg_client_cert 2023-06-15 11:13:52 +01:00
Dean c2f8d54a8a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 10:59:28 +01:00
Dean 08ea400312 Merge commit 2023-06-15 10:59:24 +01:00
Dean e8f28113da Merge commit 2023-06-15 10:56:46 +01:00
Adria Navarro 37e27a881b Merge branch 'develop' into backmerge-master 2023-06-15 10:18:34 +01:00
Adria Navarro f446bd96dd Merge branch 'master' into backmerge-master 2023-06-15 10:16:21 +01:00
Conor Webb 7e3b6fd07b Prevent premature closure of imported users modal. (#10916) 2023-06-15 09:41:17 +01:00
Andrew Kingston f2ce876c5f Refresh tables list when some other user adds a datasource 2023-06-15 09:39:27 +01:00
Andrew Kingston 9e535a1ca4 Account for table 'type' field meaning different things in different endpoints 2023-06-15 09:35:22 +01:00
Andrew Kingston 99a8fc7c12 Revert websocket changes and just fetch datasources constantly 2023-06-15 09:27:45 +01:00
Andrew Kingston 5e5dc902d1 Broadcast datasource change via websocket when making changes to tables 2023-06-15 09:04:21 +01:00
Martin McKeaveney 08894e91d6 fix for fonts in production 2023-06-14 18:48:44 +01:00
Adria Navarro bfc6bb6a6e Add spinner while saving datasources 2023-06-14 17:07:47 +01:00
Adria Navarro fa835e65ef Add loading when saving datasource 2023-06-14 16:57:36 +01:00
Martin McKeaveney 743108b170 using black bb logo instead of gray 2023-06-14 16:55:46 +01:00
Jonny McCullagh 757ca6a166 Merge master develop (#10897)
* Binding drawer fixes

* Added missing headless flag for the bindable combobox

* Fix for QueryEditor width

* Fix svelte transitions in grid new row component breaking routify

* Bump version to 2.7.7

* fix REST connector failure to save

* Bump version to 2.7.8

* Bump version to 2.7.9

* Unexpected token when export data (#10721)

* Tidy ID string for JSON parse

* Display error for composite keys

* Unit test WIP

* directly assign the mock function on the datasource

* Unit tests for exportRows ID handling

---------

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>

* Return all rows if oneOf value is falsey (#10638)

* Bump version to 2.7.10

* Make sure divider fields are left-most (#10627)

* Make sure divider fields are left most

* Refactor

* Bump version to 2.7.11

* Temporarily remove the focus store update as it triggers a full redraw of the component settings

* Linting

* Removed commented out code

* Bump version to 2.7.12

* Bump version to 2.7.13

* Do not show Business tag for Email action (#10867)

* Bump version to 2.7.14

* new deploy trigger (#10892)

* point the deploys at the new env

* Bump version to 2.7.15

---------

Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Adria Navarro f31c615e18 Merge branch 'develop' into backmerge-master 2023-06-14 15:45:47 +01:00