yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-06 07:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,246 Commits 112 Branches 487 Tags
Commit Graph

1635 Commits

Author SHA1 Message Date
cyril lopez
54b51d9d51
Merge pull request #9942 from strapi/chore/fix-error-plugins 
Improve CM error management
 2021-04-06 09:50:30 +02:00
soupette
e45ac1e396 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-06 09:50:05 +02:00
Alexandre Bodin
fd18d2a67a Merge branch 'master' into features/i18n 2021-04-02 17:33:24 +02:00
soupette
3b3637e584 Improve CM error management 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-04-02 15:47:53 +02:00
dependabot[bot]
5e6e916334
Bump @babel/preset-env from 7.13.8 to 7.13.12 (#9903) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.13.8 to 7.13.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.13.12/packages/babel-preset-env)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-31 14:36:49 +02:00
cyril lopez
4d88ff27f3
Merge pull request #9912 from strapi/i18n/display-locale-rbac 
Only display allowed locales with rbac
 2021-03-31 14:35:24 +02:00
soupette
5ce16e280d Fix Pr feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 12:53:34 +02:00
Marvin Frachet
a7f4bcbcfe
Bumping buffet and fixing list radius (#9911) 2021-03-31 12:25:47 +02:00
cyril lopez
c3fd7496b3
Merge pull request #9908 from strapi/i18n/fix-profile-page 
Change Profile page dom
 2021-03-31 10:27:58 +02:00
soupette
6394d33a6d Change Profile page dom 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-31 09:47:32 +02:00
Marvin Frachet
4a020c79ac
Fix centering issue on delete locale modale (#9904) 2021-03-31 09:40:02 +02:00
Marvin Frachet
c86ebd7b14
Fix bullet position in delete content for a locale modal (#9889) 2021-03-30 16:59:37 +02:00
Marvin Frachet
a552ee367e
[I18N] fix padding in locale dropdown (#9884) 2021-03-30 16:57:51 +02:00
soupette
9c8bd81dfc Upgrade Buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:24:17 +02:00
soupette
cd7eca2894 Change tooltip in helper component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:23:29 +02:00
soupette
176e589db4 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:16:45 +02:00
soupette
48ab9bff46 Fix dropdown indicator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-30 10:05:59 +02:00
dependabot[bot]
4030106720
Bump react from 16.13.1 to 16.14.0 (#9853) 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.1 to 16.14.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.14.0/packages/react)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-29 14:07:37 +02:00
Alexandre Bodin
a66e0269da Merge branch 'master' into features/i18n 2021-03-25 15:07:41 +01:00
Alexandre Bodin
3065d72a4b v3.5.4 2021-03-25 14:34:45 +01:00
soupette
0d897d31be Fix common fields 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-25 14:11:23 +01:00
soupette
9e4fcd9de6 Fix react select option style 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-24 16:04:00 +01:00
soupette
cdf8850c96 Merge branch 'features/i18n' of github.com:strapi/strapi into i18n/rbac-rework-front 2021-03-23 10:17:50 +01:00
Alexandre Bodin
54c3cfde80 Merge branch 'master' into features/i18n 2021-03-22 16:30:14 +01:00
mfrachet
7dfcf52e08 Add utils to CM folder in helper plugin 2021-03-22 15:14:49 +01:00
Marvin Frachet
932da387be
[I18n/rbac] add additional infos in delete modal (#9795) 2021-03-22 10:27:48 +01:00
soupette
41745b1b24 Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-17 17:01:45 +01:00
soupette
0291649c1f Init copy locale logic and move utils from CM to the helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-17 11:54:59 +01:00
dependabot[bot]
ac4bd0bac6
Bump @babel/preset-react from 7.10.4 to 7.12.13 (#9745) 
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.10.4 to 7.12.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.13/packages/babel-preset-react)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-17 08:58:02 +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
soupette
6e80ba896c Fix effect 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-15 18:19:56 +01:00
soupette
84aee64977 Fix permissions sync 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-13 16:16:57 +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
667423ac6b Fixes #9384 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-12 12:02:25 +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
Alexandre Bodin
33552e43b8 v3.5.3 2021-03-11 14:25:37 +01:00
dependabot[bot]
8167f90b56
Bump bootstrap from 4.5.3 to 4.6.0 (#9662) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.3 to 4.6.0.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.3...v4.6.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-10 19:15:56 +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
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
3fd0091c85 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 10:04:51 +01:00
soupette
6aad832464 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 09:43:50 +01:00