yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 04:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,583 Commits 116 Branches 487 Tags
Commit Graph

131 Commits

Author SHA1 Message Date
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
eaf85737aa change getSanitizedUser fn on audit logs to use username and email 2023-02-27 10:31:34 +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
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
e933069d42 WIP additional requested changes to server 2023-02-19 19:34:08 +02: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
437690022e Merge branch 'main' into chore/ee-seats 2023-02-14 00:01:02 +02:00
ivanThePleasant
e500f0b4d0 WIP requested changes 2023-02-12 19:16:26 +02:00
Rémi de Juvigny
4bbfab14fe Move migration to dedicated folder 2023-02-08 11:38:58 +01:00
Rémi de Juvigny
3a33df8e7e Compare content type schema against db columns 2023-02-07 20:35:04 +01:00
Rémi de Juvigny
a3e5ad460b Check schema equality before migration 2023-02-07 20:00:40 +01:00
Rémi de Juvigny
337df63ad1 Merge remote-tracking branch 'origin/main' into fix/audit-log-table 2023-02-07 17:35:23 +01:00
ivanThePleasant
4e9c94f75c Fix tests, various improvements and conditions 2023-02-07 18:00:00 +02:00
Rémi de Juvigny
3b0309b06f Fix test 2023-02-07 16:00:45 +01:00
Rémi de Juvigny
d1a1754d3d Typo 2023-02-07 12:27:35 +01:00
Rémi de Juvigny
ee2f5f07b4 Add auto db migration 2023-02-07 12:11:28 +01:00
ivanThePleasant
ebdf9c06c2 WIP add redux support to license limit hook, various minor changes 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2023-02-07 11:27:44 +02:00
Fernando Chavez
a5a1967d00 Check auth strategy to log events on audit logs 2023-02-03 16:18:53 +01:00
ivanThePleasant
a0144c1565 WIP 2023-02-03 10:20:55 +02:00
ivanThePleasant
c8b38613bc Implement ee bootstrap seat enforcement 2023-01-29 19:24:55 +02:00
Jean-Sébastien Herbaux
b23bba9ba6
Merge pull request #15147 from strapi/chore/online-license-skeleton 2023-01-25 20:37:25 +01:00
fdel-car
a0b344e575 Fix audit logs test 2023-01-25 19:52:07 +01:00
fdel-car
950dda7877 Update SSO error message 2023-01-25 19:52:07 +01:00
fdel-car
f3550cea82 Add audit logs support & update the features API 2023-01-25 19:52:07 +01:00
fdel-car
5f86716429 Apply Alex's missing feedback 2023-01-25 19:52:07 +01:00
Alexandre Bodin
5a2b379fa0 Runtime server feature flag 2023-01-25 19:52:07 +01:00
Jean-Sébastien Herbaux
a1a54c899a
Merge branch 'main' into features/deits 2023-01-25 19:49:01 +01:00
Mark Kaylor
37a6c0516e Move useRealTimers to afterAll 2023-01-25 15:52:22 +01:00
Rémi de Juvigny
0875dc97a8 Fix audit logs route policy 2023-01-23 19:06:12 +01:00
Rémi de Juvigny
65654f5469 Bump retention days to 90 2023-01-23 17:01:18 +01:00
Rémi de Juvigny
f12187517a
Merge pull request #15475 from strapi/audit-logs/retention 
[Audit logs] Move retention calculation to feature level
 2023-01-19 18:05:06 +01:00
Rémi de Juvigny
d725279095 Add media folder events 2023-01-18 17:06:17 +01:00
Rémi de Juvigny
ccc6da1f9e Ignore upload plugin entry events 2023-01-18 16:09:52 +01:00