Commit Graph

11165 Commits

Author SHA1 Message Date
Adria Navarro ef914882d4 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-07 19:06:33 +01: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
Michael Drury c128f70c89
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:08:27 +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
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
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