Commit Graph

25564 Commits

Author SHA1 Message Date
Andrew Kingston 71a8d5695b Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:24:06 +01:00
Andrew Kingston 8ce001cd4a Merge branch 'develop' into grid-mobile-scrolling 2023-10-09 08:23:43 +01:00
Adria Navarro 047936bcbf Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-09 09:22:55 +02:00
Budibase Staging Release Bot 247d96b641 Bump version to 2.11.16 2023-10-09 07:22:41 +00:00
melohagan d8f1b7960e Fix form block crash on no data tables (#11995)
* Fix form block crash on no data tables

* Refactor

* Refactor
2023-10-09 08:22:19 +01:00
Budibase Staging Release Bot 7c72fe9375 Bump version to 2.11.15-alpha.1 2023-10-09 07:13:11 +00:00
Andrew Kingston 32bad82866 Merge pull request #11927 from Budibase/grid-clipboard
Copy to clipboard while copying inside grids
2023-10-09 08:12:55 +01:00
Andrew Kingston 2171b14f50 Merge branch 'develop' into grid-clipboard 2023-10-09 08:06:18 +01:00
Andrew Kingston 0303027754 Merge branch 'develop' into grid-mobile-scrolling 2023-10-09 08:06:04 +01:00
Andrew Kingston 04271838c3 Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:05:57 +01:00
Budibase Staging Release Bot d41f81bb45 Bump version to 2.11.15 2023-10-06 15:54:26 +00:00
Michael Drury d13ae14f94 Merge pull request #11993 from Budibase/fix/user-col-input-user-metadata-id
Fix for saving user metadata IDs - convert them to global IDs in user column
2023-10-06 16:54:07 +01:00
mike12345567 0dc28122fa Adding test case. 2023-10-06 16:38:36 +01:00
mike12345567 d4335bca73 Quick fix for saving current user._id - make sure it is the correct format of ID. 2023-10-06 16:31:48 +01:00
Budibase Staging Release Bot 055a75ad46 Bump version to 2.11.15-alpha.0 2023-10-06 15:08:58 +00:00
Michael Drury 437223bea0 Merge pull request #11992 from Budibase/backmerge-6-10-23
Backmerging master -> develop
2023-10-06 16:08:40 +01:00
mike12345567 df29f4c30f Merge branch 'develop' of github.com:Budibase/budibase into backmerge-6-10-23 2023-10-06 15:56:09 +01:00
mike12345567 d8b7f930e9 Merging. 2023-10-06 15:55:10 +01:00
Michael Drury c7c63a7b83 Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-06 15:54:12 +01:00
Budibase Staging Release Bot 24b6d5d9ba Bump version to 2.11.14 2023-10-06 13:44:25 +00:00
Michael Drury 0ede0fb3c6 Merge pull request #11989 from Budibase/fix/user-column-search-mapping
Current user ID user column search mapping
2023-10-06 14:44:05 +01:00
Michael Drury 7934e984cc Merge branch 'master' into fix/user-column-search-mapping 2023-10-06 14:30:09 +01:00
Budibase Staging Release Bot 9b52ae5628 Bump version to 2.11.13 2023-10-06 13:17:58 +00:00
melohagan 23b7a8de72 Allow relationship to be deleted even if missing (#11991)
* Allow relationship to be deleted even if missing

* Comment
2023-10-06 14:17:36 +01:00
mike12345567 575693d69a Updating pro. 2023-10-06 14:07:12 +01:00
Adria Navarro 434f2a0670 More nx cache 2023-10-06 14:52:32 +02:00
Adria Navarro 13e985813c Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-06 14:44:35 +02:00
Adria Navarro da53f0a366 Cache output files 2023-10-06 14:32:17 +02:00
mike12345567 bc17bc43fa Fixing issue brought up by some unit tests. 2023-10-06 13:32:12 +01:00
mike12345567 a3df861046 Merge branch 'fix/user-column-search-mapping' of github.com:Budibase/budibase into fix/user-column-search-mapping 2023-10-06 13:30:32 +01:00
mike12345567 7acc164e12 Fix build. 2023-10-06 13:28:27 +01:00
Michael Drury 3ceb5b714b Merge branch 'master' into fix/user-column-search-mapping 2023-10-06 12:57:29 +01:00
mike12345567 017b522a3f Comment to explain function. 2023-10-06 12:56:55 +01:00
mike12345567 18cca671d4 PR comments. 2023-10-06 12:56:07 +01:00
Adria Navarro 0d21d13e4b Extract functions 2023-10-06 13:53:34 +02:00
Budibase Staging Release Bot 62d1c9f0bf Bump version to 2.11.5-alpha.6 2023-10-06 11:52:52 +00:00
Adria Navarro 03e4f0a253 Merge pull request #11990 from Budibase/chore/use-nx-readwrite
Use nx read-write token on CI
2023-10-06 13:52:35 +02:00
Adria Navarro a9bfa859c2 Use nx read-write token on CI 2023-10-06 12:45:54 +01:00
Adria Navarro ca289dbb3a Explicit NX_CLOUD_ACCESS_TOKEN 2023-10-06 13:36:41 +02:00
mike12345567 6e6c5bc776 Handle arrays and fix issue brought up by REST testcase. 2023-10-06 12:31:52 +01:00
Michael Drury 8f41554c6f Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-06 12:18:20 +01:00
Budibase Staging Release Bot a19c5aed19 Bump version to 2.11.12 2023-10-06 11:17:04 +00:00
mike12345567 cfe261a8f6 Merge branch 'master' of github.com:Budibase/budibase into fix/user-column-search-mapping 2023-10-06 12:16:54 +01:00
Michael Drury a108ee3e45 Merge pull request #11984 from Budibase/fix/11982
Update CLI to check for docker-compose or docker compose plugin installation
2023-10-06 12:16:45 +01:00
mike12345567 74a6371c8b Merge branch 'master' of github.com:Budibase/budibase into fix/user-column-search-mapping 2023-10-06 12:16:45 +01:00
mike12345567 dc50515bcc Adding negative test case and fixing build issue. 2023-10-06 12:16:37 +01:00
Michael Drury d93e2db379 Merge branch 'master' into fix/11982 2023-10-06 12:03:04 +01:00
Budibase Staging Release Bot 67870c7ea1 Bump version to 2.11.5-alpha.5 2023-10-06 11:02:54 +00:00
Martin McKeaveney 930c085722 Update deploy-featurebranch.yml 2023-10-06 12:02:38 +01:00
Budibase Staging Release Bot 78bba26603 Bump version to 2.11.11 2023-10-06 11:02:37 +00:00