yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-17 14:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 115 Branches 484 Tags
Commit Graph

14487 Commits

Author SHA1 Message Date
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
Jean-Sébastien Herbaux
2b715a6ee9
V4/graphql configuration (#10896) 
* Use a scalar to register the i18n locale arg

* Remove useless files & comments

* Use custom config for apollo server & the pagination (better handling of pagination)

* Fix missing strapi variable being transmitted to wrapResolvers/parseMiddlewares

* PR review comments
 2021-09-07 11:23:49 +02:00
Convly
e2be869d3b Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-07 11:22:43 +02:00
ronronscelestes
9a535775f9 feedback fix 2021-09-07 10:16:24 +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
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
Pierre Noël
4b30d03ed6 remove possibility to disable an internal plugin 2021-09-06 12:03:52 +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
6439f014ec removed UpgradePlan from helper-plugin 2021-09-06 10:52:08 +02:00
ronronscelestes
0c0d8b940c Merge branch 'upgrade-plan' of https://github.com/strapi/strapi into upgrade-plan 2021-09-06 10:50:13 +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
cyril lopez
a68aeb0d16
Merge pull request #10882 from strapi/main-nav-notifications 
Main nav notifications
 2021-09-06 07:46:54 +02:00
cyril lopez
b9c5a0b762
Merge pull request #10878 from strapi/content-box 
ContentBox helper-plugin
 2021-09-06 07:32:40 +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
34fe342a6e test describe label && isOpen PropTypes 2021-09-03 16:34:21 +02:00
ronronscelestes
4eff51a28c UpgradePlanModal 2021-09-03 16:34:20 +02:00
ronronscelestes
f386ccaaa9 test describe label && isOpen PropTypes 2021-09-03 16:22:12 +02:00
ronronscelestes
672822e070 UpgradePlanModal 2021-09-03 16:20:15 +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