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,860 Commits 129 Branches 498 Tags
Commit Graph

2754 Commits

Author SHA1 Message Date
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
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
acalvino4
7c765e5167 issues-8914 allow multiple images to be selected and inserted from wysiwyg 2021-02-16 11:13:31 -07:00
dependabot[bot]
3bccd24bc4
Bump markdown-it-ins from 3.0.0 to 3.0.1 (#9414) 
Bumps [markdown-it-ins](https://github.com/markdown-it/markdown-it-mark) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/markdown-it/markdown-it-mark/releases)
- [Changelog](https://github.com/markdown-it/markdown-it-mark/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it-mark/compare/3.0.0...3.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-16 09:43:39 +01:00
Pierre Noël
b3a9b5ad76 add pluginOptions 2021-02-10 14:29:54 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
cyril lopez
788a81db95
Fixes #9294 (#9306) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-03 14:35:55 +01:00
Alexandre Bodin
8287e2ea21 Merge branch 'master' into features/sso 2021-02-03 12:11:03 +01:00
Pierre Noël
24e1d979a7 update tests 2021-02-02 11:30:24 +01:00
Alexandre Bodin
4c3bd90ec0 Merge branch 'develop' into features/sso 2021-02-02 10:51:28 +01:00
soupette
88919eb84c Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-01 14:32:58 +01:00
cyril lopez
0a283dd7ce
Merge branch 'master' into master 2021-02-01 09:56:47 +01:00
soupette
e1b7c8b67c Fixes #9259 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-29 16:58:04 +01:00
mfrachet
326f6d8d51 Increasing padding bottom to prevent question button from overlapping 2021-01-29 15:24:57 +01:00
Pierre Noël
291aeb07bc add read/create/update route for locales 2021-01-29 10:12:34 +01:00
cyril lopez
0b55c84d9f
Merge branch 'master' into fix/9236 2021-01-29 09:05:17 +01:00
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
Convly
bd91f748d8 Merge master into features/sso 2021-01-27 16:34:43 +01:00
soupette
47edbcbfb0 Fixes #9236 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-27 15:42:18 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Virgil B
8eca3534c7
Merge branch 'master' into master 2021-01-26 13:45:19 +02:00
Virgil B
063c9b8ba5
Fixed syntax error 2021-01-26 13:43:53 +02:00