yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 14:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,583 Commits 123 Branches 496 Tags
Commit Graph

408 Commits

Author SHA1 Message Date
Mark Kaylor
6e96e68a87 Fix tbody cannot appear as child of div error 2023-03-07 08:42:24 +05:30
Josh
d209390fbe chore: update DS to 1.6.4 2023-03-02 13:17:01 +00:00
Josh
09ff54bc6e chore: convert Stack components to Flex 
chore: update snapshots

chore: convert rest of files to use Flex

chore: fix duplicate import

chore: update snapshots

chore: add eslint rule for stack

refactor: catch other Stack component uses

chore: remove horizontal prop
 2023-03-02 10:02:40 +00:00
Alexandre Bodin
e56b0061c7 Make checks stricter 2023-03-02 09:19:25 +01:00
Alexandre Bodin
24901be60b Fix license seat undefined block user creation 2023-03-01 20:13:22 +01:00
Fernando Chávez
e66228b24c
Merge pull request #15926 from strapi/fix/display-name-on-audit-logs 
[Audit Logs] Use username or email on audit logs page
 2023-02-27 16:27:36 +01:00
Fernando Chavez
793df833bb fix test failing 2023-02-27 15:08:14 +01:00
Fernando Chavez
9bb9a58a6a show displayname on audit logs modal 2023-02-27 10:45:53 +01:00
Fernando Chavez
eaf85737aa change getSanitizedUser fn on audit logs to use username and email 2023-02-27 10:31:34 +01:00
Alexandre Bodin
52c7eba65b fix tests missing useRBAC mock 2023-02-26 20:44:41 +01:00
Alexandre Bodin
879398552f Add missing RBAC check in the FE & fix lodash fp/no fp errors 2023-02-26 19:12:28 +01:00
Alexandre Bodin
2d48bf2ba0 Lodash usage consistency 2023-02-26 18:12:18 +01:00
Alexandre Bodin
834fdaba12 Handle undefined disabledUsers 2023-02-24 20:54:24 +01:00
Alexandre Bodin
69df3d050e Update seat-form url 2023-02-24 19:50:53 +01:00
Alexandre Bodin
f552aa9aa2 Apply feedbacks 2023-02-24 18:55:55 +01:00
ivanThePleasant
88b1987691 WIP Moving enforcement checks from controller level to service level (not checked or tested) 2023-02-22 14:42:27 +02:00
ivanThePleasant
02de068bee Fix lint problems 2023-02-20 10:49:40 +02:00
ivanThePleasant
20b147b719 Merge branch 'main' into chore/ee-seats 2023-02-19 23:02:42 +02:00
ivanThePleasant
5e0730b08d Addition to hook test 2023-02-19 22:13:25 +02:00
ivanThePleasant
a39f8fad2b Component test update 2023-02-19 21:22:56 +02:00
ivanThePleasant
04ef658eaf Merge branch 'chore/ee-seats' of https://github.com/strapi/strapi into chore/ee-seats 2023-02-19 21:13:09 +02:00
ivanThePleasant
e933069d42 WIP additional requested changes to server 2023-02-19 19:34:08 +02:00
Josh
6b17f8ad12 chore: convert all files to single imports of the DS & icons 
chore: remove eslint rule

chore: update snapshots

chore: update snapshots

chore: add eslint rule to stop direct imports apart from v2
 2023-02-15 17:23:59 +00:00
Gustav Hansen
d008235cf0 AdminSeatInfo: Add component unit tests 2023-02-15 14:08:09 +01:00
ivanThePleasant
c4620fd18a Merge branch 'chore/ee-seats' of https://github.com/strapi/strapi into chore/ee-seats 2023-02-15 12:01:06 +01:00
ivanThePleasant
d2ade473fd WIP requested server changes 2023-02-15 11:17:47 +01:00
ivanThePleasant
a874d4ee2b
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:15:05 +02:00
ivanThePleasant
87e16d578a
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:14:41 +02:00
ivanThePleasant
955b594d33
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:08:36 +02:00
ivanThePleasant
1c9edc61e8
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:56 +02:00
ivanThePleasant
c5c3525140
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:22 +02:00
ivanThePleasant
09b8fde8eb
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:55:23 +02:00
ivanThePleasant
d3e7172f6a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:54:09 +02:00
ivanThePleasant
05e285602a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:48:06 +02:00
ivanThePleasant
9262f5be0c
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:46:31 +02:00
ivanThePleasant
14b76d5d37
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:43:32 +02:00
ivanThePleasant
ac2f0bea4d
Update packages/core/admin/ee/server/controllers/admin.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:42:00 +02:00
ivanThePleasant
df1af817a5 Design changes 2023-02-14 13:40:21 +02:00
ivanThePleasant
437690022e Merge branch 'main' into chore/ee-seats 2023-02-14 00:01:02 +02:00
ivanThePleasant
30ac15e2f0 Tests for new hooks 2023-02-13 23:52:12 +02:00
ivanThePleasant
e500f0b4d0 WIP requested changes 2023-02-12 19:16:26 +02:00
Rémi de Juvigny
122fd4a6af Move audit logs permissions to EE 2023-02-10 16:29:10 +01:00
Josh
bddd9e604c chore: update snapshots 2023-02-09 16:48:09 +00:00
ivanThePleasant
3c932a25fb WIP several improvements on the #15738 merger 2023-02-09 12:37:38 +02:00
ivanThePleasant
fd6bfe9f0d
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:17 +02:00
ivanThePleasant
414941d28d
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:09 +02:00
ivanThePleasant
b085d2a8b8
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:01 +02:00
ivanThePleasant
2edbce8dc5
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:38:49 +02:00
Josh
2ff6e7769b chore: remove duplicate file 2023-02-08 11:20:26 +00:00
Rémi de Juvigny
cf4d169168
Merge branch 'main' into fix/audit-log-table 2023-02-08 11:39:51 +01:00