1
0
Fork 0
mirror of synced 2024-10-04 03:54:37 +13:00
Commit graph

21466 commits

Author SHA1 Message Date
Sam Rose
0f5c2cff00
Handle a couple more edge cases more gracefully. 2023-10-24 18:06:25 +01:00
Sam Rose
a8ae16852c
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4 2023-10-24 17:34:19 +01:00
Sam Rose
f4c6ab7f48
Make sure the user cannot enter the same column name as the old column for the migrated column. 2023-10-24 17:33:49 +01:00
Sam Rose
d3670ddf21
Add an input to allow the user to choose the new column name. 2023-10-24 17:22:49 +01:00
Sam Rose
2f0a40e9bb
Introduce modal to show warning to users, and toast to show success. 2023-10-24 15:18:46 +01:00
Andrew Kingston
7c19e9ed96
Merge branch 'master' into fix-table-metadata 2023-10-24 11:34:52 +01:00
jvcalderon
5c1710b5da Update pro submodule 2023-10-24 12:15:28 +02:00
jvcalderon
dbc903f3e6 Remove console.log 2023-10-24 12:03:07 +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
Andrew Kingston
654e6539bb
Merge branch 'master' into fix-table-metadata 2023-10-24 08:55:23 +01:00
Sam Rose
a701933f48
Frontend changes for the user column migration work. 2023-10-23 17:57:25 +01:00
Sam Rose
42e31d19fb
Merge master. 2023-10-23 16:18:51 +01:00
Adria Navarro
3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +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
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
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
9e279be4c3
Put pro back to where it was. 2023-10-23 10:35:41 +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
5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro
9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
Adria Navarro
13a8b20ea9
Merge branch 'master' into update-pro-ref 2023-10-20 17:04:04 +02: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
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
Michael Drury
8e76618a85
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 12:45:18 +01:00
mike12345567
bc8e84b815 Fixing datasource error states causing a datasource to fail to be built fully - this was simply a frontend issue of the error not being handled on creation. 2023-10-20 12:19:04 +01:00
Andrew Kingston
940801d8ea
Merge branch 'master' into grid-all-datasources 2023-10-20 11:54:42 +01:00
Andrew Kingston
db286d431a Fix dependsOn logic for gridblock after renaming setting key 2023-10-20 11:20:14 +01:00
Andrew Kingston
fa90629139 Improve grid datasource backwards compatibility 2023-10-20 11:14:24 +01:00