yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 05:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 106 Branches 487 Tags
Commit Graph

5169 Commits

Author SHA1 Message Date
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
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
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
soupette
84db431583 Move Users into settingspages/pages folder 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 13:19:26 +02:00
soupette
0ecb341d39 Move Roles pages into Settings pages folder 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 12:46:32 +02:00
soupette
b2c2e7d161 Move roles components in Roles/EditPage 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 12:35:35 +02:00
ronronscelestes
b676757e5e logo and intl 2021-09-06 12:18:45 +02:00
soupette
ec3cd692b4 Move ApplicationInfosPage 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 12:10:55 +02:00
soupette
eb167b500f Creates pages folder in Settings and move webhooks in it 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:53:52 +02:00
soupette
95b3863804 Move Webhooks components into the webhooks folder 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:44:12 +02:00
soupette
319b56714e Move components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:37:12 +02:00
ronronscelestes
a716efb41c Merge branch 'v4/ds-migration' into migration/homepage 2021-09-06 11:32:49 +02:00
ronronscelestes
09954a16af translation messages - social link icons 2021-09-06 11:32:05 +02:00
soupette
fbe35895a6 Remove PageTitle component and use Helmet instead 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:24:18 +02:00
soupette
e0aa76e435 Remove old components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:20:13 +02:00
soupette
42534d3007 Delete old components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 11:05:11 +02:00
soupette
d56a7d4e0d Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 10:57:50 +02:00
ronronscelestes
f25ee25edd Merge branch 'v4/ds-migration' of https://github.com/strapi/strapi into upgrade-plan 2021-09-06 09:59:05 +02:00
ronronscelestes
2d5783ad3c compo placed in core admin components 2021-09-06 09:56:12 +02:00
ronronscelestes
487bb82cb1 wip home page 2021-09-06 09:36:04 +02:00
Montlouis-Calixte Stéphane
8e9d8fc8c8
Merge pull request #10845 from strapi/edit-webhook-page 
Edit webhook page
 2021-09-06 08:39:58 +02:00
bulby97
ed3b269236 Remove old webhook edit page 2021-09-06 08:29:51 +02:00
ronronscelestes
3162e3b6fa at least 1 notification to show the badge 2021-09-03 16:59:54 +02:00
ronronscelestes
2987fa3c30 Main nav notifications 2021-09-03 16:55:21 +02:00
ronronscelestes
4eff51a28c UpgradePlanModal 2021-09-03 16:34:20 +02:00
HichamELBSI
f75443d9b8 Fix Strapi v4 after Parts update 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-09-03 16:18:55 +02:00
bulby97
2e24f87b4c Fix review issues 2021-09-03 16:03:47 +02:00
bulby97
0509d4c97f Move webhook component for test purpose, add tests 2021-09-03 15:55:57 +02:00
bulby97
0749093c66 Better components for testing purpose 2021-09-03 14:29:31 +02:00
bulby97
b70b320bca Add remove rounded button in helper plugin 2021-09-03 14:29:31 +02:00
bulby97
b8a60d7d0e Move utils to old/utils, done trigger container 2021-09-03 14:29:31 +02:00
bulby97
5e9591edcf Create and Edit page done, wip trigger container 2021-09-03 14:29:31 +02:00
bulby97
62d973bc04 add query mutation 2021-09-03 14:29:27 +02:00
bulby97
770e5351dd Add box content 2021-09-03 14:28:50 +02:00
bulby97
c4b572b5c2 add header layout 2021-09-03 14:28:50 +02:00
soupette
be1d7336ea Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 14:20:13 +02:00
soupette
ba22874b28 Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 14:13:47 +02:00
soupette
a4c0bfd3fd Fix feedback from create PR 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 12:41:18 +02:00
soupette
65e35431bd Add search and migrate to axios 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 11:57:06 +02:00
soupette
47ba1d5af9 Add search 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 11:38:16 +02:00
soupette
cbee6f009c Merge branch 'v4/ds-migration' of github.com:strapi/strapi into migration/rbac-delete 2021-09-03 11:28:59 +02:00
soupette
46c1580038 Remove useless files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 10:04:05 +02:00
soupette
57ce9de53a Remove old files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 09:41:36 +02:00
soupette
7e2f8063a8 Display errors 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 09:40:27 +02:00
soupette
d1609eb111 Handle put user 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 09:10:13 +02:00
soupette
5b746d3c42 Display form 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-03 08:32:13 +02:00