9899 Commits

Author SHA1 Message Date
Pierre Noël
b68aa8fcc6 fix conflict 2022-09-05 16:31:05 +02:00
Alexandre Bodin
7b9866a770 Fix eslint utils 2022-09-05 16:23:18 +02:00
Alexandre Bodin
eab835e301 Fix eslint content-manager 2022-09-05 16:20:47 +02:00
Alexandre Bodin
e3d92185f1 Fix eslint content-type-builder 2022-09-05 16:20:10 +02:00
Simone Taeggi
2f3555fe1d change the logic for the sync between permissions and api token Type 2022-09-05 16:19:50 +02:00
Pierre Noël
23657b7b5a factorize code 2022-09-05 16:18:37 +02:00
Pierre Noël
aa53790bd5 refactor with groupby 2022-09-05 16:18:37 +02:00
Pierre Noël
a658c6cc0a handle component use case 2022-09-05 16:18:36 +02:00
Pierre Noël
8100cffb3d use a grouped approach for where 2022-09-05 16:18:36 +02:00
Pierre Noël
f681c064c4 Fix relation not correctly set when uploadinga new file to an entity 2022-09-05 16:18:35 +02:00
Alexandre Bodin
4e989321e3 Fix eslint core/admin 2022-09-05 16:15:21 +02:00
ivanThePleasant
34cf331f20 Refactor test to correspond to previous change 2022-09-05 16:46:39 +03:00
ivanThePleasant
00f5efec51 Refactor properties format to move all properties objects to the root level of the req body 2022-09-05 16:44:58 +03:00
Tim Izzo
6dbccb2d5a Add missing ';' 2022-09-05 14:59:31 +02:00
ivanThePleasant
b704a6b918 Merge branch 'main' into chore/user-level-data 2022-09-05 14:10:05 +03:00
Marc
d982d6470e
Merge pull request #14132 from strapi/fix/delete-components-when-deleting-entity
Fix/delete components when deleting entity
2022-09-05 12:33:52 +02:00
Tim Izzo
f9a7ef6858 fix: 🐛 Use importDefault 2022-09-05 12:33:41 +02:00
Tim Izzo
78c3c909e5
Merge branch 'strapi:main' into main 2022-09-05 12:29:29 +02:00
ivanThePleasant
d568592d5c Refactor 'didUpdateRolePermissions' calls 2022-09-05 12:19:31 +03:00
Julie Plantey
66e998cb31
Merge pull request #14264 from WalkingPizza/fix/14205
Fix global.users translation for ES
2022-09-05 10:41:31 +02:00
Julie Plantey
0435769fec poc react window 2022-09-02 17:29:52 +02:00
Bassel Kanso
6ce5bf6a89 small fixes and changes 2022-09-02 16:56:44 +03:00
ivanThePleasant
a2ee4bb855 Change location of user creation analytics call, remove development console log, adjust tests accordingly 2022-09-02 16:21:48 +03:00
WalkingPizza
12fffff5c8 Prevent InputJSON from crashing when field value is 0 2022-09-02 15:12:52 +02:00
WalkingPizza
617ae0f396 Remove console.log 2022-09-02 15:04:30 +02:00
WalkingPizza
55efd7b034 Update lang attribute on locale change 2022-09-02 14:46:31 +02:00
ivanThePleasant
b5c98ae0cd Refactor event calls to follow old format, encapsulate hashing in the sender, refactor the format of event payload to better correspond to the new api 2022-09-02 14:43:51 +03:00
WalkingPizza
d63c47b6e6 Do not allow reserved names for singular/plural API names 2022-09-02 13:18:07 +02:00
Bassel Kanso
7ae458480f used terinary operator 2022-09-02 13:01:31 +03:00
Bassel Kanso
dae381cbc7 fix don't filter the plugin action 2022-09-02 12:46:55 +03:00
Bassel Kanso
e8bde13352 show routes for actions 2022-09-02 12:43:48 +03:00
ivanThePleasant
cbfde4a11c Merge branch 'main' into chore/user-level-data 2022-09-02 12:22:12 +03:00
Bassel Kanso
30e3a2ac70 Merge branch 'features/api-token-v2' into api-token-v2/get-action-bound-routes 2022-09-02 11:17:39 +03:00
Bassel Kanso
c842085fe3 move routes map service to content API coontainer 2022-09-02 11:06:55 +03:00
Convly
94978036bc Merge branch 'main' into features/api-token-v2 2022-09-02 09:35:03 +02:00
Zharkan
2b8a9ba33a
fix some translations 2022-09-01 23:06:23 +02:00
WalkingPizza
1b6ccc76b6 Trim admin's first name when validating 2022-09-01 22:45:23 +02:00
Mark Kaylor
2bf73e4fdc Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/color-picker 2022-09-01 18:01:46 +02:00
Bassel Kanso
94488a07c3 update snapshot test 2022-09-01 15:17:19 +03:00
Bassel Kanso
a9f0987f73 update permissions after submit 2022-09-01 14:57:04 +03:00
Bassel Kanso
641122d3ff update tests 2022-09-01 14:17:58 +03:00
Bassel Kanso
94fb69e01e re intialize formik values when initial values change 2022-09-01 14:16:08 +03:00
Bassel Kanso
5c202135e3 Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-09-01 14:02:44 +03:00
Julie Plantey
a3a1bea099 RelationInput tests 2022-09-01 12:30:58 +02:00
Bassel Kanso
7f2f205fa3 remove default lifespan value 2022-09-01 12:24:26 +03:00
Convly
4a5562bf78 Merge branch 'features/api-token-v2' of github.com:strapi/strapi into features/api-token-v2 2022-09-01 11:23:47 +02:00
Convly
c3f18c7fdc Update frontend snapshots 2022-09-01 11:21:43 +02:00
Pierre Noël
29376f8113
Merge pull request #14014 from strapi/relations-main-view/find-new-relations
refactor relation findNew route
2022-09-01 11:11:06 +02:00
Simone
758ab18329
Merge pull request #14213 from strapi/api-token-v2/regenerate-an-api-token
Regenerate an API token
2022-09-01 11:07:04 +02:00
Bassel Kanso
1411367b5f Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-09-01 11:36:11 +03:00