Commit Graph

30966 Commits

Author SHA1 Message Date
Sam Rose 226eff4b23
Merge branch 'sqs-auto-tests' of github.com:budibase/budibase into sqs-auto-tests 2024-04-26 15:08:39 +01:00
Sam Rose 951b7d3e59
Merge branch 'master' of github.com:budibase/budibase into sqs-auto-tests 2024-04-26 15:07:45 +01:00
Michael Drury e0669be929
Merge pull request #13571 from Budibase/revert-13566-fix/upgrade-rollup
Revert "Getting rollup package versions consistent through all packages"
2024-04-26 15:04:27 +01:00
Michael Drury 57c2d25165
Merge branch 'master' into revert-13566-fix/upgrade-rollup 2024-04-26 15:04:19 +01:00
Sam Rose 0624ba4925
Merge pull request #13569 from Budibase/make-reuse-containers-default
Make REUSE_CONTAINERS the default for running tests.
2024-04-26 15:02:54 +01:00
mike12345567 f338a22a3a Pro to latest master. 2024-04-26 15:01:52 +01:00
Michael Drury ff29d36528
Revert "Getting rollup package versions consistent through all packages" 2024-04-26 14:59:19 +01:00
Sam Rose 2bc7b56d74
Merge branch 'master' of github.com:budibase/budibase into make-reuse-containers-default 2024-04-26 14:02:06 +01:00
Sam Rose dd02224806
Restart testcontainers every day, and add a script to kill them. 2024-04-26 14:01:52 +01:00
Michael Drury b186ae41db
Merge branch 'master' into sqs-auto-tests 2024-04-26 13:58:52 +01:00
Michael Drury ebb2fd4b8f
Merge pull request #13566 from Budibase/fix/upgrade-rollup
Getting rollup package versions consistent through all packages
2024-04-26 12:40:05 +01:00
Michael Drury b56da3d2a5
Merge branch 'master' into fix/upgrade-rollup 2024-04-26 12:28:24 +01:00
mike12345567 798be434b4 Updating rollup after weird merge issues. 2024-04-26 12:26:34 +01:00
Adria Navarro 1066c638df
Merge pull request #13568 from Budibase/budi-8123/clean-types
Rename and cleanups
2024-04-26 12:47:06 +02:00
Sam Rose 777b5b5f53
Make REUSE_CONTAINERS the default for running tests. 2024-04-26 11:35:23 +01:00
Adria Navarro a422ae43b2 Fix 2024-04-26 12:26:01 +02:00
Adria Navarro 1aad2ee6d2 Fix after renames 2024-04-26 12:23:11 +02:00
Adria Navarro b1b5b49687 Move and rename BBReferenceFieldSubType 2024-04-26 12:21:53 +02:00
Adria Navarro 637f7f514a Remove FieldTypeSubtypes 2024-04-26 12:18:50 +02:00
mike12345567 6cf2da7944 Pro version to master. 2024-04-26 11:10:13 +01:00
mike12345567 53a02da8c1 Merge branch 'master' of github.com:Budibase/budibase into fix/upgrade-rollup 2024-04-26 11:04:07 +01:00
Sam Rose ca6bdf4c3d
Merge branch 'master' into sqs-auto-tests 2024-04-26 09:41:51 +01:00
José Vte. Calderón b7ea425d7e
Merge pull request #13562 from Budibase/feature/enterprise-basic-trial
[Added] New plan ENTERPRISE_BASIC_TRIAL
2024-04-26 09:22:11 +02:00
jvcalderon d32623c340 Restore account portal submodule 2024-04-26 09:15:36 +02:00
jvcalderon fe68abe6de Upgrade pro and account-portal submodules 2024-04-26 08:55:49 +02:00
mike12345567 22a67eb769 Matching rollup version across all packages, there was a lot of mis-match and I was running into some build issues due to this, getting everything on the same version so that they can all use the same package - this also requires updating all .js extensions to .mjs to correctly support the imports. 2024-04-25 18:43:54 +01:00
Sam Rose cefaa228e1
Delete commented out line. 2024-04-25 17:19:25 +01:00
Sam Rose e15345030f
Uncomment tests. 2024-04-25 16:53:21 +01:00
Sam Rose b07db7b098
Make sure we're treating AUTO as numbers. 2024-04-25 16:51:42 +01:00
Sam Rose 8b2156ed08
Add more AUTO tests. 2024-04-25 16:41:02 +01:00
Sam Rose 289de5906a
Merge branch 'master' of github.com:budibase/budibase into sqs-auto-tests 2024-04-25 15:30:56 +01:00
José Vte. Calderón 33be48ff1f
Merge branch 'master' into feature/enterprise-basic-trial 2024-04-25 13:56:16 +02:00
Andrew Kingston 8a72be5fab
Merge pull request #13510 from Budibase/grid-enhancements
Table enhancements
2024-04-25 12:53:57 +01:00
jvcalderon 4615d9c61c Restore yarn.lock 2024-04-25 13:51:52 +02:00
Andrew Kingston 589bb1cf92
Merge branch 'master' into grid-enhancements 2024-04-25 12:49:55 +01:00
Adria Navarro 6166410d6e
Merge pull request #13559 from Budibase/chore/resolve-oss-pro-via-yarn-resolutions
Resolve oss pro via yarn resolutions
2024-04-25 13:00:04 +02:00
jvcalderon d4c0f489c8 Update Submodules 2024-04-25 12:02:23 +02:00
jvcalderon c79ea9b067 Adds ENTERPRISE_BASIC_TRIAL 2024-04-25 12:01:45 +02:00
Adria Navarro dfdc4a77c8 Update yarn.lock 2024-04-25 11:44:41 +02:00
Adria Navarro ba73a64065
Merge branch 'master' into chore/resolve-oss-pro-via-yarn-resolutions 2024-04-25 11:31:54 +02:00
Adria Navarro e48c51b086 Remove 2024-04-25 11:23:08 +02:00
Adria Navarro a2faf57b46 Use @budibase/pro resolution 2024-04-25 11:22:52 +02:00
Sam Rose 57e9ad8196
Merge pull request #13551 from Budibase/dependabot/npm_and_yarn/packages/server/mysql2-3.9.7
Bump mysql2 from 3.5.2 to 3.9.7 in /packages/server
2024-04-25 10:22:28 +01:00
Andrew Kingston 8baea1974d
Merge branch 'master' into grid-enhancements 2024-04-25 09:54:21 +01:00
jvcalderon a18264332c Lint 2024-04-25 10:51:10 +02:00
Sam Rose a9b653b818
Merge branch 'master' into dependabot/npm_and_yarn/packages/server/mysql2-3.9.7 2024-04-25 09:44:58 +01:00
Michael Drury adcbb3dd1e
Merge pull request #13558 from Budibase/revert-13557-fix/pre-sign-client-lib
Revert "Changing client library to be retrieved via pre-signed URL for Cloud"
2024-04-24 17:12:50 +01:00
Michael Drury 2187d25711
Revert "Changing client library to be retrieved via pre-signed URL for Cloud" 2024-04-24 17:12:36 +01:00
Michael Drury 36aacd4d11
Merge pull request #13557 from Budibase/fix/pre-sign-client-lib
Changing client library to be retrieved via pre-signed URL for Cloud
2024-04-24 16:17:03 +01:00
mike12345567 f76abb0ca9 Getting rid of linting error. 2024-04-24 15:59:11 +01:00