yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-09 15:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,106 Commits 104 Branches 503 Tags
Commit Graph

438 Commits

Author SHA1 Message Date
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
Rémi de Juvigny
4bbfab14fe Move migration to dedicated folder 2023-02-08 11:38:58 +01:00
Gustav Hansen
cabe932c3e Rename useLicenseLimitInfos hook 2023-02-08 10:59:46 +01:00
Gustav Hansen
77be722048 Refactor useLicenseLimitInfos and useLicenseLimitNotifications hooks 
Co-authored-by: Josh Ellis <josh.ellis@strapi.io>
 2023-02-08 10:39:49 +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
markkaylor
b4188fc0e6
Merge branch 'main' into feature/audit-logs-add-filters 2023-02-07 17:50:37 +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
Fernando Chávez
0072ce9789
Merge pull request #15708 from strapi/fix/audit-logs-check-auth-strategy 
[Audit Logs] Check auth strategy to log events on audit logs
 2023-02-07 17:25:04 +01:00
ivanThePleasant
d26d08e933 Merge branch 'main' into chore/ee-seats 2023-02-07 18:11:44 +02: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
Mark Kaylor
b437225fc4 Merge branch 'main' of github.com:strapi/strapi into audit-logs/add-filters 2023-02-07 11:14:32 +01:00
ivanThePleasant
7edd834712 Merge branch 'main' into chore/ee-seats 2023-02-07 11:28:21 +02: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
markkaylor
f0ff25c27a
Merge branch 'main' into chore/bump-ds-dep 2023-02-06 18:24:49 +01:00
Fernando Chavez
a5a1967d00 Check auth strategy to log events on audit logs 2023-02-03 16:18:53 +01:00
Mark Kaylor
4bc7afc769 Update snapshots 2023-02-03 14:48:38 +01:00
Simone Taeggi
ea15154849 squash and merge all the code related to the axios migration to use useFetchClient and getFetchClient in the admin 2023-02-03 10:41:34 +01:00