MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,586 Commits 119 Branches 2,987 Tags 943 MiB
Commit Graph

25586 Commits

Author SHA1 Message Date
Michael Drury 986ca2e9b2 Merge pull request #12016 from Budibase/mike12345567-patch-1 
Contributing docs - note about pro
 2023-10-10 12:44:59 +01:00
Michael Drury 5783ae3e00 Merge branch 'master' into feature/multi-user-type-column 2023-10-10 12:38:51 +01:00
Michael Drury 2fe3132d04 Update CONTRIBUTING.md 2023-10-10 12:37:30 +01:00
Michael Drury 25ae13463a Merge pull request #12011 from Budibase/fix/null-user-column-value 
Fixing null in user column form field if using user metadata IDs
 2023-10-10 12:21:31 +01:00
mike12345567 5099d6c3a5 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value 2023-10-10 12:10:56 +01:00
Michael Drury 94c86a7f15 Merge pull request #12012 from Budibase/fix/external-table-keep-types 
Fix fetching external tables with user column type
 2023-10-10 12:10:05 +01:00
mike12345567 6c2eb69395 Correcting syntax. 2023-10-10 11:58:30 +01:00
mike12345567 27abfdccc2 Removing onChange handler. 2023-10-10 11:50:45 +01:00
mike12345567 cd5d438a96 Quick fix. 2023-10-10 11:35:07 +01:00
mike12345567 4b73f636fc Updating CI to only check pro when going to base branch. 2023-10-10 11:34:14 +01:00
mike12345567 95caee66a7 PR comments. 2023-10-10 11:22:59 +01:00
Budibase Staging Release Bot 088ed1139c Bump version to 2.11.17 2023-10-10 07:08:08 +00:00
Andrew Kingston 3ee5158345 Merge pull request #12006 from Budibase/user-metadata-changes 
Allow user table changes in existing apps again
 2023-10-10 08:07:49 +01:00
mike12345567 2ef5cb3894 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value 2023-10-09 18:31:13 +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
mike12345567 c87a67a37a Converting user IDs where necessary to global user IDs in the frontend, correcting the null entry when using current user IDs, or other user IDs, as a default value for a user column form type. 2023-10-09 18:18:34 +01:00
Andrew Kingston b17ec630c1 Ensure user table editing is still allowed for old apps that are imported 2023-10-09 15:09:11 +01:00
Andrew Kingston 73e208292f Simplify logic to be more readable 2023-10-09 15:05:57 +01:00
Andrew Kingston a4e3cd72cc Add new app feature flag to allow disable user metadata columns in new apps, but allow them in old apps 2023-10-09 15:01:16 +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
Budibase Staging Release Bot db6022447c Bump version to 2.11.15-alpha.2 2023-10-09 07:28:46 +00:00
Andrew Kingston ac92640931 Merge pull request #11935 from Budibase/grid-mobile-scrolling 
Grid mobile scrolling support
 2023-10-09 08:28:29 +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
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