yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 05:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,394 Commits 115 Branches 491 Tags
Commit Graph

18394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
cyril lopez
059a42a5f0
Merge pull request #10890 from strapi/chore/clean-settings 
Clean settings components.
 2021-09-06 13:51:02 +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
Alexandre BODIN
52bc4642b8
Merge pull request #10868 from strapi/v4/plugin-api/local-plugin-loading 
Append strapi.dir to plugin path if relative
 2021-09-06 07:56:33 +00: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