Commit Graph

26054 Commits

Author SHA1 Message Date
Michael Drury 2c70cf57bd
Merge branch 'master' into fix/build-memory-usage 2023-11-02 11:31:25 +00:00
mike12345567 f74556cb7a Hardcoding the memory used by the build process to make sure it always tries to claim as much as it needs to run the build fully (avoid heap errors as seen on feature branch builds). 2023-11-02 11:19:26 +00:00
Michael Drury 0fe98f4f29
Merge pull request #12237 from Budibase/fix/update-bull-queue-parameters
Updating bull parameters - help queue stalling
2023-11-01 17:59:54 +00:00
mike12345567 5adea6cd72 Merge branch 'fix/update-bull-queue-parameters' of github.com:Budibase/budibase into fix/update-bull-queue-parameters 2023-11-01 17:48:31 +00:00
mike12345567 17b6985f06 Adding a duration utility for changing between time types. 2023-11-01 17:48:13 +00:00
mike12345567 de1862448d Merge branch 'master' of github.com:Budibase/budibase into fix/update-bull-queue-parameters 2023-11-01 17:18:07 +00:00
Budibase Staging Release Bot 0477ed64f6 Bump version to 2.12.4 2023-11-01 16:40:29 +00:00
mike12345567 586d539109 Adding release information to single image. 2023-11-01 16:23:51 +00:00
Mitch-Budibase 4e1263e585
Merge pull request #12238 from Budibase/ap-license-manage-test
Account Portal - License Management Test
2023-11-01 15:57:01 +00:00
Mitch-Budibase ce1c717926 Merge branch 'master' into ap-license-manage-test 2023-11-01 15:50:02 +00:00
Mitch-Budibase e897320c6c Merge branch 'master' into ap-license-manage-test 2023-11-01 15:38:37 +00:00
Budibase Staging Release Bot d6a4b71655 Bump version to 2.12.3 2023-11-01 15:37:08 +00:00
Michael Drury 300b9232c4
Merge pull request #12243 from Budibase/fix/single-image-build
Single image build fixes
2023-11-01 15:23:30 +00:00
Mitch-Budibase 85325814d0 Moving stripe import to top of test file 2023-11-01 15:18:20 +00:00
Michael Drury 4cb3771aed
Merge branch 'master' into fix/single-image-build 2023-11-01 15:18:15 +00:00
mike12345567 cf40b87d81 Use installed MinIO rather than binary. 2023-11-01 15:10:32 +00:00
mike12345567 984d949781 Updating single image build - the old method of installing Node 18 was deprecated, switching to the new mechanism. 2023-11-01 15:02:55 +00:00
Martin McKeaveney 7af61ef249
Merge pull request #12115 from Budibase/feature/form-block-settings-reflow
Form block general settings reflow
2023-11-01 11:37:35 +00:00
Andrew Kingston 3386d8ba00
Merge branch 'master' into feature/form-block-settings-reflow 2023-11-01 11:31:49 +00:00
Michael Drury 6924fdc99c
Merge branch 'master' into fix/update-bull-queue-parameters 2023-11-01 11:17:22 +00:00
Budibase Staging Release Bot 234cdbbf24 Bump version to 2.12.2 2023-11-01 10:51:34 +00:00
Andrew Kingston c79c6b1ff0
Merge pull request #12197 from Budibase/fix/show-formblock-description-in-view-mode
Make the formblock description field visible in view mode.
2023-11-01 09:44:10 +00:00
Andrew Kingston 2579a3d029
Merge branch 'master' into feature/form-block-settings-reflow 2023-11-01 09:39:51 +00:00
Andrew Kingston 2711bc8794
Merge branch 'master' into fix/show-formblock-description-in-view-mode 2023-11-01 09:38:25 +00:00
Michael Drury 86471933a9
Merge branch 'master' into fix/update-bull-queue-parameters 2023-10-31 18:27:30 +00:00
Mitch-Budibase 84079450f9 lint 2023-10-31 18:20:27 +00:00
Michael Drury e4ea0f9ae8
Merge pull request #12234 from Budibase/fix/sample-db-identification
Stop the sample data being identified as an external source.
2023-10-31 18:17:03 +00:00
Mitch-Budibase e05821d6d7 License Management Test
This test retrieves plans, creates checkout session, and updates license

Essential changes have been made to linkStripeCustomer & updatePlan functions to support the test

Modified "test:self:ci" to include 'licensing' instead of 'license'
Modified environment.ts to include STRIPE_SECRET_KEY
2023-10-31 18:16:58 +00:00
mike12345567 17319a6981 Moving things around so that DEFAULT_BB_DATASOURCE_ID can be imported without cyclics occurring. 2023-10-31 17:52:39 +00:00
Michael Drury a9afef8fb8
Merge branch 'master' into fix/sample-db-identification 2023-10-31 17:11:38 +00:00
Michael Drury bd57385c82
Merge pull request #12226 from Budibase/fix/backups-remove-automation-logs
Removing automation logs from app backups
2023-10-31 16:57:14 +00:00
mike12345567 df6f8dad7e Updating bull parameters to see if this helps with queue stalling. 2023-10-31 16:56:19 +00:00
Michael Drury 3ef2b4a3ac
Merge branch 'master' into fix/backups-remove-automation-logs 2023-10-31 16:32:03 +00:00
Dean 2724aba46b Merge remote-tracking branch 'origin/master' into fix/sample-db-identification 2023-10-31 15:31:55 +00:00
Dean 7e33aacbb1 Stop the sample data being identified as an external source. 2023-10-31 14:48:23 +00:00
Andrew Kingston 482fb89326
Merge pull request #12230 from Budibase/fix-portal-user-list
Fix global users endpoint pagination
2023-10-31 14:04:34 +00:00
Andrew Kingston 68553e85d4 Simplify page size logic in user search 2023-10-31 13:01:19 +00:00
Andrew Kingston 99a0c8b08b Fix bug breaking pagination in global users search 2023-10-31 12:10:41 +00:00
Andrew Kingston 9e18c666ad Restructure user list page a bit 2023-10-31 12:10:31 +00:00
Andrew Kingston d5629bb4ec Use proper search structure for users fetch in portal users page 2023-10-31 11:51:46 +00:00
Andrew Kingston fe60aced31 Fix 501 when clearing user search field 2023-10-31 11:50:29 +00:00
Andrew Kingston 560c51aed5 Fix button padding 2023-10-31 11:47:06 +00:00
mike12345567 88cc8a19ee Resetting timekeeper and resetting pro back to normal. 2023-10-31 11:19:53 +00:00
mike12345567 15b1f3efe6 Removing duplicate filtering of automation logs. 2023-10-31 10:51:46 +00:00
mike12345567 2b96de3c30 Merge branch 'master' of github.com:Budibase/budibase into fix/backups-remove-automation-logs 2023-10-31 10:38:07 +00:00
Sam Rose a4ce8983e7
Merge pull request #12102 from Budibase/feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
Automatic user relationship to user column migration
2023-10-31 10:27:04 +00:00
Michael Drury 9643d9c0e2
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-30 17:41:44 +00:00
mike12345567 41d99f6a58 Updating app backup exports to not include automation logs as these bloat the backups. 2023-10-30 17:41:08 +00:00
Sam Rose 29d8cfd04c
Merge pull request #12202 from Budibase/bug/budi-7689-cdn-issues-attachment-filtering
Limit cloud uploads to a specific set of filetypes.
2023-10-30 17:31:24 +00:00
Sam Rose d4270181cf
Merge branch 'master' into bug/budi-7689-cdn-issues-attachment-filtering 2023-10-30 17:18:50 +00:00