yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 13:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 118 Branches 492 Tags
Commit Graph

17520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bulby97
fc7272910a fix tests 2021-09-08 16:09:10 +02:00
bulby97
0ad501b1f0 Fix tests 2021-09-08 15:31:10 +02:00
bulby97
738a4567d6 Add test for nav 2021-09-08 15:31:09 +02:00
bulby97
3dadfe51b9 Add layout 2021-09-08 15:31:08 +02:00
bulby97
46dceeba7d Fix tests 2021-09-08 15:31:08 +02:00
bulby97
3b8565b2c9 Add defaultMessage everywhere 2021-09-08 15:31:07 +02:00
bulby97
06d7d979e5 Bring back LeftMenu 2021-09-08 15:31:07 +02:00
bulby97
48a9d6c21c Add subnav 2021-09-08 15:31:06 +02:00
soupette
2278a34c63 Enable CTB 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-08 15:31:05 +02:00
ronronscelestes
e70d5f72ce Merge branch 'v4/ds-migration' of https://github.com/strapi/strapi into blue-box 2021-09-08 15:24:18 +02:00
soupette
c4325b4fd0 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-08 14:10:38 +02:00
ronronscelestes
486e96cfad feedback fixes + improved tests 2021-09-08 12:54:05 +02:00
soupette
528a56d4e9 Add kitchensink app 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-08 10:25:15 +02:00
Marvin Frachet
b77feb9764
I18N settings modal, creation (#10749) 2021-09-08 09:14:31 +02:00
ronronscelestes
8721c65c19 fixed focustrap and accessibility 2021-09-07 18:38:34 +02:00
ronronscelestes
8d3bf50a08 fix me comment + FocusTrap added 2021-09-07 18:01:26 +02:00
cyril lopez
81aa2d8096
Merge pull request #10899 from strapi/users-content-box 
Migration/Users ContentBox
 2021-09-07 17:33:32 +02:00
ronronscelestes
d55d0825bf tests fix 2021-09-07 17:22:50 +02:00
ronronscelestes
acf60c7297 merge conflict 2021-09-07 17:02:07 +02:00
ronronscelestes
0efa5070a3 feedback fix 2021-09-07 16:29:54 +02:00
ronronscelestes
2bed9f51d6 onboarding compo redone 2021-09-07 16:21:33 +02:00
cyril lopez
aabc12540c
Merge pull request #10900 from strapi/chore/dev-build 
Add dev build in helper plugin
 2021-09-07 15:00:11 +02:00
soupette
7ff5867625 Add dev build in helper plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 14:50:34 +02:00
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
ronronscelestes
e4ad750f0e updated tests 2021-09-07 12:59:48 +02:00
ronronscelestes
96f163e947 merge conflicts 2021-09-07 12:53:58 +02:00
ronronscelestes
399f42a78c customEllipsis in utils + updated tests 2021-09-07 12:51:34 +02:00
cyril lopez
b625c77297
Merge pull request #10889 from strapi/migration/homepage 
Migration/Homepage
 2021-09-07 12:25:28 +02:00
ronronscelestes
d3e85fad13 updated onboarding component 2021-09-07 12:18:41 +02:00
ronronscelestes
b454d57491 added ContentBox to magic link + fix url length situation 2021-09-07 11:38:16 +02:00
cyril lopez
13fb791c67
Merge pull request #10893 from strapi/ds-migration/roles-list-header 
[v4] migrate roles page header
 2021-09-07 10:35:53 +02:00
ronronscelestes
9a535775f9 feedback fix 2021-09-07 10:16:24 +02:00
Mark Kaylor
8891295614 add check permissions 2021-09-07 10:12:37 +02:00
cyril lopez
298ac07160
Merge pull request #10892 from strapi/ds-migration/roles-edit-structure 
[v4] Create users-permissions edit role page structure
 2021-09-07 09:28:18 +02:00
cyril lopez
4be4b3ef01
Merge pull request #10881 from strapi/upgrade-plan 
UpgradePlanModal
 2021-09-07 08:20:38 +02:00
Mark Kaylor
1389a447c2 migrate roles page header 2021-09-06 20:30:25 +02:00
Rémi de Juvigny
2d75077d01 Add snapshot test 2021-09-06 19:03:08 +02:00
ronronscelestes
774181fc3f added tests 2021-09-06 16:58:10 +02:00
ronronscelestes
590aeacf05 feedback fix + tests 2021-09-06 16:32:37 +02:00
ronronscelestes
2c7cbef984 fixed upgrade compo import role/LV 2021-09-06 16:02:24 +02:00
ronronscelestes
4284d9f025 Merge branch 'v4/ds-migration' of https://github.com/strapi/strapi into upgrade-plan 2021-09-06 15:38:45 +02:00
ronronscelestes
74e8f7ca7f tests + updated ContentBox 2021-09-06 15:37:00 +02:00
Alexandre BODIN
76d1ac7ada
Merge pull request #10877 from strapi/v4/migrate-email-upload-plugin 
Make email, upload, CM and CTB plugins internal
 2021-09-06 13:36:53 +00:00
ronronscelestes
502bb00cd9 fix conflicts 2021-09-06 14:48:10 +02:00
soupette
e04b7b5815 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 14:38:50 +02:00
ronronscelestes
a6d5d2e272 fix merge conflict 2021-09-06 14:26:51 +02:00
Rémi de Juvigny
714b23273b Create users-permissions edit role page structure 2021-09-06 14:23:40 +02:00
cyril lopez
e5e1f2b0a9
Merge pull request #10880 from strapi/fix/parts-update 
Fix Strapi v4 after Parts  update
 2021-09-06 14:07:36 +02:00
ronronscelestes
e823873d9a feedback fix 2021-09-06 14:06:01 +02:00
soupette
0f08ab54d1 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 14:03:37 +02:00