mirror of
https://github.com/strapi/strapi.git
synced 2025-09-23 07:22:51 +00:00
Merge branch 'master' into fix/counting-when-deep-filtering
This commit is contained in:
commit
0f451ca49e
@ -12,7 +12,6 @@
|
|||||||
"strapi": "strapi"
|
"strapi": "strapi"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@strapi/admin": "4.3.2",
|
|
||||||
"@strapi/plugin-documentation": "4.3.2",
|
"@strapi/plugin-documentation": "4.3.2",
|
||||||
"@strapi/plugin-graphql": "4.3.2",
|
"@strapi/plugin-graphql": "4.3.2",
|
||||||
"@strapi/plugin-i18n": "4.3.2",
|
"@strapi/plugin-i18n": "4.3.2",
|
||||||
@ -22,7 +21,6 @@
|
|||||||
"@strapi/provider-upload-aws-s3": "4.3.2",
|
"@strapi/provider-upload-aws-s3": "4.3.2",
|
||||||
"@strapi/provider-upload-cloudinary": "4.3.2",
|
"@strapi/provider-upload-cloudinary": "4.3.2",
|
||||||
"@strapi/strapi": "4.3.2",
|
"@strapi/strapi": "4.3.2",
|
||||||
"@strapi/utils": "4.3.2",
|
|
||||||
"@vscode/sqlite3": "5.0.8",
|
"@vscode/sqlite3": "5.0.8",
|
||||||
"better-sqlite3": "7.4.6",
|
"better-sqlite3": "7.4.6",
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
"strapi": "strapi"
|
"strapi": "strapi"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@strapi/plugin-i18n": "4.1.12",
|
"@strapi/plugin-i18n": "4.3.2",
|
||||||
"@strapi/plugin-users-permissions": "4.1.12",
|
"@strapi/plugin-users-permissions": "4.3.2",
|
||||||
"@strapi/strapi": "4.2.2",
|
"@strapi/strapi": "4.3.2",
|
||||||
"better-sqlite3": "7.4.6"
|
"better-sqlite3": "7.4.6"
|
||||||
},
|
},
|
||||||
"author": {
|
"author": {
|
||||||
|
@ -12,12 +12,10 @@
|
|||||||
"strapi": "strapi"
|
"strapi": "strapi"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@strapi/admin": "4.3.2",
|
|
||||||
"@strapi/provider-email-mailgun": "4.3.2",
|
"@strapi/provider-email-mailgun": "4.3.2",
|
||||||
"@strapi/provider-upload-aws-s3": "4.3.2",
|
"@strapi/provider-upload-aws-s3": "4.3.2",
|
||||||
"@strapi/provider-upload-cloudinary": "4.3.2",
|
"@strapi/provider-upload-cloudinary": "4.3.2",
|
||||||
"@strapi/strapi": "4.3.2",
|
"@strapi/strapi": "4.3.2",
|
||||||
"@strapi/utils": "4.3.2",
|
|
||||||
"lodash": "4.17.21",
|
"lodash": "4.17.21",
|
||||||
"mysql": "2.18.1",
|
"mysql": "2.18.1",
|
||||||
"passport-google-oauth2": "0.2.0",
|
"passport-google-oauth2": "0.2.0",
|
||||||
|
@ -125,7 +125,13 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
|
|||||||
const Icon = link.icon;
|
const Icon = link.icon;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<NavLink as={RouterNavLink} to={link.to} key={link.to} icon={<Icon />}>
|
<NavLink
|
||||||
|
as={RouterNavLink}
|
||||||
|
to={link.to}
|
||||||
|
key={link.to}
|
||||||
|
icon={<Icon />}
|
||||||
|
badgeContent={link.badge}
|
||||||
|
>
|
||||||
{formatMessage(link.intlLabel)}
|
{formatMessage(link.intlLabel)}
|
||||||
</NavLink>
|
</NavLink>
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user