1
0
Fork 0
mirror of synced 2024-09-17 17:57:47 +12:00
Commit graph

7722 commits

Author SHA1 Message Date
mike12345567
70c5272ad9 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-17 15:46:34 +01:00
Michael Drury
92dd6cce2d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-17 12:17:24 +01:00
mike12345567
7dcd6767f9 Fixes for adding autocolumns, it was not possible to select auto column type and fixing icon, as well as display of column when editing it - this corrects a few issues in this area as auto columns did not have a correct fieldId and also did not have a valid field definition. 2023-10-16 18:37:56 +01:00
Sam Rose
39292e88a8 Correct error message to say sheets when it's a Google sheet. 2023-10-16 17:11:51 +01:00
Andrew Kingston
1cb0817a0b Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 16:47:14 +01:00
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
Sam Rose
b7ff1d60f1 Wire up the frontend to show the new datasource errors. 2023-10-16 16:36:42 +01:00
Sam Rose
37fe91e488 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-16 16:05: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
Martin McKeaveney
2ef9871fda merge with master 2023-10-16 14:42:50 +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
mike12345567
03371005c1 PR comments - addressing API.searchUser updates. 2023-10-13 12:23:28 +01:00
Sam Rose
a3cb9d7567 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-13 10:20:54 +01:00
Sam Rose
85b3af2971 Refactor DatasourcePlus's buildSchema to return a value, rather than rely on member variables. 2023-10-12 16:27:18 +01:00
Andrew Kingston
4ed3767324 Merge branch 'develop' into grid-all-datasources 2023-10-12 08:31:09 +01:00
mike12345567
f1b73058c2 Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:49:39 +01:00
Martin McKeaveney
0040db27b2 Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-11 17:32:40 +01:00
Michael Drury
95423fdabc Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 17:27:01 +01:00
Michael Drury
e5eb3c98f2 Merge branch 'develop' into grid-all-datasources 2023-10-11 17:21:54 +01:00
mike12345567
d14a773925 Merge branch 'develop' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 14:02:48 +01:00
Dean
059bed1cfa Merge remote-tracking branch 'origin/master' into fix/selected-by-user-obscured-nav-item 2023-10-11 10:13:42 +01:00
Andrew Kingston
efa2386fd5 Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 07:57:03 +01:00
Michael Drury
5937f2139a Merge branch 'develop' into feat/relationship-configuration 2023-10-10 16:49:50 +01:00
Adria Navarro
193b8785ee Reset display field if required 2023-10-10 16:17:03 +02:00
Adria Navarro
6124139295 Don't allow selecting unvalid display columns 2023-10-10 16:13:21 +02:00
Adria Navarro
48afa2aa0d Lint 2023-10-10 13:52:47 +02:00
Adria Navarro
bd82dae565 Display user/users fields 2023-10-10 13:52:47 +02:00
Adria Navarro
62c6631bc8 Don't cast on the fe 2023-10-10 13:52:47 +02:00
Adria Navarro
adf5e6bcf2 Allow users 2023-10-10 13:52:47 +02:00
Adria Navarro
f22467fa53 Validate user column 2023-10-10 13:52:47 +02:00
Adria Navarro
a514358e57 Allow selecting user column type 2023-10-10 13:52:47 +02:00
Michael Drury
5783ae3e00 Merge branch 'master' into feature/multi-user-type-column 2023-10-10 12:38:51 +01:00
Andrew Kingston
513aaf1174 Update custom datasource label to 'JSON / CSV' 2023-10-09 16:03:12 +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
cd5835bfeb Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-09 09:37:44 +02:00
Andrew Kingston
71a8d5695b Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:24:06 +01: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
Andrew Kingston
2171b14f50 Merge branch 'develop' into grid-clipboard 2023-10-09 08:06:18 +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
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
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
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
Andrew Kingston
549ea44245 Improve handling of file uploads 2023-10-05 19:17:13 +01:00
Andrew Kingston
5990f43f3f Fix issues with fetching features and bindings in custom datasources 2023-10-05 18:30:40 +01:00