10 Commits

Author SHA1 Message Date
Gustav Hansen
0a008881ef Merge branch 'main' into feature/review-workflow 2023-03-16 15:49:45 +01:00
Alexandre Bodin
e0e2084422 Move RBAC into CE 2023-03-06 21:46:45 +01:00
Convly
478127d7c7 Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-20 16:58:46 +01:00
nathan-pichon
35f783d0dc
Merge branch 'main' into feature/review-workflow
# Conflicts:
#	packages/core/admin/ee/admin/permissions/customPermissions.js
2023-02-15 16:32:07 +01:00
Rémi de Juvigny
839d677c8f Remove the associated actions 2023-02-14 18:52:53 +01:00
nathan-pichon
f4ea7d04e3
test(admin-permissions): update snapshot 2023-02-13 16:45:25 +01:00
Convly
65bf4cf12f Update permission snapshots 2023-02-03 16:34:21 +01:00
Rémi de Juvigny
9ef1bea85f Fix api tests 2023-01-25 16:58:37 +01:00
Jamie Howard
5c50587d64 Merge remote-tracking branch 'origin/main' into feature/media-library-ctv 2022-11-15 11:20:33 +00:00
Alexandre Bodin
57e1eb5ee8 Move e2e to api tests and unify test command 2022-10-27 19:49:37 +02:00