yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-07 23:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 120 Branches 493 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
13005e5e1b Fix typos 2021-03-19 14:30:55 +01:00
Pierre Noël
9d50d97706 refacto 2021-03-19 12:12:51 +01:00
Pierre Noël
113f2b093b add comment 2021-03-19 10:21:56 +01:00
Alexandre Bodin
6679c22bdc Update ST localizations through core api update 2021-03-19 10:14:38 +01:00
Alexandre BODIN
9a49ab64f6
[i18n] Improve localization file sanitizer (#9766) 
* Improve file sanitizer in create localizations

* Fix typo
 2021-03-19 10:12:51 +01:00
dependabot[bot]
a458eb8eed
Bump highlight.js from 10.2.0 to 10.4.1 (#9779) 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.2.0 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.2.0...10.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 10:11:32 +01:00
Marvin Frachet
7d46206d9b
[i18n] don't add locale in settings when it already exists (#9776) 2021-03-19 09:46:03 +01:00
cyril lopez
9378dc5428
Merge pull request #9778 from strapi/i18n/rbac-i18n-show-dropdown-when-locale-is-not-authorized 
[i18n/rbac] show locale picker even when not authorized
 2021-03-19 09:39:34 +01:00
mfrachet
71399cf017 [i18n/rbac] show locale picker even when not authorized 2021-03-19 09:34:25 +01:00
soupette
5b5410adfd Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-19 09:30:20 +01:00
dependabot[bot]
4accb1b8b7
Bump snyk from 1.467.0 to 1.500.0 (#9773) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.467.0 to 1.500.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/commits/v1.500.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 09:16:25 +01:00
dependabot[bot]
b8cc7ab5ae
Bump @fingerprintjs/fingerprintjs from 3.0.5 to 3.0.6 (#9774) 
Bumps [@fingerprintjs/fingerprintjs](https://github.com/fingerprintjs/fingerprintjs) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/fingerprintjs/fingerprintjs/releases)
- [Commits](https://github.com/fingerprintjs/fingerprintjs/compare/v3.0.5...v3.0.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 09:16:14 +01:00
cyril lopez
92c98cdc2a
Merge pull request #9777 from strapi/features/i18n-fix-locale-padding 
[i18n] fix padding in locale picker list
 2021-03-19 09:05:57 +01:00
mfrachet
6b5ae4bdee [i18n] fix padding in locale picker list 2021-03-19 08:54:07 +01:00
Pierre Noël
bd823964aa fix rebase 2021-03-18 19:04:42 +01:00
Pierre Noël
f9c95eed25 refacto 2021-03-18 18:45:32 +01:00
Pierre Noël
ce84bd0325 refacto 2021-03-18 18:45:31 +01:00
Pierre Noël
b39aa3c8bd WIP 2021-03-18 18:45:30 +01:00
Pierre Noël
54512c6049 split code into files 2021-03-18 18:45:28 +01:00
Pierre Noël
a662db9691 refacto 2021-03-18 18:43:42 +01:00
Pierre Noël
13837d3004 refacto 2021-03-18 18:43:40 +01:00
Pierre Noël
21659075f0 refacto 2021-03-18 18:43:39 +01:00
Pierre Noël
0a08ea32ce add migration for mongo DB 2021-03-18 18:43:38 +01:00
Pierre Noël
ec0aca2de8 add migration for SQL DBs 2021-03-18 18:43:36 +01:00
Pierre Noël
9950bbe4c0 add previousDefinition in migration options 2021-03-18 18:28:19 +01:00
cyril lopez
0a6ec3a51e
Merge pull request #9765 from strapi/i18n/fix-single-types 
[I18n] Fix single types
 2021-03-18 15:21:42 +01:00
soupette
85eda7ab33 Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/fix-single-types 2021-03-18 15:20:10 +01:00
cyril lopez
197f2056f5
Merge pull request #9762 from strapi/i18n/cm-common-fields 
[I18n] Add middleware to get common fields
 2021-03-18 15:19:36 +01:00
soupette
a2e52b0599 Fix ST delete 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 15:04:38 +01:00
soupette
569459adae Fix single types 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 15:01:58 +01:00
soupette
80216968b5 Fix middleware 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 14:31:22 +01:00
cyril lopez
20d3c09187
Merge pull request #9763 from strapi/i18n/rbac-locale-in-array 
[i18n] add the locale column in the CM list view
 2021-03-18 14:07:33 +01:00
mfrachet
6f2514810d proptypes to bottom 2021-03-18 14:07:11 +01:00
soupette
cbcfc2a383 Remove fields from common fields 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 14:05:02 +01:00
mfrachet
907c7a630f test fixing 2021-03-18 13:41:26 +01:00
soupette
d1c0602458 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 13:10:32 +01:00
mfrachet
fd00987eff test fixing 2021-03-18 12:46:11 +01:00
Pierre Noël
ddd4b37fb2
don't copy published_at as a non-localized-field (#9761) 2021-03-18 12:38:36 +01:00
mfrachet
2884b3594b wip 2021-03-18 12:35:13 +01:00
soupette
7fac3b7dc7 fix request beign fired twice 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 12:26:15 +01:00
soupette
ff8b407a3a Init common fields 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 12:13:25 +01:00
mfrachet
13bf349d96 wip 2021-03-18 11:57:03 +01:00
soupette
523250fb3c Fix components settings view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 11:29:02 +01:00
soupette
5bc76e57b2 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-rework-front 2021-03-18 11:15:59 +01:00
mfrachet
bb30dc9d41 wip 2021-03-18 11:13:33 +01:00
cyril lopez
0e336b4e31
Merge pull request #9760 from strapi/i18n/cm-fix-relations 
[I18n] CM fix navigation between localised content types
 2021-03-18 11:13:17 +01:00
soupette
762384ec8d Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 11:05:40 +01:00
soupette
c5a6c22dbc Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/cm-fix-relations 2021-03-18 10:50:39 +01:00
cyril lopez
65aa4506fc
Merge pull request #9753 from strapi/i18n/menu-st-rbac-middleware 
[I18n] Add middleware to override menu links for single types
 2021-03-18 10:48:17 +01:00
soupette
b7053c5cf3 Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-18 10:47:39 +01:00