Commit Graph

26083 Commits

Author SHA1 Message Date
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
Sam Rose 87d5e32bed
Merge pull request #12151 from Budibase/feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-3
Many-to-one user relationship -> user column migration
2023-10-23 12:11:21 +01:00
Sam Rose 6d5308a035
Merge pull request #12117 from Budibase/feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-2
Many-to-many user relationship -> user column migration
2023-10-23 12:11:04 +01:00
Sam Rose 5e6ed0fd67
Implement many-to-one user column migration. 2023-10-23 11:54:27 +01:00
Adria Navarro 4ee1fd0f7a Default to package.json 2023-10-23 12:23:44 +02:00
Sam Rose febfab0927
Fix tests/types. 2023-10-23 10:48:10 +01:00
Sam Rose 3fc2ff2c9b
Put pro back to where it was. 2023-10-23 10:36:05 +01:00
Sam Rose 9e279be4c3
Put pro back to where it was. 2023-10-23 10:35:41 +01:00
Sam Rose 2e0b528331
Update pro submodule. 2023-10-23 09:59:27 +01:00
Sam Rose 06f0a8da1a
Update pro submodule. 2023-10-23 09:59:11 +01:00
Sam Rose 9dd16381a7
Merge base branch. 2023-10-23 09:52:17 +01:00
Sam Rose 86458dc321
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-2 2023-10-23 09:50:40 +01:00
Sam Rose 2d26597d07
Fix tests after merge. 2023-10-23 09:49:57 +01:00
Sam Rose a563cf3594
Merge master. 2023-10-23 09:39:34 +01:00
Adria Navarro e7459bb5e7 Fix test 2023-10-20 20:42:58 +02:00
Adria Navarro 71869badfa Fix tests 2023-10-20 19:19:35 +02:00
Adria Navarro d1f0e8fca0 Fix tests 2023-10-20 17:53:40 +02:00
Adria Navarro e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
Adria Navarro 8db11ac174 Add version to test image pipeline 2023-10-20 17:27:42 +02:00
Adria Navarro 5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro 6ff11a8299 Fix local docker singleimage build 2023-10-20 17:23:16 +02:00
Adria Navarro 133e475257 Add version to single image 2023-10-20 17:20:14 +02:00
Adria Navarro 9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
Adria Navarro 4c19ad1ca7 Add versions to server/worker docker v2 2023-10-20 17:19:35 +02:00
Budibase Staging Release Bot 97fc794a2b Bump version to 2.11.41 2023-10-20 15:15:17 +00:00
Adria Navarro 58af4832df
Merge pull request #12137 from Budibase/update-pro-ref
Update pro submodule ref
2023-10-20 17:09:53 +02:00
Adria Navarro 13a8b20ea9
Merge branch 'master' into update-pro-ref 2023-10-20 17:04:04 +02:00
Michael Drury de7dcce498
Merge pull request #12136 from Budibase/fix/BUDI-7637-allow-basic-users-query-users
Make user search allow basic users, so that can be used in apps
2023-10-20 16:03:55 +01:00
Adria Navarro 8a939dd3e6 Update pro submodule ref 2023-10-20 17:02:24 +02:00
mike12345567 8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01: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
Dean 871891c2a2 Parse view v1 schema to fix builder crashed caused by 'groupedby' views 2023-10-20 15:35:16 +01:00
Adria Navarro 56ae857d49 Add version to dev .env 2023-10-20 16:21:48 +02:00
Adria Navarro 961913b88a Use version from environment 2023-10-20 16:21:35 +02:00
Budibase Staging Release Bot 0010e07b47 Bump version to 2.11.40 2023-10-20 13:29:13 +00:00
Adria Navarro 431f683a0a
Merge pull request #12129 from Budibase/clean-pipeline
CI fixes and tweaks
2023-10-20 15:24:35 +02:00
Adria Navarro 5cc3141999
Merge pull request #12130 from Budibase/fix-single-image-docker
Fixing single image docker
2023-10-20 15:17:27 +02:00
Adria Navarro 2d1e01998a Use nx affected on PRs 2023-10-20 15:16:48 +02:00
Adria Navarro 36a33bc192 Use nx affected on PRs 2023-10-20 15:15:52 +02:00
Andrew Kingston 9a72c418c9 Remove duplicate comment 2023-10-20 14:13:30 +01:00
Adria Navarro e5aefa83ec Fix single image dockerfile 2023-10-20 15:13:29 +02:00
Adria Navarro 70f6f861d0 Clean pipeline 2023-10-20 15:09:45 +02:00
Adria Navarro 91b7994ee0
Merge branch 'master' into clean-pipeline 2023-10-20 15:05:03 +02:00
Michael Drury 89d6486ba0
Merge pull request #12127 from Budibase/fix/12121-datasource-error-stopping-creation
Datasource errors blocking full creation steps
2023-10-20 13:14:44 +01:00
Michael Drury dbf5a9caaa
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 13:04:14 +01:00
Adria Navarro f136512184 Clean pipeline 2023-10-20 14:03:43 +02:00
Adria Navarro 90cdda7cea
Merge pull request #12126 from Budibase/BUDI-7641/push_v2_images_to_qa
Push QA on master commit
2023-10-20 14:02:39 +02:00
Adria Navarro ab169c270d
Merge branch 'master' into BUDI-7641/push_v2_images_to_qa 2023-10-20 13:50:58 +02:00
Adria Navarro 91e4a47a72
Merge pull request #12128 from Budibase/chore/redure-nx-cloud-usage
Reduce nx cloud usage
2023-10-20 13:50:01 +02:00