Commit Graph

34336 Commits

Author SHA1 Message Date
Adria Navarro 14bc9a7390 Fix merge conflicts 2024-09-03 11:28:43 +02:00
Adria Navarro 3cee97aa02 Merge branch 'master' into feat/pick-relationship-fields 2024-09-03 11:19:18 +02:00
Peter Clement 66fdf03398
Refactor automation orchestrator to support branching (#14461)
* refactor automation thread

* fix infinite loop in branching

* remove try catch

* remove spacing

* remove unecessary addition of branch outputs

* pr comments

* remove loopstep instance variable

* add test to cover failure scenario

* add tests for other automationf ailure conditions

* update test name

* use private keyword instead of underscore

* parse int / string safely

* fix refs

* add condition support for branching and tests

* create helper function for recursing all search filters

* move helper func

* fix import
2024-09-03 08:33:41 +00:00
Adria Navarro 8702ccd7fe
Merge pull request #14476 from Budibase/feat/row-action-view-security
Row action view security
2024-09-03 10:22:32 +02:00
Adria Navarro 1be8289677
Merge branch 'master' into feat/row-action-view-security 2024-09-03 10:13:22 +02:00
Michael Drury 1005b83fd5
Merge pull request #14501 from Budibase/budi-8606-view-calculation-typing
Types for new view calculation feature.
2024-09-02 16:13:06 +01:00
Sam Rose bb8ba16b30
Types for new view calculation feature. 2024-09-02 15:28:20 +01:00
Adria Navarro fc3684c73c
Merge branch 'master' into feat/pick-relationship-fields 2024-09-02 16:05:17 +02:00
Mike Sealey e2a355b4b1
Merge pull request #14500 from Budibase/BUDI-8607
Fixes App-Preview Z-index issue
2024-09-02 14:11:23 +01:00
mikesealey 3aad185f5f reverts unintended hosting change 2024-09-02 13:42:26 +01:00
mikesealey ee50012775 tweaks z-index to show preview above bindings drawer 2024-09-02 13:37:36 +01:00
Christos Alexiou 4c15d4b103
Merge pull request #14499 from Budibase/ops/pass-license-type-to-triggered-fbs
Add LICENSE_TYPE
2024-09-02 14:10:14 +03:00
Christos Alexiou 5702611bd1 Add LICENSE_TYPE 2024-09-02 14:03:15 +03:00
Sam Rose 716ee4c87b
Merge pull request #14486 from Budibase/budi-8435-remove-auto-columns-for-created-by-and-created-at
Disable creation of createdAt and createdBy auto columns when default values is enabled.
2024-09-02 11:20:41 +01:00
Sam Rose 3a516e8356
Merge branch 'master' into budi-8435-remove-auto-columns-for-created-by-and-created-at 2024-09-02 11:13:11 +01:00
Budibase Staging Release Bot d5a79cb015 Bump version to 2.31.4 2024-09-02 09:36:14 +00:00
Martin McKeaveney cbf6891c5f
Merge pull request #14411 from Budibase/poc-authenticated-iframe
Poc authenticated iframe
2024-09-02 09:08:56 +01:00
Martin McKeaveney f7b2c77be4
Merge branch 'master' into poc-authenticated-iframe 2024-09-02 09:08:20 +01:00
Martin McKeaveney 9924ad20e0 lint 2024-09-02 08:58:28 +01:00
Adria Navarro 3d1c861222
Merge branch 'master' into feat/pick-relationship-fields 2024-08-31 20:24:00 +02:00
melohagan fc367476c1
Make sure setEnrichedUsers is called when tenantOwnerLoaded (#14491) 2024-08-30 17:40:43 +00:00
Michael Drury 4b5ab43266
Merge pull request #14484 from Budibase/fix/sqs-default-dev-on
Enable SQS by default in development
2024-08-30 18:16:20 +01:00
Martin McKeaveney d5f58fc6c8 merge 2024-08-30 18:08:40 +01:00
Michael Drury 9b84d959dc
Merge branch 'master' into fix/sqs-default-dev-on 2024-08-30 18:07:51 +01:00
Martin McKeaveney 9b4c89746a update submodule references 2024-08-30 18:06:30 +01:00
mike12345567 d5bc5debac Another fix. 2024-08-30 17:57:02 +01:00
Michael Drury 971ebd6584
Merge pull request #14489 from Budibase/dependabot/npm_and_yarn/micromatch-4.0.8
Bump micromatch from 4.0.5 to 4.0.8
2024-08-30 17:48:12 +01:00
Sam Rose 955a3a6883
Merge branch 'master' into budi-8435-remove-auto-columns-for-created-by-and-created-at 2024-08-30 17:47:36 +01:00
mike12345567 70708dc36e Adding back missing tests. 2024-08-30 17:47:08 +01:00
mike12345567 7c1f2522e2 Another test. 2024-08-30 17:42:54 +01:00
Michael Drury 5283cac57c
Merge branch 'master' into dependabot/npm_and_yarn/micromatch-4.0.8 2024-08-30 17:40:22 +01:00
Michael Drury 09c50fd9c0
Merge pull request #14488 from Budibase/dependabot/npm_and_yarn/examples/nextjs-api-sales/micromatch-4.0.8
Bump micromatch from 4.0.4 to 4.0.8 in /examples/nextjs-api-sales
2024-08-30 17:40:11 +01:00
mike12345567 998e95a402 Fixing yarn lock. 2024-08-30 17:37:17 +01:00
mike12345567 0c699da7a2 Merge branch 'master' of github.com:Budibase/budibase into dependabot/npm_and_yarn/micromatch-4.0.8 2024-08-30 17:35:42 +01:00
Michael Drury 348977374b
Merge branch 'master' into dependabot/npm_and_yarn/examples/nextjs-api-sales/micromatch-4.0.8 2024-08-30 17:34:52 +01:00
mike12345567 6249f41bbb Make sure Lucene correctly sets environment variables in development tests. 2024-08-30 17:34:10 +01:00
melohagan 3f357561d0
The UI should indicate who the account holder is (#14470)
* Get tenantInfo in user fetch

* Add account holder label in users table

* Don't allow account holder to be selected in users table

* Sort account holder to top of list

* Only use account holder role in users table

* lint

* Remove joi validation from tenant-info endpoint

* Remove dayPasses

* Catch CouchDB 404 and return undefined

* Don't allow account holder role to be changed UI

* Don't offer delete option for tenant owner

* Backend validation to ensure account holder role cannot be updated

* Don't allow account holder role to be changed UI

* Get tenantOwner in separate call

* Pass data into SelectEditRenderer

* Rename var to __selectable

* setEnrichedUsers

* Update pro reference

* Only load tenantOwner once
2024-08-30 16:29:38 +00:00
Michael Drury ab2f014da7
Merge branch 'master' into budi-8435-remove-auto-columns-for-created-by-and-created-at 2024-08-30 17:24:24 +01:00
dependabot[bot] 5930d396b5
Bump micromatch from 4.0.5 to 4.0.8
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-30 16:21:38 +00:00
dependabot[bot] 92df98581f
Bump micromatch from 4.0.4 to 4.0.8 in /examples/nextjs-api-sales
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.4 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.4...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-30 16:20:33 +00:00
Michael Drury ab0d658930
Merge pull request #14487 from Budibase/fix/pro-submodule-issue-2
Pro submodule check issue
2024-08-30 17:19:51 +01:00
mike12345567 bdfd64c98c Fixing view test. 2024-08-30 17:19:04 +01:00
mike12345567 afe81fcf69 Adding condition to make sure pro and base commit aren't identical when erroring. 2024-08-30 17:14:02 +01:00
mike12345567 0311e8433b Fixing tests so they can work with SQS. 2024-08-30 17:06:30 +01:00
Sam Rose 7cbfd7be84
Disable creation of createdAt and createdBy auto columns when default values is enabled. 2024-08-30 15:58:11 +01:00
mike12345567 b622df2683 Defaulting SQS to on in development environments, this removes the need for setting it in the management scripts. 2024-08-30 15:10:55 +01:00
Adria Navarro e2e49d641b
Merge branch 'master' into feat/pick-relationship-fields 2024-08-30 15:32:45 +02:00
Michael Drury 10dc832587
Merge pull request #14480 from Budibase/update-pro-3
Update pro to latest master.
2024-08-30 14:21:16 +01:00
Michael Drury 2d030d442b
Merge branch 'master' into update-pro-3 2024-08-30 14:12:02 +01:00
Adria Navarro 64c2a18934
Merge branch 'master' into feat/pick-relationship-fields 2024-08-30 14:45:01 +02:00