Merge branch 'master' into fix/counting-when-deep-filtering

This commit is contained in:
Bassel Kanso 2022-08-09 17:11:01 +03:00
commit 0f451ca49e
5 changed files with 119 additions and 1723 deletions

View File

@ -12,7 +12,6 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.3.2",
"@strapi/plugin-documentation": "4.3.2",
"@strapi/plugin-graphql": "4.3.2",
"@strapi/plugin-i18n": "4.3.2",
@ -22,7 +21,6 @@
"@strapi/provider-upload-aws-s3": "4.3.2",
"@strapi/provider-upload-cloudinary": "4.3.2",
"@strapi/strapi": "4.3.2",
"@strapi/utils": "4.3.2",
"@vscode/sqlite3": "5.0.8",
"better-sqlite3": "7.4.6",
"lodash": "4.17.21",

View File

@ -10,9 +10,9 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/plugin-i18n": "4.1.12",
"@strapi/plugin-users-permissions": "4.1.12",
"@strapi/strapi": "4.2.2",
"@strapi/plugin-i18n": "4.3.2",
"@strapi/plugin-users-permissions": "4.3.2",
"@strapi/strapi": "4.3.2",
"better-sqlite3": "7.4.6"
},
"author": {

View File

@ -12,12 +12,10 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.3.2",
"@strapi/provider-email-mailgun": "4.3.2",
"@strapi/provider-upload-aws-s3": "4.3.2",
"@strapi/provider-upload-cloudinary": "4.3.2",
"@strapi/strapi": "4.3.2",
"@strapi/utils": "4.3.2",
"lodash": "4.17.21",
"mysql": "2.18.1",
"passport-google-oauth2": "0.2.0",

View File

@ -125,7 +125,13 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
const Icon = link.icon;
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)}
</NavLink>
);

1824
yarn.lock

File diff suppressed because it is too large Load Diff