yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,244 Commits 123 Branches 496 Tags
Commit Graph

17244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
2c3bf778a3
Merge pull request #9725 from strapi/i18n/core-api 
I18n/core api
 2021-03-16 18:19:37 +01:00
soupette
3f8de854fa Post locale 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 17:38:32 +01:00
Alexandre Bodin
3b71746fa6 Fix test 2021-03-16 17:37:09 +01:00
Alexandre Bodin
271fb2c99a Apply feedbacks 2021-03-16 17:33:10 +01:00
Marvin Frachet
5ccaf64bd1
[i18n/rbac]: left menu now deals with redux (#9735) 2021-03-16 17:12:35 +01:00
soupette
e83f379b49 Fix ctb mutate when not needed 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 16:16:03 +01:00
cyril lopez
80ce19a7e5
Merge pull request #9739 from strapi/i18n/update-params 
[I18n] Change plugins filter in CM
 2021-03-16 16:15:11 +01:00
soupette
d435ecb228 Connect LV to locale api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 15:58:50 +01:00
soupette
a4fa69dce5 Update plugins search in Editview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 15:58:49 +01:00
soupette
1c83202257 Update plugins search params in LV 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 15:58:48 +01:00
cyril lopez
8808b29f86
Merge pull request #9724 from strapi/i18n/edit-view-redux 
[i18n] Migrate CollectionTypeFormWrapper and SingleTypeFormWrapper to redux
 2021-03-16 15:57:11 +01:00
Alexandre Bodin
221c3d40e4 Set global strapi in tests 2021-03-16 15:51:00 +01:00
Alexandre Bodin
228899a9b3 Implement core api code for localizations 2021-03-16 15:35:31 +01:00
Alexandre Bodin
17b2296d11 Init core api extension for i18n 2021-03-16 15:35:30 +01:00
Alexandre Bodin
09990678ad Init routes & controller actions for i18N 2021-03-16 15:35:30 +01:00
Alexandre BODIN
f549017ec3
Add GET content-types-settings spec (#9734) 2021-03-16 10:40:49 +01:00
dependabot[bot]
9450c3d272
Bump @fortawesome/fontawesome-free from 5.14.0 to 5.15.2 (#9731) 
Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.14.0 to 5.15.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.14.0...5.15.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-16 10:05:57 +01:00
dependabot[bot]
e7d905703a
Bump @fortawesome/react-fontawesome from 0.1.12 to 0.1.14 (#9730) 
Bumps [@fortawesome/react-fontawesome](https://github.com/FortAwesome/react-fontawesome) from 0.1.12 to 0.1.14.
- [Release notes](https://github.com/FortAwesome/react-fontawesome/releases)
- [Changelog](https://github.com/FortAwesome/react-fontawesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/react-fontawesome/commits/0.1.14)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-16 10:03:47 +01:00
dependabot[bot]
445145150a
Bump @testing-library/jest-dom from 5.11.6 to 5.11.9 (#9729) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.6 to 5.11.9.
- [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.6...v5.11.9)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-16 10:03:32 +01:00
Alexandre Bodin
2467cad937 Merge branch 'i18n/localizations-sync' into features/i18n 2021-03-16 10:01:25 +01:00
Alexandre BODIN
5dd5dd4707
Merge pull request #9726 from strapi/content-manager/content-types-settings 
Content manager content types settings
 2021-03-16 09:56:20 +01:00
soupette
a961f17d2f Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 09:52:07 +01:00
cyril lopez
d5d6e44fce
Merge pull request #9733 from strapi/fix/users-permissions-hook 
Fix/users permissions hook
 2021-03-16 09:40:53 +01:00
soupette
f70b783c5b Fix double requests being fired when changing locale 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 09:40:15 +01:00
soupette
3910cc920c Split LV et fix hook users permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-16 08:52:54 +01:00
Alexandre Bodin
69e10731a0 Add find content types settings routes 2021-03-15 20:44:06 +01:00
soupette
6e80ba896c Fix effect 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 18:19:56 +01:00
soupette
862bec92b4 Update tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 16:06:38 +01:00
Alexandre BODIN
4e5daff7f6
Merge pull request #9720 from strapi/i18n/handle-locale-query-param 
Handle more usecase for the _locale query param
 2021-03-15 15:53:48 +01:00
Alexandre Bodin
108409941b check both action & params.id 2021-03-15 15:47:42 +01:00
Alexandre Bodin
883c2a4955 Handle more usecase for the _locale query param 2021-03-15 15:39:08 +01:00
soupette
48da7db14e Migrate CollectionTypeFormWrapper and SingleTypeFormWrapper to redux 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 15:37:14 +01:00
Alexandre BODIN
e0eaf87d6b
Merge pull request #9653 from strapi/i18n/validationPolicy 
add policy when creating a localized entry
 2021-03-15 15:29:26 +01:00
Pierre Noël
a7eb34e967 refacto 2021-03-15 15:09:12 +01:00
cyril lopez
6f29989e3b
Merge pull request #9710 from strapi/i18n/editview-rbac-manager 
[i18n] Edit view RBAC management
 2021-03-15 11:45:41 +01:00
soupette
831cb274cf Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 11:36:56 +01:00
cyril lopez
c52ed91791
Merge pull request #9697 from strapi/i18n/edit-view-switch-locale 
[i18n] CM - Edit view switch locale
 2021-03-15 11:16:44 +01:00
soupette
859187887f Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/edit-view-switch-locale 2021-03-15 10:56:45 +01:00
cyril lopez
3e923a7b4a
Merge pull request #9696 from strapi/i18n/add-filters-to-relations 
[I18n] CM Add filters to relations
 2021-03-15 10:55:47 +01:00
soupette
0cac2a06bc Merge branch 'i18n/add-filters-to-relations' of github.com:strapi/strapi into i18n/edit-view-switch-locale 2021-03-15 10:53:24 +01:00
soupette
fe7dc29678 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 10:50:41 +01:00
soupette
534dba09ad Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/add-filters-to-relations 2021-03-15 10:46:35 +01:00
cyril lopez
d6bfec32cd
Merge pull request #9688 from strapi/i18n/cm-edit-layout 
I18n/cm edit layout
 2021-03-15 10:45:34 +01:00
soupette
b17bdbc9a7 Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/cm-edit-layout 2021-03-15 10:17:14 +01:00
cyril lopez
2a8944042c
Merge pull request #9670 from strapi/i18n/rbac-cm-manager-attempt-fix 
I18n/rbac cm manager attempt fix
 2021-03-15 10:16:30 +01:00
mfrachet
6e733b7532 adding testrs for locale 2021-03-15 09:48:58 +01:00
mfrachet
952927c91e partial tests 2021-03-15 09:34:31 +01:00
mfrachet
84ec6945bc adding tests for selectors 2021-03-15 09:23:13 +01:00
mfrachet
285db5d3e8 fixing tests 2021-03-15 09:14:52 +01:00
mfrachet
7077995bd8 Testing getInitialLocale 2021-03-15 09:13:44 +01:00