1
0
Fork 0
mirror of synced 2024-08-12 08:31:27 +12:00
Commit graph

2860 commits

Author SHA1 Message Date
Michael Drury
3ef2b4a3ac
Merge branch 'master' into fix/backups-remove-automation-logs 2023-10-31 16:32:03 +00:00
Andrew Kingston
68553e85d4 Simplify page size logic in user search 2023-10-31 13:01:19 +00:00
Andrew Kingston
99a0c8b08b Fix bug breaking pagination in global users search 2023-10-31 12:10:41 +00:00
mike12345567
88cc8a19ee Resetting timekeeper and resetting pro back to normal. 2023-10-31 11:19:53 +00:00
mike12345567
2b96de3c30 Merge branch 'master' of github.com:Budibase/budibase into fix/backups-remove-automation-logs 2023-10-31 10:38:07 +00:00
mike12345567
41d99f6a58 Updating app backup exports to not include automation logs as these bloat the backups. 2023-10-30 17:41:08 +00:00
Sam Rose
d0fecc1c64
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-30 09:45:21 +00:00
jvcalderon
cd283ad0b0 Merge branch 'master' into feature/per-creator-final 2023-10-30 09:02:02 +01:00
mike12345567
330059991e Removing any. 2023-10-27 18:04:28 +01:00
mike12345567
d4929ea3b6 Fixing an issue where unpublished apps with custom roles, when used in groups would cause users to be unable to login. 2023-10-27 18:03:06 +01:00
Sam Rose
45543cbc03
Catch a few more edge cases with column names, add tests for them. 2023-10-27 15:59:31 +01:00
Sam Rose
ae356b6a50
Bump version of @budibase/nano to complete the DatabaseQueryOpts type usage. 2023-10-26 15:51:28 +01:00
Sam Rose
536d85d828
WIP: Improving the use of DatabaseQueryOpts. 2023-10-26 15:04:33 +01:00
Michael Drury
c6b377c565
Revert "Revert "Client library fetching through server"" 2023-10-24 18:13:36 +01:00
Michael Drury
e2e5c9044c
Revert "Client library fetching through server" 2023-10-24 18:12:20 +01:00
Michael Drury
2888335724
Merge branch 'master' into fix/client-lib-fetching 2023-10-24 17:31:44 +01:00
mike12345567
701d30abb4 Don't pass through default tenant ID. 2023-10-24 17:30:57 +01:00
mike12345567
ba5b1d7cfa Adding tenant ID to query string and fixing test cases. 2023-10-24 17:27:58 +01:00
mike12345567
b53158ac08 Moving the client library to be retrieved using the same mechanism as we do in development, through the server instance (same as the builder itself). This should help with the CDN issues that we have been having, although attachments are still currently affected. 2023-10-24 16:25:14 +01:00
jvcalderon
cea1c04b73 Creators count functionality 2023-10-24 17:16:44 +02:00
jvcalderon
980a46abb3 Merge branch 'master' into feature/per-creator-migration 2023-10-24 11:03:02 +02:00
jvcalderon
f643bc5ee8 Keep only migrations 2023-10-24 10:24:00 +02:00
Adria Navarro
3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
Adria Navarro
3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
jvcalderon
a285fb1d40 Missed code in merge 2023-10-23 13:33:27 +02:00
jvcalderon
648410348d [Revert] [Added] Per user per creator changes 2023-10-23 13:27:59 +02:00
Adria Navarro
4ee1fd0f7a Default to package.json 2023-10-23 12:23:44 +02:00
Adria Navarro
e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
mike12345567
04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Adria Navarro
961913b88a Use version from environment 2023-10-20 16:21:35 +02:00
Adria Navarro
3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
jvcalderon
44474b063a Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 13:43:11 +02:00
jvcalderon
5b2f55a592 Per user per creator changes 2023-10-18 13:36:34 +02:00
Sam Rose
767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
Adria Navarro
26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney
2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Adria Navarro
dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
mike12345567
d3366a535b PR comments. 2023-10-13 10:22:29 +01:00
Adria Navarro
5ef90a3855 Fix import 2023-10-13 09:08:07 +02: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
7b8e23eb82 Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache 2023-10-12 11:08:12 +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
mike12345567
ff89a15eea Updating jest types - old version was causing some weird errors in Webstorm. 2023-10-10 18:12:28 +01:00
Adria Navarro
f22467fa53 Validate user column 2023-10-10 13:52:47 +02: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
Adria Navarro
18545b1c79 Fix vulnerabilities 2023-10-03 23:45:39 +02:00
Samuel Martineau
84d30e4f4a Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus 2023-10-02 17:49:34 -04:00
Michael Drury
a67f78fead Merge branch 'develop' into fix/BUDI-7236 2023-09-27 17:08:21 +01:00
Martin McKeaveney
65af2ed7c2 backmerge from master 2023-09-27 17:06:57 +01:00
mike12345567
395969e0f0 Fixing build issue,. 2023-09-27 16:24:12 +01:00