1
0
Fork 0
mirror of synced 2024-08-15 01:51:33 +12:00
Commit graph

10552 commits

Author SHA1 Message Date
Rory Powell
5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
Andrew Kingston
5d0918a6cb Prevent invalid characters in column names when importing tables 2023-07-20 12:21:09 +01:00
mike12345567
e469abb679 reworking frontend to use shared core functions to check if is admin or builder (needs further expansion). 2023-07-19 18:05:02 +01:00
Martin McKeaveney
6a15c65bf5 Merge branch 'develop' into backmerge-master 2023-07-19 17:12:18 +01:00
Martin McKeaveney
979883257e backmerge master 2023-07-19 17:11:15 +01:00
deanhannigan
fbdcba8457 Merge pull request #11255 from Budibase/feature/skippable-tours
Skippable tours
2023-07-19 16:40:19 +01:00
Dean
052f60b94c Merge remote-tracking branch 'origin/develop' into feature/delete-multiple-button-action 2023-07-19 09:05:52 +01:00
Dean
e77a105bb2 General fixes for bindings and the undo/redo behaviour 2023-07-18 16:46:35 +01:00
Andrew Kingston
f10da70233 Fix DND in component tree 2023-07-18 16:19:50 +01:00
Andrew Kingston
6df0ff57a4 Fix edit icons being shown in preview results table 2023-07-18 16:18:02 +01:00
Andrew Kingston
a2238911fa Fix link to users portal 2023-07-18 16:14:49 +01:00
Andrew Kingston
504ddac470 Fix background color of datasource status button 2023-07-18 15:24:44 +01:00
Martin McKeaveney
8c5177facb Merge pull request #10858 from Budibase/labday/debug-panel
Labday/debug panel
2023-07-18 12:25:37 +01:00
Dean
cbc67c6fdb Changed link to secondary to ensure it adapts correctly to the theme 2023-07-18 09:53:47 +01:00
Dean
69e68e27a9 Fixed import for the UserAvatars 2023-07-18 09:42:32 +01:00
Andrew Kingston
ae8ed1a1e5 Add filtering to relationship picker 2023-07-18 09:36:20 +01:00
Dean
9d61de9ddc Merge remote-tracking branch 'origin/develop' into feature/skippable-tours 2023-07-18 09:09:53 +01:00
Andrew Kingston
7c7d909d81 Update validation editor setting to be full width and have descriptive text 2023-07-18 08:56:16 +01:00
Andrew Kingston
d3ab2a31d0 Merge pull request #11186 from Budibase/app-list-improvements
Show all users editing an app in the app list
2023-07-18 08:12:50 +01:00
Adria Navarro
a1226180f1 Merge pull request #11253 from Budibase/BUDI-7189-views-v2-prerefactor
View V2 prerefactor
2023-07-17 20:11:19 +01:00
Dean
19c73dc20e Fixes and linting 2023-07-17 17:44:54 +01:00
Dean
da677864c0 Merge remote-tracking branch 'origin/develop' into feature/skippable-tours 2023-07-17 16:14:56 +01:00
Dean
2ee3427645 Added eventing for the onboarding:skipped. Added a redirect to the data section when skipping. Moved endRoute to the tour level config 2023-07-17 16:14:40 +01:00
deanhannigan
46d2a7e286 Merge pull request #11104 from Budibase/feature/binding-ux-updates
Select autocomplete option on Tab key press.
2023-07-17 14:11:32 +01:00
Dean
263df94076 Altered structure of the tours to allow tour level config with an onSkip fn option. Tour steps now moved to 'steps' entry 2023-07-17 14:07:53 +01:00
Dean
7db92c8aea Removed unnecessary check for automationid 2023-07-17 12:17:42 +01:00
Dean
e2311b8a55 Merge remote-tracking branch 'origin/develop' into feature/automation-collaboration 2023-07-17 11:24:50 +01:00
Dean
f170433902 Added the binding drawer back in for the javascript step 2023-07-17 11:15:57 +01:00
Dean
8ea6feb720 Added autocomplete flag 2023-07-17 10:21:35 +01:00
Andrew Kingston
0ca1850e4a Merge pull request #11176 from Budibase/cheeks-fixes
Grid + collab + tooltip improvements + preview in new tab
2023-07-17 10:17:31 +01:00
Rory Powell
4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Dean
18a05faf67 Ensure the code editors are in the correct modes 2023-07-14 14:19:19 +01:00
Dean
a481eee39e Binding selection fixes, delete controller refactor and some fixes 2023-07-14 09:11:34 +01:00
Dean
ccb82e5575 Merge remote-tracking branch 'origin/develop' into feature/delete-multiple-button-action 2023-07-13 09:11:16 +01:00
Adria Navarro
5fd004b86e Remove view on deletion 2023-07-12 09:46:37 +02:00
Adria Navarro
c7f6f6b73c Merge branch 'develop' into backmerge-20230711 2023-07-11 15:34:58 +01:00
Andrew Kingston
d92589156c Make new datasource page and new screen page consistent with each other 2023-07-11 14:14:00 +01:00
melohagan
89c0d3b389 Add BigInt type support (#11145) (#11195)
* Add BigInt type

* Allow BigInt columns to be added

* Sort fixes

* Add BigInt field
2023-07-11 14:01:55 +01:00
Adria Navarro
d858fa817e Merge pull request #11185 from Budibase/budi-7113-self-host-console-log-export
Self host console log export
2023-07-11 14:01:52 +01:00
Andrew Kingston
2dafdc1fd7 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-07-11 13:59:00 +01:00
Andrew Kingston
85e1073dec Merge pull request #11109 from Budibase/new-design-empty-state
New Empty State for Design Section
2023-07-11 13:55:08 +01:00
melohagan
8f94f6c53b Number of filters set is different between match any and match all in the Data section (#11194)
* Make sure displayed filter count is correct

* Fix for false boolean filter

* Correct filter count in Data section
2023-07-11 13:48:17 +01:00
Andrew Kingston
0974060792 Update screen role modal to use better text and title 2023-07-11 13:41:26 +01:00
Andrew Kingston
82a851dd36 Update text depending on whether the app already has screens 2023-07-11 13:38:17 +01:00
Andrew Kingston
05e5e58073 Merge pull request #11193 from Budibase/action-setting-update
Settings updates
2023-07-11 13:15:41 +01:00
Dean
d99ef7277a Merge remote-tracking branch 'origin/develop' into feature/delete-multiple-button-action 2023-07-11 12:51:31 +01:00
Dean
94fc6d8b0f Merge commit 2023-07-11 12:47:17 +01:00
Andrew Kingston
a2d4a8afd8 Merge pull request #11162 from Budibase/fix/duplicate-bindings-when-editing-button-actions
Filter duplicate state bindings when editing Update State button action.
2023-07-11 12:12:52 +01:00
Andrew Kingston
83f7b28fdd Update field configuration setting to be full width and show number of fields 2023-07-11 11:17:11 +01:00
Adria Navarro
911a352844 Remove autocolumns on creation 2023-07-11 12:14:56 +02:00
Andrew Kingston
50451c8c43 Update columns setting to show the number of columns 2023-07-11 11:14:02 +01:00
Andrew Kingston
f084a36fe7 Update action setting to be full width 2023-07-11 11:11:25 +01:00
melohagan
0ccfaf03af Fixing problems when switching between match any and match all (#11179)
* Make sure displayed filter count is correct

* Fix for false boolean filter
2023-07-11 10:06:19 +01:00
Adria Navarro
d3536e0222 Renames 2023-07-11 10:44:10 +02:00
Adria Navarro
6bd4157485 Clean 2023-07-11 10:44:10 +02:00
Adria Navarro
4b32c51924 Prevent spamming button 2023-07-11 10:44:10 +02:00
Adria Navarro
fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Andrew Kingston
b1bf8dd774 Merge branch 'cheeks-fixes' of github.com:Budibase/budibase into app-list-improvements 2023-07-10 17:44:14 +01:00
Andrew Kingston
be7e262919 Merge branch 'develop' into cheeks-fixes 2023-07-10 17:44:03 +01:00
Andrew Kingston
b335e492d7 Show all users editing an app in the app list 2023-07-10 17:42:27 +01:00
Rory Powell
c847bdec31 Lint fix 2023-07-10 16:42:15 +01:00
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