Commit Graph

21900 Commits

Author SHA1 Message Date
Adria Navarro a945b52f9a Rename dev:builder to dev (unifying account-portal) 2023-11-07 19:15:40 +01:00
Adria Navarro bb2c5af758 Update ref 2023-11-07 19:09:16 +01:00
Adria Navarro ef914882d4 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-07 19:06:33 +01:00
Adria Navarro 4d5d9a0685 Update pro ref 2023-11-07 18:42:41 +01:00
Adria Navarro 9d29e3ddda Update pro ref 2023-11-07 18:31:44 +01:00
Dean 61106bf8d5 Merge remote-tracking branch 'origin/master' into fix/export-row-data 2023-11-07 15:21:47 +00:00
Adria Navarro ff149c978e Update ref 2023-11-07 13:41:48 +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 2ca3d68873
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:14:16 +00:00
Michael Drury c128f70c89
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:08:27 +00:00
Mel O'Hagan c169a73764 readonly css 2023-11-07 09:19:29 +00:00
Dean 1ef97439b0 Merge remote-tracking branch 'origin/master' into fix/export-row-data 2023-11-07 09:09:05 +00:00
Mel O'Hagan fee9a9d65d Merge branch 'master' into budi-7105-builder-option-for-read-only-form-fields 2023-11-07 08:27:04 +00:00
Martin McKeaveney 880e9a911f
Merge pull request #12280 from Budibase/fix/update-bull-queue-parameters
Restore bull parameter changes + reduce Redis config complexity
2023-11-06 19:42:16 +00:00
Martin McKeaveney 411b8e8c5e
Merge branch 'master' into form-block-field-layout 2023-11-06 18:11:49 +00:00
Martin McKeaveney 8c72ad5db1
Merge branch 'master' into budi-7736-relationship-picker-required-validation-fires-immediately 2023-11-06 18:06:28 +00:00
Martin McKeaveney 5dd6c40a29
Merge branch 'master' into fix/update-bull-queue-parameters 2023-11-06 18:02:49 +00:00
Martin McKeaveney 511a37732e
Merge branch 'master' into master 2023-11-06 18:02:01 +00:00
Martin McKeaveney 2a3e31f259
Merge branch 'master' into budi-7105-builder-option-for-read-only-form-fields 2023-11-06 18:01:12 +00:00
Martin McKeaveney 2e521ae62c
Merge branch 'master' into form-block-field-layout 2023-11-06 17:59:35 +00:00
Sam Rose f21addeb71
Add another test to make sure relationships are cleared when asked. 2023-11-06 17:34:30 +00:00
Dean 44f0387ff0 Merge remote-tracking branch 'origin/master' into fix/export-row-data 2023-11-06 17:01:14 +00:00
Dean 9bb9fb5549 Reintroduce filtering and sorting for exported row data 2023-11-06 17:00:47 +00:00
Sam Rose 965efeaff4
Merge branch 'master' of github.com:budibase/budibase into bug/budi-7379-update-action-step-removes-previously-set-relationships-if 2023-11-06 16:58:20 +00:00
Sam Rose 2684b73768
Fix type error. 2023-11-06 16:40:27 +00:00
Sam Rose b02512fd3c
Create a test of a table with 2 link fields in updateRow.spec.ts. 2023-11-06 15:56:58 +00:00
Sam Rose dbcbb2e6b7
Add test to row patch endpoint, it succeeds. Problem must be elsewhere. 2023-11-06 15:33:02 +00:00
Adria Navarro e830906109 Update ref 2023-11-06 16:07:40 +01:00
Adria Navarro bdd33ac2f5 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 15:59:36 +01:00
Adria Navarro 6b3ddefad2 Update ref 2023-11-06 15:58:35 +01:00
Mel O'Hagan 55cacc62dd Merge branch 'master' into budi-7736-relationship-picker-required-validation-fires-immediately 2023-11-06 14:03:45 +00:00
Mel O'Hagan 6ee7ae953d Don't trigger required validation early 2023-11-06 13:56:31 +00:00
Adria Navarro 004e0a5f11 Update jest 2023-11-06 14:24:33 +01:00
Adria Navarro ff4adec9e0 Update ref 2023-11-06 14:06:08 +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
Adria Navarro a9ab03d623 Update ref 2023-11-06 13:29:55 +01:00
Adria Navarro eab3b5e4ef Update ref 2023-11-06 12:56:53 +01: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
Adria Navarro e7e6577ce5 Update ref 2023-11-06 11:12:32 +01:00
Peter Clement 1f737dea2d
Merge branch 'master' into feat/automation-naming-ux-updates 2023-11-06 10:10:13 +00:00
Andrew Kingston ca891467f3
Merge branch 'master' into form-block-field-layout 2023-11-06 10:10:02 +00:00
Duarte Velez Grilo 8e43a87e60
Merge branch 'master' into master 2023-11-06 10:07:16 +00:00
Peter Clement 7b7b2a12ea fix issue with stepNames being undefined 2023-11-06 10:06:32 +00:00
Adria Navarro 266c64e69e Move build to deployments 2023-11-06 11:06:18 +01:00
Adria Navarro 0bea3ccbbe
Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 10:48:47 +01:00
Adria Navarro d568957c1d Clean unused packages 2023-11-06 10:43:21 +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