Commit Graph

25147 Commits

Author SHA1 Message Date
mike12345567 4b73f636fc Updating CI to only check pro when going to base branch. 2023-10-10 11:34:14 +01:00
mike12345567 fa5e340e60 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/external-table-keep-types 2023-10-09 18:30:47 +01:00
mike12345567 635f33f81e Make sure that external tables preserve the BB_REFERNECE type, under the hood it is text/array, but it should continue to be treated correctly as its own indpendent type when updating Budibase tables (fetching). 2023-10-09 18:28:09 +01:00
Adria Navarro f8a4968513 Merge pull request #12003 from Budibase/fix/use-user-table-as-display-column
Ban user column to be used as display column
2023-10-09 15:52:48 +02:00
Adria Navarro 7d6cd53c29 Add comments 2023-10-09 15:37:42 +02:00
Adria Navarro 6f77be622f Simplify 2023-10-09 15:36:17 +02:00
Adria Navarro 0909e0547e Process formulas after processing complex fields 2023-10-09 15:30:07 +02:00
Adria Navarro 065e633742 Don't allow users column as primary display 2023-10-09 15:30:07 +02:00
Adria Navarro afedd560fd Merge pull request #12002 from Budibase/fix/users-column-search-mapping
Fix/users column search mapping
2023-10-09 13:54:54 +02:00
Adria Navarro d7aa23f740 Testing 2023-10-09 13:21:40 +02:00
Adria Navarro a5477f14d2 Handle users on search input 2023-10-09 13:21:27 +02:00
Adria Navarro 6705b67b67 Merge pull request #11988 from Budibase/budi-7589/user-column-multi-user-filtering-support
Multi user column
2023-10-09 11:52:22 +02:00
Adria Navarro cd5835bfeb Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-09 09:37:44 +02: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 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
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
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
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 78bba26603 Bump version to 2.11.11 2023-10-06 11:02:37 +00:00
Martin McKeaveney 45b0251a14 Update deploy-featurebranch.yml 2023-10-06 12:02:17 +01:00
mike12345567 3de8c53166 Adding a mapping layer to search queries so that we can map search inputs based on the table schema if desired - primarily for the user column. 2023-10-06 11:57:11 +01:00
mike12345567 5810529350 Quick fix for #11982 - check for both deprecated docker-compose and docker compose V2. 2023-10-05 23:03:34 +01:00
Adria Navarro 58a22ccde8 Fix initialisation of simple types 2023-10-05 11:16:52 +02:00
Adria Navarro f215f69067 Lint 2023-10-04 17:56:04 +02:00
Adria Navarro 91306c79eb Fix tests 2023-10-04 17:55:23 +02:00
Adria Navarro 2d0ac5ffba Fix filtering 2023-10-04 17:55:23 +02:00