Commit Graph

26058 Commits

Author SHA1 Message Date
Andrew Kingston d82aec9f31
Merge branch 'master' into feature/form-block-description 2023-10-24 08:56:14 +01:00
Andrew Kingston 76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-24 08:55:51 +01:00
Andrew Kingston 00450dc59b
Merge branch 'master' into feature/form-block-settings-reflow 2023-10-24 08:55:37 +01:00
Andrew Kingston 654e6539bb
Merge branch 'master' into fix-table-metadata 2023-10-24 08:55:23 +01:00
Andrew Kingston b6a8e6c0cf
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-24 08:54:54 +01:00
Adria Navarro 52b86b44cb
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-24 09:54:19 +02:00
Andrew Kingston c5537dd58c Prettier 2023-10-24 08:46:55 +01:00
Andrew Kingston f355933bf3 Add grid support for old views with groupBy specified, and any other datasource that has a custom means of determining a datasource schema 2023-10-24 08:26:57 +01:00
Adria Navarro 5506c77b90
Merge pull request #12139 from Budibase/BUDI-7641/package_version_from_env
Package version from env instead of package.json
2023-10-23 19:25:12 +02:00
Sam Rose a701933f48
Frontend changes for the user column migration work. 2023-10-23 17:57:25 +01:00
Adria Navarro 3d718c40fd
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 17:49:18 +02:00
Dean 08a22f1525 Show 'Creator' instead of 'Admin' for the global user role picker 2023-10-23 16:47:05 +01:00
Sam Rose 42e31d19fb
Merge master. 2023-10-23 16:18:51 +01:00
Budibase Staging Release Bot 7623ffd11e Bump version to 2.11.42 2023-10-23 14:13:18 +00:00
Adria Navarro 3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
José Vte. Calderón 6c4befbfb6
Merge pull request #12152 from Budibase/fix/revert-per-user-per-creator
[Fix] [Revert] per user per creator
2023-10-23 15:56:22 +02:00
jvcalderon bc4dd8e1c9 Update pro submodule 2023-10-23 15:43:44 +02:00
Adria Navarro 453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Andrew Kingston 73f3b76c01 Update default column visibility check 2023-10-23 12:40:29 +01:00
Dean cf8a634a72 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-23 12:34:31 +01:00
jvcalderon a22aea63a3 Update pro submodule 2023-10-23 13:33:56 +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
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