Commit Graph

25680 Commits

Author SHA1 Message Date
Michael Drury 64f4701b57 Merge pull request #12060 from Budibase/fix/12046-nav-links-overwrite-app
App overwrite - take new apps navigation
2023-10-16 15:45:45 +01:00
Michael Drury b86bcb7f4b Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-16 15:30:25 +01:00
Andrew Kingston e0b748a7bc Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 15:29:46 +01:00
Adria Navarro 6343b47480 Remove test action trigger 2023-10-16 16:18:13 +02:00
Adria Navarro 26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney bc0b2f5d6e Merge pull request #12027 from Budibase/develop
develop -> master
2023-10-16 15:12:30 +01:00
Michael Drury 0409bda13d Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-16 15:10:52 +01:00
Martin McKeaveney 8c0ed39652 submodule 2023-10-16 14:53:57 +01:00
Adria Navarro 50a1a28a32 Replace localhost for 127.0.0.1 2023-10-16 15:52:10 +02:00
Adria Navarro 01f15c2666 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 15:45:59 +02:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Michael Drury 5e00a0d0dd Merge branch 'master' into fix/internal-db-enrich-perf 2023-10-16 13:54:10 +01:00
Martin McKeaveney 342454651a Merge pull request #12048 from Budibase/preparing-develop-master-ci-migration
Preparing develop master ci migration
2023-10-16 12:27:27 +01:00
Martin McKeaveney b51b01a765 Merge branch 'preparing-develop-master-ci-migration' of github.com:Budibase/budibase into preparing-develop-master-ci-migration 2023-10-16 12:22:31 +01:00
Martin McKeaveney b22f7804db allow close-featurebranch to be done through workflow dispatch 2023-10-16 12:21:45 +01:00
Martin McKeaveney ae0f307188 Merge branch 'master' into preparing-develop-master-ci-migration 2023-10-16 11:25:45 +01:00
Adria Navarro a3ae503d74 workflow_dispatch 2023-10-16 12:24:56 +02:00
Martin McKeaveney 4337463402 remove develop reference in feature branch close job 2023-10-16 11:06:54 +01:00
Martin McKeaveney f2dbb4106d update CI job to remove references to develop 2023-10-16 11:04:33 +01:00
Martin McKeaveney 81c3831c82 Merge branch 'preparing-develop-master-ci-migration' of github.com:Budibase/budibase into preparing-develop-master-ci-migration 2023-10-16 11:01:02 +01:00
Martin McKeaveney c269573f07 removing auto tag of release 2023-10-16 11:00:41 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
Budibase Staging Release Bot 495a5827d7 Bump version to 2.11.27-alpha.1 2023-10-13 18:07:15 +00:00
Andrew Kingston 01df17e58a Merge pull request #12058 from Budibase/fix-sort-setting
Fix sort column settings
2023-10-13 19:06:58 +01:00
Budibase Staging Release Bot 6754c93ee4 Bump version to 2.11.34 2023-10-13 17:04:44 +00:00
Michael Drury 90eb8802ca Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-13 18:04:39 +01:00
melohagan d26789a330 Bug warnings stale bot (#12053)
* Bug warnings

* Lower operations per run
2023-10-13 18:04:23 +01:00
mike12345567 cef71ff708 Adding test cases for navbar update. 2023-10-13 18:03:10 +01:00
mike12345567 6a4877159d Quick fix to make sure that the important components of the app metadata are correctly updated - as well as adjusting the import modal to check if the export is encrypted. 2023-10-13 17:43:14 +01:00
Andrew Kingston 73ca87dfb6 Fix issue with sort setting 2023-10-13 17:04:45 +01:00
Martin McKeaveney c0210414ac Merge branch 'master' into preparing-develop-master-ci-migration 2023-10-13 16:21:33 +01:00
Sam Rose 89e64d18a5 Remove TODOs. 2023-10-13 16:11:56 +01:00
Sam Rose 0b8c829ed1 Clean up correctly after Postgres integration tests. 2023-10-13 15:59:07 +01:00
Sam Rose e1af1a5be3 Introduce integration tests for `POST /api/datasources/:datasourceId/schema` 2023-10-13 15:29:59 +01:00
Adria Navarro 03d9238467 Fix 2023-10-13 14:51:05 +02:00
Adria Navarro 6448f02c29 Run on push 2023-10-13 14:44:36 +02:00
Adria Navarro 08997cde4c Fix multiple build platform 2023-10-13 14:35:13 +02:00
Budibase Staging Release Bot 7cef9bf597 Bump version to 2.11.33 2023-10-13 12:21:43 +00:00
Michael Drury ec6a25fe23 Merge pull request #12051 from Budibase/fix/user-search-api
RelationshipField - load default and handle proper searching with user API
2023-10-13 13:21:24 +01:00
Sam Rose 2f0e88c17c Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if-2 2023-10-13 13:13:41 +01:00
Adria Navarro 1b549286d5 Build other versions 2023-10-13 14:09:17 +02:00
mike12345567 f64800f9f4 Final PR comment. 2023-10-13 13:05:07 +01:00
Adria Navarro fb1db135cf Remove packageNames file usages 2023-10-13 13:59:42 +02:00
mike12345567 c5360e1dcb Don't need to put into options obj, reaction does work. 2023-10-13 12:53:18 +01:00
mike12345567 03371005c1 PR comments - addressing API.searchUser updates. 2023-10-13 12:23:28 +01:00
Adria Navarro 543ecb8d58 Add single vs dockerfile in order to allow testing it 2023-10-13 12:58:07 +02:00
mike12345567 ccfc98120d Adding check to not re-fetch default value. 2023-10-13 11:44:15 +01:00
mike12345567 d44ad549ef t status
Merge branch 'fix/user-search-api' of github.com:Budibase/budibase into fix/user-search-api
2023-10-13 11:34:55 +01:00
mike12345567 563baa53c3 Fix var usage. 2023-10-13 11:28:23 +01:00
Michael Drury ec213a3c7a Merge branch 'master' into fix/user-search-api 2023-10-13 10:41:08 +01:00