Commit Graph

26187 Commits

Author SHA1 Message Date
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 107ca4a23a
Merge branch 'master' into fix/relationship-issue-one-to-many 2023-11-01 11:17:30 +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
Conor Webb 80481b8eb2
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-11-01 10:38:57 +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
Conor Webb 9c71ccd2c4 Moved DataSourceSelect into related folder. Changed SelectedItem name. Updated DataSourceSelect imports. 2023-11-01 09:34:10 +00:00
Conor Webb 6cf1b13a0c Feedback related amends. 2023-11-01 09:30:54 +00:00
Conor Webb b2aca0c4a6
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-11-01 07:56:32 +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
Martin McKeaveney 0afdff9cb6
Merge branch 'master' into feat/automation-naming-ux-updates 2023-10-31 17:19:14 +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
Peter Clement a9db61fdc2 remove users list option 2023-10-31 16:34:01 +00:00
Michael Drury 3ef2b4a3ac
Merge branch 'master' into fix/backups-remove-automation-logs 2023-10-31 16:32:03 +00:00
Peter Clement 7cba4d3fb2 formatting found in testing 2023-10-31 16:29:43 +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
Conor Webb df688b0596 Fixed linting issues. 2023-10-31 14:36:50 +00:00
Michael Drury c0b2c9e448
Merge branch 'master' into fix/relationship-issue-one-to-many 2023-10-31 14:27:52 +00:00
Conor Webb bb19e48a6d Added new DataSourceSelect component. 2023-10-31 14:22:15 +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
Peter Clement b65b601918 remove label 2023-10-31 13:52:28 +00:00
Peter Clement 82c0e3d450 Fix issue with directional relationship being swapped 2023-10-31 13:43:54 +00:00
Peter Clement 8b3eafbede
Merge branch 'master' into feat/automation-naming-ux-updates 2023-10-31 13:08:17 +00:00
Peter Clement 81ca48a331 tidy up and issues found in testing 2023-10-31 13:05:04 +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
Conor Webb 0dfe520193
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-10-31 12:04:50 +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
Peter Clement 9838c7ad02 Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates 2023-10-31 10:06:31 +00:00
Dean 15c030bcf6 Merge remote-tracking branch 'origin/master' into feature/monolith-js-refactor 2023-10-31 09:04:24 +00:00
Conor Webb 3d3523b2c0
Merge branch 'master' into add-select-states-to-dropdown-data-provider-select 2023-10-31 07:31:05 +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