yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 02:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,453 Commits 121 Branches 507 Tags
Commit Graph

16453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
16fad363af Ensure unique fields are localized 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-06 11:19:39 +02:00
soupette
1a510ae790 Upgrade react-redux 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-06 10:10:08 +02:00
cyril lopez
54b51d9d51
Merge pull request #9942 from strapi/chore/fix-error-plugins 
Improve CM error management
 2021-04-06 09:50:30 +02:00
soupette
e45ac1e396 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-06 09:50:05 +02:00
jonmol
3b728c295b
Remove some of the unnecessary distinct (#9538) 
* Only add distinct if it's a join

* made both if the same

* moved repeated if to variable

* forgot an import

* too quick doing this between meetings...

* Renamed boolean constants and changed the the distinct logic, instead of being twice it's only needed to have once

* fixed if
 2021-04-06 09:34:30 +02:00
dependabot[bot]
8858b0e6cb
Bump aws-sdk from 2.878.0 to 2.879.0 (#9953) 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.878.0 to 2.879.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.878.0...v2.879.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-06 09:08:58 +02:00
dependabot[bot]
792cfcef8e
Bump snyk from 1.506.0 to 1.522.0 (#9955) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.506.0 to 1.522.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/compare/v1.506.0...v1.522.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-06 09:08:45 +02:00
dependabot[bot]
beff6ac112
Bump swagger-ui-dist from 3.45.1 to 3.46.0 (#9956) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.45.1 to 3.46.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.45.1...v3.46.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-06 09:08:35 +02:00
dependabot[bot]
5bd2b89b4c
Bump @babel/preset-react from 7.12.13 to 7.13.13 (#9954) 
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.12.13 to 7.13.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.13/packages/babel-preset-react)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-06 09:01:03 +02:00
Alexandre Bodin
fd18d2a67a Merge branch 'master' into features/i18n 2021-04-02 17:33:24 +02:00
Alexandre BODIN
a5bea362d0
Merge pull request #9939 from strapi/i18n/better-handle-media-attr 
Handle localized media attr in CM et CTB
 2021-04-02 17:22:40 +02:00
Pierre Noël
53e1966173 fix unit test 2021-04-02 16:51:02 +02:00
Alexandre BODIN
62b0f8470c
Update content-types.js 2021-04-02 16:36:33 +02:00
Pierre Noël
9cd6e158ff refacto 2021-04-02 16:33:48 +02:00
soupette
119fdd946d Ensure the LV always does not have an empty query 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-02 16:06:55 +02:00
soupette
3b3637e584 Improve CM error management 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-02 15:47:53 +02:00
Pierre Noël
e7449527db fix field migration not supposed to run 2021-04-02 15:39:46 +02:00
dependabot[bot]
912cf44c4c
Bump mini-css-extract-plugin from 0.6.0 to 1.4.0 (#9924) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.6.0 to 1.4.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.6.0...v1.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-02 15:02:33 +02:00
cyril lopez
345eef3ca4
Merge pull request #9940 from strapi/i18n/fix-settings 
Remove create permissions for i18n settings
 2021-04-02 14:26:33 +02:00
soupette
2e3309c4bd Remove create permissions for i18n settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-02 14:12:39 +02:00
Alexandre BODIN
b373595f41
Merge pull request #9932 from strapi/i18n/migration-delete-locale 
Delete all entries in a locale when locale is deleted
 2021-04-02 13:50:36 +02:00
Pierre Noël
39802e5704 fix test 2021-04-02 12:16:07 +02:00
Pierre Noël
30f45b9b40 refacto 2021-04-02 10:45:44 +02:00
Pierre Noël
92a9ecb38d handle localized media attr in CM et CTB 2021-04-02 10:24:44 +02:00
DMehaffy
9d76b4ef11
Update bug report template with LTS version information (#9935) 2021-04-02 09:12:57 +02:00
dependabot[bot]
4f39f32406
Bump koa-session from 6.1.0 to 6.2.0 (#9936) 
Bumps [koa-session](https://github.com/koajs/session) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/koajs/session/releases)
- [Changelog](https://github.com/koajs/session/blob/master/History.md)
- [Commits](https://github.com/koajs/session/compare/6.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-02 09:11:24 +02:00
dependabot[bot]
35afe0048b
Bump webpack from 4.44.2 to 4.46.0 (#9925) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.44.2 to 4.46.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.44.2...v4.46.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2021-04-02 09:10:52 +02:00
dependabot[bot]
c29724b6df
Bump aws-sdk from 2.875.0 to 2.878.0 (#9938) 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.875.0 to 2.878.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.875.0...v2.878.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-02 09:09:56 +02:00
soupette
ba82d72117 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n 2021-04-01 16:18:46 +02:00
soupette
dbd93a9729 Fix locale picker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-01 16:18:36 +02:00
Pierre Noël
3c85f38fb4 Delete all entries in a locale when locale is deleted 2021-04-01 15:40:51 +02:00
cyril lopez
6b6e3eba55
Merge pull request #9933 from strapi/fix-tests-locale-cells 
Fix locale cells tests
 2021-04-01 15:39:49 +02:00
mfrachet
521ee1a136 Mock buffet core 2021-04-01 15:02:02 +02:00
Marvin Frachet
a25edc7f91
Fix dropdown size for the user (#9931) 2021-04-01 12:02:30 +02:00
dependabot[bot]
d60a6a6522
Bump sharp from 0.27.2 to 0.28.0 (#9927) 
Bumps [sharp](https://github.com/lovell/sharp) from 0.27.2 to 0.28.0.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.27.2...v0.28.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-01 09:53:51 +02:00
cyril lopez
1db87e19ad
Revert react-redux upgrade (#9930) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-01 09:53:16 +02:00
cyril lopez
0089c223e0
Merge pull request #9916 from strapi/fix/9897 
Fix object wrong mutation in the CM
 2021-04-01 09:16:08 +02:00
cyril lopez
0c629ded1d
Merge pull request #9921 from strapi/cm/fix-lv-redirections 
Fixes
 2021-03-31 18:12:21 +02:00
cyril lopez
00e138ebd3
Merge pull request #9922 from strapi/cm/lv-fixtooltip 
Fix tooltip i18n
 2021-03-31 18:02:32 +02:00
soupette
f79778aad8 Fix tooltip i18n 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 18:01:14 +02:00
soupette
7ddf66d36c Fix role update when no conditions and redirect the user to hp in listview when response is 403 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 17:47:10 +02:00
cyril lopez
f3b58514e1
Merge pull request #9918 from strapi/fix/menu-links 
i18n small fixes
 2021-03-31 16:45:39 +02:00
soupette
69112eb831 Fix css 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 16:35:56 +02:00
soupette
800454ba14 Fixes #9897 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 15:57:01 +02:00
soupette
442e92a775 Fix ctb menu upate 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 15:50:29 +02:00
dependabot[bot]
ec83ed282c
Bump react-tooltip from 4.2.15 to 4.2.17 (#9899) 
Bumps [react-tooltip](https://github.com/wwayne/react-tooltip) from 4.2.15 to 4.2.17.
- [Release notes](https://github.com/wwayne/react-tooltip/releases)
- [Changelog](https://github.com/wwayne/react-tooltip/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wwayne/react-tooltip/compare/v4.2.15...v4.2.17)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-31 14:37:27 +02:00
dependabot[bot]
1ede5a9feb
Bump @testing-library/jest-dom from 5.11.9 to 5.11.10 (#9901) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.9 to 5.11.10.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.9...v5.11.10)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-31 14:37:06 +02:00
dependabot[bot]
b0c932cb87
Bump react-redux from 7.2.2 to 7.2.3 (#9902) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.2 to 7.2.3.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.2...v7.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-31 14:36:58 +02:00
dependabot[bot]
5e6e916334
Bump @babel/preset-env from 7.13.8 to 7.13.12 (#9903) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.13.8 to 7.13.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.12/packages/babel-preset-env)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-31 14:36:49 +02:00
cyril lopez
4d88ff27f3
Merge pull request #9912 from strapi/i18n/display-locale-rbac 
Only display allowed locales with rbac
 2021-03-31 14:35:24 +02:00