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

17157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
6b7951e1d8 Add status to Option component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 17:18:17 +01:00
soupette
c652aaf312 Move RelationDPStateComponent to helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 15:57:04 +01:00
soupette
a54ae6d74f Persist plugin option for an entry 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 15:38:19 +01:00
soupette
97d127f54e Created Locale picker for the edit view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 15:12:04 +01:00
Alexandre Bodin
4583e3d086 Split logic cleanly between visible & writable attributes 2021-03-12 14:34:04 +01:00
soupette
2edb711c64 Created injection zone in CM editview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 14:07:48 +01:00
soupette
667423ac6b Fixes #9384 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 12:02:25 +01:00
soupette
96968dd7e1 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 11:21:15 +01:00
soupette
362a0675f5 Add locale to queryInfos defaultParams 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 11:02:50 +01:00
soupette
659c85923a Persist pluginOptions search 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 10:17:00 +01:00
soupette
9a510f4e1f Merge branch 'i18n/rbac-cm-manager-attempt-fix' of github.com:strapi/strapi into i18n/cm-edit-layout 2021-03-12 10:06:19 +01:00
soupette
319d464e78 Merge branch 'i18n/rbac-rework-front' of github.com:strapi/strapi into i18n/rbac-cm-manager-attempt-fix 2021-03-12 10:04:20 +01:00
soupette
5f755b4d8f Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-rework-front 2021-03-12 10:02:48 +01:00
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
cyril lopez
2b29398c82
Merge pull request #9690 from velopert/fix/ko-many-to-one 
Fix Korean translations for relation.manyToOne
 2021-03-12 09:08:52 +01:00
dependabot[bot]
6d4d74e8fd
Bump byte-size from 7.0.0 to 7.0.1 
Bumps [byte-size](https://github.com/75lb/byte-size) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/75lb/byte-size/releases)
- [Commits](https://github.com/75lb/byte-size/compare/v7.0.0...v7.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-12 05:50:14 +00:00
dependabot[bot]
dac6abfcf6
Bump fs-extra from 9.0.1 to 9.1.0 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.1...9.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-12 05:43:19 +00:00
Minjun Kim
581f640b86
Fix Korean translations for relation.manyToOne 
Previously shown as `Article N : 1 Comments` while it should show `Article 1 : N Comments`
Since en.json uses `has many` for this description, do the same for Korean translation
 2021-03-12 08:27:50 +09:00
soupette
d294e22674 Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 17:36:34 +01:00
soupette
fd3dda166f Add translation to labelIcon 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 17:02:33 +01:00