Commit Graph

25423 Commits

Author SHA1 Message Date
Andrew Kingston 5c7bde95ab Update conditional setting rendering to support nested paths and multiple values, and hide grid block CRUD when using non DS+ 2023-10-16 16:46:49 +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
Martin McKeaveney bc0b2f5d6e Merge pull request #12027 from Budibase/develop
develop -> master
2023-10-16 15:12:30 +01:00
Martin McKeaveney 8c0ed39652 submodule 2023-10-16 14:53:57 +01:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +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
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
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
melohagan d26789a330 Bug warnings stale bot (#12053)
* Bug warnings

* Lower operations per run
2023-10-13 18:04:23 +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
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
mike12345567 f64800f9f4 Final PR comment. 2023-10-13 13:05:07 +01: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
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
Budibase Staging Release Bot 7f5adeefde Bump version to 2.11.32 2023-10-13 09:23:11 +00:00
Sam Rose 88bb7943b0 Merge pull request #12054 from Budibase/fix/stop-postgres-container-after-postgres-tests
Stop the `postgres` container after the Postgres integration tests run.
2023-10-13 10:22:52 +01:00
mike12345567 d3366a535b PR comments. 2023-10-13 10:22:29 +01:00
Sam Rose 18363b7b60 Make sure to stop postgres container after the postgres integration tests have run. 2023-10-13 09:50:45 +01:00
mike12345567 2e8e21e5d2 Linting. 2023-10-12 19:20:03 +01:00
mike12345567 bd182d5b3b Test cases for updated API. 2023-10-12 19:19:05 +01:00
mike12345567 162f2cb938 Removing un-used function. 2023-10-12 19:07:22 +01:00
mike12345567 535a6e1a47 Minor cleanup. 2023-10-12 19:07:04 +01:00
mike12345567 16d551542e Frontend component of updating the API and accounting for default value not being in the paginated results of the relationship picker. 2023-10-12 19:00:53 +01:00
mike12345567 6bbce23910 Updating user fetch functionality to send up lucene syntax for searching to global user endpoint. 2023-10-12 16:31:32 +01:00
Martin McKeaveney 61c675c3bf removing all references to develop in budibase main repo CI 2023-10-12 14:32:16 +01:00
Budibase Staging Release Bot 702ee4d504 Bump version to 2.11.31 2023-10-12 12:48:57 +00:00
Michael Drury b9d2a00d7d Merge pull request #12047 from Budibase/fix/single-image-timeout
Buildx yarn timeouts - attempting fix (single image build)
2023-10-12 13:48:35 +01:00
mike12345567 78173c9d1e Some minor updates, attempting to maximise space to get build running again, having issues with network timeouts/buildx problems, attempting to restore full build. 2023-10-12 13:43:15 +01:00
Budibase Staging Release Bot f83df42bfc Bump version to 2.11.30 2023-10-12 09:13:59 +00:00
Michael Drury 9e264177f8 Merge pull request #12045 from Budibase/fix/single-image-build
Single image build - maximise space
2023-10-12 10:13:38 +01:00
mike12345567 eea31893cf Trying to fix max-space size action as part of the single image release (required to create the space needed for both image builds. 2023-10-12 10:03:47 +01:00
Andrew Kingston 99f72ffd28 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-all-datasources 2023-10-12 09:26:49 +01:00
Budibase Staging Release Bot 025e660674 Bump version to 2.11.29 2023-10-12 07:39:03 +00:00
Andrew Kingston cc0ab75405 Merge pull request #11889 from Budibase/fix/selected-by-user-obscured-nav-item
Fix for to ensure selectedBy Avatar is not obscured in NavItem
2023-10-12 08:38:41 +01:00
Andrew Kingston 052ec2a7ed Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-12 08:34:21 +01:00
Andrew Kingston b51950a43a Undo bump comment change 2023-10-12 08:31:46 +01:00