Commit Graph

26381 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
Adria Navarro b607c17615
Merge pull request #12312 from Budibase/chore/pro-ci-checks
Update pro ref to latest
2023-11-07 18:47:31 +01:00
Adria Navarro 687105aac9
Merge branch 'master' into chore/pro-ci-checks 2023-11-07 18:43:32 +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
Budibase Staging Release Bot 86cfd76b5a Bump version to 2.13.3 2023-11-07 16:37:31 +00:00
deanhannigan 3e3c63b1d9
Merge pull request #12299 from Budibase/fix/export-row-data
Fix filtering/sorting of row exports
2023-11-07 15:38:34 +00:00
Dean 61106bf8d5 Merge remote-tracking branch 'origin/master' into fix/export-row-data 2023-11-07 15:21:47 +00:00
Andrew Kingston cc5418e16e
Update pull_request_template.md
Remove colon in pull request template which break styling
2023-11-07 15:10:27 +00:00
Michael Drury 44d111d42d
Merge pull request #12308 from Budibase/fix-release-trigger
Fix fetching tag on release
2023-11-07 13:03:08 +00:00
Adria Navarro 7dd4521ea8 Fix fetching tag 2023-11-07 13:55:34 +01:00
Adria Navarro ff149c978e Update ref 2023-11-07 13:41:48 +01:00
Budibase Staging Release Bot dc59245b39 Bump version to 2.13.2 2023-11-07 12:20:21 +00: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 958af2677c
Merge pull request #12303 from Budibase/fix/invitation-user-search
Fix for 501 on user invitation
2023-11-07 10:20:14 +00:00
Michael Drury 2ca3d68873
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:14:16 +00:00
Martin McKeaveney c1c9dbb642
Merge pull request #12244 from Budibase/budi-7105-builder-option-for-read-only-form-fields
Read only form fields
2023-11-07 10:13:39 +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
Budibase Staging Release Bot 466d5350e2 Bump version to 2.13.1 2023-11-06 19:50:27 +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 922b903a42
Merge pull request #12300 from gcglinton/FixNginxConfigs
Update nginx-ssl.conf
2023-11-06 19:15:56 +00:00
Greg a5246bc08a
Update nginx-ssl.conf 2023-11-06 13:53:22 -05:00
Martin McKeaveney 3bbf6a2868
Merge pull request #12200 from Budibase/form-block-field-layout
Form block field layout
2023-11-06 18:18:40 +00:00
Martin McKeaveney 411b8e8c5e
Merge branch 'master' into form-block-field-layout 2023-11-06 18:11:49 +00:00
Martin McKeaveney 3b5a9e0057
Merge pull request #12293 from Budibase/budi-7736-relationship-picker-required-validation-fires-immediately
Don't trigger required validation early
2023-11-06 18:11:07 +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 6a76fb4d90
Merge pull request #12109 from zedascouves/master
Add camera choice option to QR scanner field
2023-11-06 18:02:22 +00:00
Martin McKeaveney 511a37732e
Merge branch 'master' into master 2023-11-06 18:02:01 +00:00
Sam Rose 5033388874
Merge pull request #12297 from Budibase/bug/budi-7379-update-action-step-removes-previously-set-relationships-if
Fix `UPDATE_ROW` automation step from blanking out link fields if they haven't changed.
2023-11-06 18:01:35 +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
Adria Navarro 60123d845a
Merge pull request #12294 from Budibase/fix-trigger-release-automatically
Fix triggering release
2023-11-06 15:17:45 +01:00
Adria Navarro f292e22f83 Fix triggering release 2023-11-06 15:07:09 +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