yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,925 Commits 118 Branches 507 Tags
Commit Graph

5225 Commits

Author SHA1 Message Date
bulby97
deb6859a56 Add modal condition button 2021-08-26 10:31:19 +02:00
bulby97
7a68a06082 move to ds accordion 2021-08-26 10:31:19 +02:00
bulby97
fddb6fffe0 Make collapseLabel a11ible 2021-08-26 10:31:19 +02:00
bulby97
e7ba1c3230 Fix flex issues, and improve use of DS 2021-08-26 10:31:18 +02:00
bulby97
0c9945ce3f wip ds impl 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
8f5cb90863 Migrate admin policies 2021-08-25 15:16:17 +02:00
Alexandre Bodin
7f30925161 Merge branch 'v4/backend' into releases/v4 2021-08-25 14:45:59 +02:00
Alexandre Bodin
1ee2d2c483 Merge branch 'master' into releases/v4 2021-08-25 14:44:32 +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
87b8a3b4e2 Remove old files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 17:04:13 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
soupette
055c3d5bba Remove old component 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:51:34 +02:00
soupette
d986ed9c97 Remove rollup 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:49 +02:00
soupette
b5bfac5ab2 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:49 +02:00
soupette
3468cbfa35 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:48 +02:00
soupette
21e18660eb Fix CM hook api and temporarily display the cm in the admin panel 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:48 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
HichamELBSI
971f30f897 Fix test mock 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-24 14:22:22 +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
HichamELBSI
8b982f3822 Merge branch 'v4/ds-migration' into migration/forgot-password 2021-08-24 13:32:53 +02:00
HichamELBSI
9789deed73 Add tests & default messages 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-24 13:30:42 +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
Alexandre Bodin
56600eca2a Move admin lifecycle functions and rename models to content-types 2021-08-23 22:04:15 +02:00
bulby97
99969b1050 Rm useless files, add simple tests 2021-08-23 14:26:14 +02:00
Alexandre Bodin
1350b1cc92 Merge branch 'releases/v4' into pluginAPI/loadPlugin 2021-08-23 14:23:51 +02:00
bulby97
ffb4da8989 Add key to tr role list 2021-08-23 14:21:58 +02:00
soupette
e5065a5139 Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-23 13:13:24 +02:00
soupette
8230d1aaec Fix conflicts and remove not migrated components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-23 11:14:08 +02:00
soupette
7824f78dab Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-23 10:56:48 +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
soupette
d8209894fa Fix admin development 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 15:30:54 +02:00
Pierre Noël
09945a46df fixes 2021-08-20 15:23:02 +02:00
Alexandre Bodin
8252a51ba5 Use a registry for the plugins 2021-08-20 13:12:37 +02:00
Alexandre Bodin
575cbbdc7c Migrate plugin getters 2021-08-19 23:30:49 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
Alexandre Bodin
4fbd411f69 Fix lint 2021-08-19 23:28:29 +02:00
soupette
0071df7c18 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 17:59:20 +02:00
soupette
131a506f80 Removed buffetjs from roles lv 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 17:12:21 +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
soupette
0c516640ae Remove plugins views 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 16:38:32 +02:00
ronronscelestes
c987be0d5b fix conflicts 2021-08-19 15:41:41 +02:00
ronronscelestes
9e5ff42af2 add webhook link button if canCreate + notifyStatus 2021-08-19 15:04:01 +02:00
ronronscelestes
e9fb65d1ea merged v4/ds-migration 2021-08-19 13:54:53 +02:00
ronronscelestes
52422440f0 updated to parts alpha 15 + LinkButton 2021-08-19 12:00:53 +02:00
mfrachet
54ac90626d Remove bootstrap 2021-08-19 10:26:47 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00