yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,682 Commits 129 Branches 498 Tags
Commit Graph

185 Commits

Author SHA1 Message Date
soupette
8d75d84871 Change MagicLink folder 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 07:53:42 +02:00
soupette
061500e170 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 05:53:45 +02:00
ronronscelestes
1ffa60a779 delete a role added 2021-09-02 18:15:48 +02:00
soupette
3b266e05c0 Add magic link 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-02 17:52:19 +02:00
ronronscelestes
c8f47d74a8 delete a role added 2021-09-02 17:37:38 +02:00
soupette
f92f78d908 Create modal form to create users 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-02 16:35:03 +02:00
soupette
f66a6c53ff Created common SettingsPageTitle component 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 17:22:37 +02:00
soupette
d31b2168df Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 17:03:33 +02:00
soupette
8fe83993db Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 15:07:26 +02:00
soupette
3ef754a64b Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 15:04:36 +02:00
bulby97
af0168c305 Remove useless components 2021-08-30 14:00:45 +02:00
soupette
a6e64e3c60 Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 11:32:36 +02:00
soupette
f5ea60ae1f Migrate ml settings to the new DS 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 09:49:40 +02:00
soupette
701303eb73 Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-27 16:00:46 +02:00
soupette
511b67f43b Migrate sso settings 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-27 14:57:23 +02:00
soupette
e79bf0d64d Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-27 11:56:38 +02:00
soupette
431a68cf51 Merge branch 'v4/ds-migration' of github.com:strapi/strapi into migration/fix-role-list 2021-08-27 11:14:17 +02:00
soupette
05b2db9ccb Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-27 09:44:37 +02:00
cyril lopez
6b74e05a63
Merge pull request #10743 from strapi/migration/admin-setting-create-role 
Migration/admin setting create role
 2021-08-27 08:03:12 +02:00
bulby97
48ab4ec6d1 fix tests and review issues 2021-08-26 10:56:19 +02:00
bulby97
1188d8023e Add rowHeight constant 2021-08-26 10:31:22 +02:00
bulby97
3c9e92a2c4 Fix a11y issues 2021-08-26 10:31:21 +02:00
bulby97
9a042610ea No need to have a box loader component 2021-08-26 10:31:21 +02:00
bulby97
f0786f3af6 Add Box Loader 2021-08-26 10:31:20 +02:00
bulby97
6536cfa298 Add loading state on submit button 2021-08-26 10:31:20 +02:00
bulby97
e9dda123a5 Add defaultMessage, add plural syntax 2021-08-26 10:31:20 +02:00
bulby97
e7ba1c3230 Fix flex issues, and improve use of DS 2021-08-26 10:31:18 +02:00
bulby97
54b2b64b43 Form done, WIP collection type 2021-08-26 10:31:18 +02:00
bulby97
9f7208db9d wip 2021-08-26 10:31:15 +02:00
Alexandre Bodin
7f30925161 Merge branch 'v4/backend' into releases/v4 2021-08-25 14:45:59 +02:00
soupette
81c290a53c Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-25 11:04:43 +02:00
soupette
14d9533516 Add notifications 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-25 10:07:30 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
Alexandre Bodin
f4a4e2ce26 Move routes to js when possible and refactor policies to be objects 2021-08-24 13:59:43 +02:00
Alexandre Bodin
0b3c7392c6 Keep on migrating admin to new structure 2021-08-23 22:41:22 +02:00
Alexandre Bodin
47c3900c07 Update createContentType to expose a simpler object 2021-08-23 22:25:31 +02:00
bulby97
99969b1050 Rm useless files, add simple tests 2021-08-23 14:26:14 +02:00
bulby97
ffb4da8989 Add key to tr role list 2021-08-23 14:21:58 +02:00
Pierre Noël
bc56be3560 Merge branch 'pluginAPI/loadPlugin' of github.com:strapi/strapi into pluginAPI/loadPlugin 2021-08-20 16:32:14 +02:00
Pierre Noël
09945a46df fixes 2021-08-20 15:23:02 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
soupette
77eedf2577 Commented the settings view that are not yet migrated 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 16:46:06 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
soupette
393bf5f1be Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:42:19 +02:00
soupette
48239ab116 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:30:45 +02:00
Pierre Noël
682e877644 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-18 18:37:57 +02:00
ronronscelestes
e8c352eb8e Merge branch 'v4/ds-migration' into webhooks-listview-ds 2021-08-17 15:03:41 +02:00
ronronscelestes
f79f6eda59 Merge branch 'v4/ds-migration' into webhooks-listview-ds 2021-08-17 14:05:36 +02:00
Alexandre Bodin
d5dd34278b Fix delete permissions 2021-08-17 13:48:52 +02:00