yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/content-manager-crash-on-nonstring-dynamicfield

Browse Source
This commit is contained in:
GitStart 2022-12-22 10:58:01 +01:00 committed by GitHub
commit 791612b47c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js
View File

@ -74,7 +74,7 @@ const Header = ({
{formatMessage({ id: 'app.utils.publish', defaultMessage: 'Publish' })}
</Button>
)}
<Button disabled={!didChangeData} isLoading={status === 'submit-pending'} type="submit">
<Button disabled={!didChangeData} loading={status === 'submit-pending'} type="submit">
{formatMessage({
id: getTrad('containers.Edit.submit'),
defaultMessage: 'Save',

2
packages/core/admin/package.json
View File

@ -62,7 +62,7 @@
"codemirror": "^5.65.8",
"cross-env": "^7.0.3",
"css-loader": "6.7.2",
"date-fns": "2.29.2",
"date-fns": "2.29.3",
"dotenv": "8.5.1",
"esbuild-loader": "^2.20.0",
"execa": "^1.0.0",

2
packages/core/database/package.json
View File

@ -31,7 +31,7 @@
"test:unit": "jest --verbose"
},
"dependencies": {
"date-fns": "2.29.2",
"date-fns": "2.29.3",
"debug": "4.3.4",
"fs-extra": "10.0.0",
"knex": "1.0.7",

2
packages/core/helper-plugin/package.json
View File

@ -40,7 +40,7 @@
},
"dependencies": {
"axios": "0.27.2",
"date-fns": "2.29.2",
"date-fns": "2.29.3",
"formik": "^2.2.6",
"immer": "9.0.6",
"invariant": "^2.2.1",

2
packages/core/upload/package.json
View File

@ -28,7 +28,7 @@
"@strapi/utils": "4.5.4",
"byte-size": "7.0.1",
"cropperjs": "1.5.12",
"date-fns": "2.29.2",
"date-fns": "2.29.3",
"fs-extra": "10.0.0",
"immer": "9.0.15",
"koa-range": "0.3.0",

2
packages/core/utils/package.json
View File

@ -36,7 +36,7 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"date-fns": "2.29.2",
"date-fns": "2.29.3",
"http-errors": "1.8.1",
"lodash": "4.17.21",
"yup": "0.32.9"

8
yarn.lock
View File

@ -10079,10 +10079,10 @@ data-urls@^3.0.2:
whatwg-mimetype "^3.0.0"
whatwg-url "^11.0.0"
date-fns@2.29.2:
version "2.29.2"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931"
integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
date-fns@2.29.3:
version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
dateformat@^3.0.0:
version "3.0.3"