Commit Graph

10283 Commits

Author SHA1 Message Date
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
Martin McKeaveney 307e6dde02 update bblogoimgur to bblogo 2023-06-14 15:21:46 +01:00
Martin McKeaveney 0f02b31ba7 lint 2023-06-14 15:12:39 +01:00
Martin McKeaveney cd1675098f removing need for external internet assets and self hosting our own fonts 2023-06-14 14:54:27 +01:00
Adria Navarro 672804c150 Merge pull request #10900 from Budibase/budi-7010/export_controller_as_post
BUDI-7010 - Export controller as post
2023-06-14 14:38:01 +01:00