Commit Graph

21931 Commits

Author SHA1 Message Date
Adria Navarro 6fd8a58850
Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-08 17:05:42 +01:00
Michael Drury f5680dfa84
Merge branch 'master' into fix/11972-external-relationship-formulas 2023-11-08 15:01:37 +00:00
mike12345567 8d98da6c57 Fixing issue with table names. 2023-11-08 14:57:30 +00:00
Peter Clement 4da8a3899f
Merge branch 'master' into fix/automation-layout-styling 2023-11-08 14:50:40 +00:00
mike12345567 4dc6b1eeda Merge branch 'master' of github.com:Budibase/budibase into fix/11972-external-relationship-formulas 2023-11-08 14:41:53 +00:00
Peter Clement 0cd5b1f431
Merge branch 'master' into fix/automation-layout-styling 2023-11-08 14:14:26 +00:00
Peter Clement f7fabf152d css fixes 2023-11-08 13:55:34 +00:00
Sam Rose 969508cd1c
Merge branch 'better-types-in-global-users' of github.com:budibase/budibase into better-types-in-global-users-2 2023-11-08 13:53:28 +00:00
Sam Rose 1c5cce5551
Merge branch 'master' into better-types-in-global-users 2023-11-08 13:53:01 +00:00
Peter Clement b167fd08e1 Fix issues with automation layout styling 2023-11-08 13:27:25 +00:00
mike12345567 935ec4c47e Updating layout typing. 2023-11-08 12:57:07 +00:00
mike12345567 e8fb43d30c Updating DesignDocument and View typing - making it more clear how view and lucene indexing works. 2023-11-08 12:46:00 +00:00
Sam Rose 46914645fe
Merge branch 'master' into fix-test-flake-in-row-tests 2023-11-08 11:56:13 +00:00
Sam Rose d146df5f73
Convert user.spec.js to user.spec.ts 2023-11-08 11:53:00 +00:00
Peter Clement d86e943765 Automation history issue fix 2023-11-08 10:27:15 +00:00
Sam Rose 19b4ed070c
Reduce the likelihood of collisions in table names by using a UUID instead of a random word. 2023-11-08 10:25:28 +00:00
Sam Rose 0633a3de65
WIP 2023-11-08 10:03:22 +00:00
Sam Rose 6250609a30
Merge branch 'master' of github.com:budibase/budibase into better-types-in-global-users 2023-11-08 09:26:46 +00:00
Sam Rose 57eb23dc50
Remove unnecessary type cast. 2023-11-08 09:24:51 +00:00
Adria Navarro 46e72a9ac3 Add missing dev settings 2023-11-07 19:43:43 +01:00
Michael Drury 18c417f02f
Merge branch 'master' into fix/11972-external-relationship-formulas 2023-11-07 18:35:43 +00:00
mike12345567 68a3e030c2 Adding test case to check that relationships can be used in external table formulas. 2023-11-07 18:34:51 +00:00
Adria Navarro a945b52f9a Rename dev:builder to dev (unifying account-portal) 2023-11-07 19:15:40 +01:00
Sam Rose fdfda100c1
Ensure that the DB always returns Documents. 2023-11-07 18:14:52 +00: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
mike12345567 8d35453f01 Adding test case for circular detection. 2023-11-07 13:56:42 +00:00
mike12345567 312415ca7d Enforcing squash for rows which contain circular structures. 2023-11-07 13:47:21 +00:00
mike12345567 c1f9ef1bce Merge branch 'fix/11972-external-relationship-formulas' of github.com:Budibase/budibase into fix/11972-external-relationship-formulas 2023-11-07 13:38:28 +00:00
mike12345567 fdae7ab913 Fixing issues discovered by tests. 2023-11-07 13:37:45 +00:00
Michael Drury c7f3fcd740
Merge branch 'master' into fix/11972-external-relationship-formulas 2023-11-07 13:11:12 +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
mike12345567 49b00ee7ee Fixing build issue. 2023-11-07 11:07:25 +00:00
Michael Drury 2ca3d68873
Merge branch 'master' into fix/invitation-user-search 2023-11-07 10:14:16 +00:00
mike12345567 d2a156d5f0 Merge branch 'master' of github.com:Budibase/budibase into fix/11972-external-relationship-formulas 2023-11-07 10:10:17 +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
mike12345567 635af0f76a Getting external rows to be more consistent with the internal API - the formulas should be processed using the outputProcessing as they were being processed, but was causing an overwrite. The problem was that the external system internally processed the formulas/relationships, then squashed the relationships. Once it got to the external API, it would go through normal output processing, which would run over the squashed rows, causing an inconsistent behaviour. 2023-11-06 19:03:37 +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