Commit Graph

27343 Commits

Author SHA1 Message Date
Sam Rose 4093f311c9
Respond to PR feedback. 2023-12-19 09:47:12 +00:00
Sam Rose 3f18553a97
Merge branch 'master' of github.com:budibase/budibase into limit-js-execution-per-request 2023-12-19 09:42:17 +00:00
Sam Rose 3d522ce3d1
Update packages/server/src/api/routes/tests/row.spec.ts
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-12-19 09:40:57 +00:00
Sam Rose cc9ac15fd3
Merge pull request #12613 from Budibase/update-yarn-lock
Update yarn.lock
2023-12-19 08:21:58 +00:00
mike12345567 987e280bc9 Merge branch 'instrument-couch' of github.com:Budibase/budibase into instrument-couch 2023-12-18 18:33:20 +00:00
mike12345567 d681d5298b Type fixes. 2023-12-18 18:33:04 +00:00
Sam Rose 591d4b52f2
Merge branch 'instrument-couch' of github.com:budibase/budibase into instrument-couch 2023-12-18 17:44:06 +00:00
Sam Rose 78d039c949
Update backend-core to dd-trace 4.20.0 2023-12-18 17:43:50 +00:00
Sam Rose b532e4434e
Merge branch 'master' of github.com:budibase/budibase into instrument-couch 2023-12-18 17:43:07 +00:00
mike12345567 e6cfe20432 Fixing build issue. 2023-12-18 17:41:15 +00:00
Sam Rose 85829d4643
Update yarn.lock 2023-12-18 17:13:47 +00:00
Sam Rose c588cb3c4f
Revert yarn.lock. 2023-12-18 17:07:28 +00:00
Sam Rose c25963bc6f
Make tests faster and more robust. 2023-12-18 17:05:50 +00:00
Sam Rose 1c34147357
Add tests for per-request execution timeout. 2023-12-18 17:01:56 +00:00
Sam Rose bd324f3225
Implement per-request JS execution limiting. 2023-12-18 15:29:56 +00:00
Michael Drury 22c0e81308
Merge pull request #12572 from Budibase/feature/uuid-helper
HBS/JS UUID helper
2023-12-18 12:37:03 +00:00
Michael Drury b405814661
Merge branch 'master' into feature/uuid-helper 2023-12-18 12:32:30 +00:00
Michael Drury 407a72dd4f
Merge pull request #12608 from Budibase/fix/acc-portal-ref
Updating account portal to latest deployed
2023-12-18 12:32:15 +00:00
Michael Drury 74b23e669c
Merge branch 'master' into fix/acc-portal-ref 2023-12-18 12:21:36 +00:00
mike12345567 9ec68129d0 Updating account portal to latest deployed. 2023-12-18 12:01:22 +00:00
Budibase Staging Release Bot 819c2a1bb3 Bump version to 2.13.46 2023-12-18 12:00:56 +00:00
mike12345567 f6841308d2 Merge branch 'feature/uuid-helper' of github.com:Budibase/budibase into feature/uuid-helper 2023-12-18 11:46:21 +00:00
mike12345567 c374ac6973 Removing test statement. 2023-12-18 11:45:47 +00:00
Sam Rose ee6dcc2fbf
Merge pull request #12605 from Budibase/update-dd-trace
Update dd-trace to 4.20.0.
2023-12-18 11:11:46 +00:00
Michael Drury dceb623732
Merge branch 'master' into feature/uuid-helper 2023-12-18 11:06:48 +00:00
Sam Rose f503b29e1a
Merge branch 'master' into update-dd-trace 2023-12-18 10:59:50 +00:00
Budibase Staging Release Bot 31181d8186 Bump version to 2.13.45 2023-12-18 09:51:14 +00:00
Sam Rose 840847020b
Merge pull request #12603 from Budibase/optimise-get-link-documents 2023-12-18 09:38:44 +00:00
Sam Rose d848b0559d
Merge branch 'master' into optimise-get-link-documents 2023-12-18 09:31:12 +00:00
Sam Rose 223aeaf337
Update dd-trace to 4.20.0. 2023-12-18 09:30:15 +00:00
Sam Rose c5fa0806c8
Optimise getLinkDocuments 2023-12-18 09:20:44 +00:00
José Vte. Calderón b0ef1cad76
Merge pull request #12601 from Budibase/fix/literals-new-prices
[Fix] Wrong string literals (new plans)
2023-12-18 10:18:20 +01:00
José Vte. Calderón 481be2e027
Merge branch 'master' into fix/literals-new-prices 2023-12-18 10:14:00 +01:00
Adria Navarro 40af0ef31b
Merge pull request #12602 from Budibase/ci/dont-check-submodule-refs-on-oss-refs
[CI] Don't check submodule refs for oss references
2023-12-18 10:11:54 +01:00
Adria Navarro 4abbd2cb04
Merge branch 'master' into ci/dont-check-submodule-refs-on-oss-refs 2023-12-18 09:50:06 +01:00
Adria Navarro 1fb8174ee8
Merge pull request #12595 from Budibase/fix/rm-plan-business
[Changed] Upgrade account portal submodule -> plan list fix
2023-12-18 09:48:00 +01:00
Adria Navarro a855b289a2 Don't check submodule refs for oss references 2023-12-18 09:47:26 +01:00
Adria Navarro 7063622477 Update account-portal ref 2023-12-18 09:43:41 +01:00
jvcalderon 0d56cb8cff Upgrade account portal submodule 2023-12-18 09:37:18 +01:00
jvcalderon e46140cb3a - Avoid BUSINESS plan usage in string literals.
- Change PREMIUM_PLUS by PREMIUM
- Change ENTERPRISE_BASIC by ENTERPRISE
2023-12-18 09:36:11 +01:00
José Vte. Calderón 2586407189
Merge branch 'master' into fix/rm-plan-business 2023-12-18 09:04:46 +01:00
Sam Rose 159a8c0e96
Merge pull request #12597 from Budibase/js-timeout-error
Tell a user if their JS failed due to a timeout.
2023-12-15 16:55:00 +00:00
Sam Rose b963e7081e
Fix test. 2023-12-15 16:50:36 +00:00
Sam Rose 92a230667f
Tell a user if their JS failed due to a timeout. 2023-12-15 16:27:20 +00:00
Sam Rose f1263eeae4
Merge pull request #12591 from Budibase/set-up-dd-version-and-code-tracking
Set up DD version and code tracking.
2023-12-15 15:51:33 +00:00
Sam Rose 4b541ca577
Merge branch 'master' into set-up-dd-version-and-code-tracking 2023-12-15 15:44:05 +00:00
jvcalderon f27e5e96f2 Upgrade submodule 2023-12-15 16:23:30 +01:00
Budibase Staging Release Bot 61d360b8c9 Bump version to 2.13.44 2023-12-15 14:41:06 +00:00
jvcalderon 369048f7e2 Merge branch 'master' into fix/rm-plan-business 2023-12-15 15:35:19 +01:00
jvcalderon 92f59115a0 Upgrade submodule 2023-12-15 15:34:21 +01:00