yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,910 Commits 129 Branches 498 Tags
Commit Graph

2775 Commits

Author SHA1 Message Date
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
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
mfrachet
84ec6945bc adding tests for selectors 2021-03-15 09:23:13 +01:00
mfrachet
7077995bd8 Testing getInitialLocale 2021-03-15 09:13:44 +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
soupette
fd3dda166f Add translation to labelIcon 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 17:02:33 +01:00
soupette
ebff06938d Created middleware to enhance the edit view layout 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 15:48:35 +01:00
soupette
55873fdd5a Move layout to redux store 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 15:06:58 +01:00
soupette
55f3ff08f5 Update layout to have the targetModel pluginOptions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-11 14:44:02 +01:00
Alexandre Bodin
33552e43b8 v3.5.3 2021-03-11 14:25:37 +01:00
HichamELBSI
17c29747b4 Fix WYSIWYG state 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-03-11 11:20:41 +01:00
mfrachet
63f2441627 revert logs 2021-03-10 10:09:54 +01:00
mfrachet
e34ad1a64b remove console 2021-03-10 09:30:50 +01:00
mfrachet
e86cb0ce1d wip 2021-03-10 09:28:45 +01:00
mfrachet
a04322d585 wip 2021-03-10 09:15:24 +01:00
soupette
cdcac62ee2 Init RBAC Manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-09 15:54:00 +01:00
soupette
36b537eade Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-09 14:14:14 +01:00
dependabot[bot]
9e22c280de
Bump sanitize-html from 2.1.1 to 2.3.2 (#9488) 
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.1.1 to 2.3.2.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.1.1...2.3.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-09 14:10:41 +01:00
Brett Willis
a799872a86
Fix display of falsey values in component banner (#9605) 2021-03-09 14:09:42 +01:00
soupette
e0d39ae390 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-permissions-manager 2021-03-09 12:22:17 +01:00
mfrachet
f0c310ca18 refacto 2021-03-09 10:25:08 +01:00
soupette
34ebe0ca4b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 15:10:49 +01:00
Marvin Frachet
32a5e2becf
Features/i18n locale in filters (#9611) 2021-03-08 11:02:01 +01:00
cyril lopez
068a31c3e5
Merge pull request #9597 from strapi/i18n/cm-layout-enhancement 
[I18n] CM add icons indicator
 2021-03-08 10:58:15 +01:00
soupette
6aad832464 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 09:43:50 +01:00
Alexandre Bodin
e9b4bf5616 Merge branch 'master' into features/i18n 2021-03-05 12:22:18 +01:00
soupette
dfb40c08b6 Created PermissionsManager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-05 10:50:27 +01:00
Pierre Noël
b2de6bb8ea
add pluginOptions in model of CM GET /content-types (#9599) 2021-03-04 17:13:08 +01:00
soupette
14b28253d6 Add icon to selects 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 12:10:02 +01:00
soupette
fb4862ae59 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/cm-layout-enhancement 2021-03-04 12:03:44 +01:00
soupette
cf2bd304cf Upgrade buffet.js. Add icon to inputs label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 11:59:26 +01:00
mfrachet
d55c647150 [i18n] add dropdown locale in listview filters 2021-03-04 10:26:00 +01:00
dependabot[bot]
bda0c89aaa
Bump react-router from 5.1.2 to 5.2.0 
Bumps [react-router](https://github.com/ReactTraining/react-router) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/ReactTraining/react-router/releases)
- [Changelog](https://github.com/ReactTraining/react-router/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ReactTraining/react-router/compare/v5.1.2...v5.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-04 08:11:47 +00:00
soupette
14d967f5bc Update CM to support new permissions format 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 09:48:59 +01:00
dependabot[bot]
9ad86867fb
Bump codemirror from 5.59.0 to 5.59.4 (#9564) 
Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.59.0 to 5.59.4.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.59.0...5.59.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-02 09:00:11 +01:00
ELABBASSI Hicham
0af8277f0b
Fix the front linter (#9560) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-03-01 19:11:46 +01:00
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
maggie0002
81c4c6d399
Add RTL support to WysiwygEditor (#9498) 
When adding Arabic into the RichText fields of Strapi, the text will automatically be aligned to the right after this change.

Resolves: https://github.com/strapi/strapi/issues/9412
 2021-03-01 10:54:15 +01:00
David Volquartz Lebech
de1575383c
Fix TypeError: action.value[0] is undefined (#9501) 
This commit fixes an error that occurs when an ADD_RELATION action is
called with an empty value from a relationship field.

To be extra safe, the fix is applied both in the component and the
reducer.

- Add isEmpty check in SelectWrapper component when adding relations.
- Add array check in reducer function for ADD_RELATION.
 2021-03-01 10:46:23 +01:00
dependabot[bot]
0903d5b04d
Bump react-redux from 7.2.0 to 7.2.2 (#9528) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.0 to 7.2.2.
- [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.0...v7.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-26 09:28:10 +01:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
cyril lopez
e21f06d4b6
Merge branch 'master' into issues-8914-allow-multiple-image-insertion-wysiwyg 2021-02-18 07:54:34 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00