yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 04:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 122 Branches 494 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre BODIN
b4a1e6c116
Merge pull request #9691 from strapi/dependabot/npm_and_yarn/fs-extra-9.1.0 
Bump fs-extra from 9.0.1 to 9.1.0
 2021-03-15 08:18:32 +01:00
Alexandre BODIN
7743f0a0c2
Merge pull request #9694 from strapi/dependabot/npm_and_yarn/byte-size-7.0.1 
Bump byte-size from 7.0.0 to 7.0.1
 2021-03-15 08:15:41 +01:00
Alexandre BODIN
ee53e44d0d
Merge pull request #9719 from strapi/dependabot/npm_and_yarn/aws-sdk-2.863.0 
Bump aws-sdk from 2.857.0 to 2.863.0
 2021-03-15 08:13:39 +01:00
dependabot[bot]
15d5132aa3
Bump aws-sdk from 2.857.0 to 2.863.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.857.0 to 2.863.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.857.0...v2.863.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-15 06:05:48 +00:00
soupette
84aee64977 Fix permissions sync 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-13 16:16:57 +01:00
soupette
e0af83eb7a Add RBAC management to CM edit view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-13 15:26:04 +01:00
soupette
bd942ff852 Remove canCreate permission for the content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-13 14:53:56 +01:00
Pierre Noël
6e77a4a05b refacto 2021-03-12 19:56:42 +01:00
Alexandre BODIN
1777936d45
Merge branch 'master' into dependabot/npm_and_yarn/fs-extra-9.1.0 2021-03-12 19:51:57 +01:00
Alexandre BODIN
6c7c4560e1
Merge branch 'master' into dependabot/npm_and_yarn/byte-size-7.0.1 2021-03-12 19:51:48 +01:00
Alexandre BODIN
175fb05d83
Merge pull request #9684 from strapi/fix/dependabot-issue 
Fix dependabot not allowed to use secrets
 2021-03-12 19:50:26 +01:00
Alexandre BODIN
f8186505b1
Merge pull request #9705 from strapi/i18n/populate-custom-fields 
I18n/populate custom fields
 2021-03-12 19:13:17 +01:00
Pierre Noël
b014e8146a handle single types creation 2021-03-12 18:54:09 +01:00
Pierre Noël
3a45d5bdde add policy when creating a localized entry 2021-03-12 18:54:08 +01:00
Alexandre Bodin
c40c3ba8c3 pick assoc populate fields option 2021-03-12 17:56:38 +01:00
Alexandre BODIN
5c1450bdbf
Merge pull request #9700 from strapi/i18n/split-visible-writable-fields 
Split logic cleanly between visible & writable attributes
 2021-03-12 17:55:05 +01:00
Alexandre Bodin
90deea4d67 Change field name 2021-03-12 17:52:28 +01:00