yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,014 Commits 115 Branches 488 Tags
Commit Graph

1608 Commits

Author SHA1 Message Date
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
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
Alexandre Bodin
388075d4ed Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n 2021-03-05 12:22:32 +01:00
Alexandre Bodin
e9b4bf5616 Merge branch 'master' into features/i18n 2021-03-05 12:22:18 +01:00
Marvin Frachet
0ff73c6216
Fix carret for modal edit/create locale dropdown (#9617) 2021-03-05 11:40:58 +01:00
soupette
dfb40c08b6 Created PermissionsManager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-05 10:50:27 +01:00
dependabot[bot]
cd8d2741d2
Bump whatwg-fetch from 3.5.0 to 3.6.2 (#9608) 
Bumps [whatwg-fetch](https://github.com/github/fetch) from 3.5.0 to 3.6.2.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](https://github.com/github/fetch/compare/v3.5.0...v3.6.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-05 10:03:37 +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
f9413138d8 fix review 2021-03-04 11:35:06 +01:00
mfrachet
d78ca8e74c fix review 2021-03-04 11:27:13 +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
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
dependabot[bot]
22cf78e16c
Bump @babel/preset-env from 7.11.5 to 7.13.8 (#9551) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.11.5 to 7.13.8.
- [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.8/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-01 10:40:55 +01:00
dependabot[bot]
583c99fb42
Bump styled-components from 5.2.0 to 5.2.1 (#9548) 
Bumps [styled-components](https://github.com/styled-components/styled-components) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/styled-components/styled-components/releases)
- [Changelog](https://github.com/styled-components/styled-components/blob/v5.2.1/CHANGELOG.md)
- [Commits](https://github.com/styled-components/styled-components/compare/v5.2.0...v5.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-01 10:37:43 +01:00
mfrachet
ddc5b92cd2 Fixing baseline and styles 2021-02-25 15:48:46 +01:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
Marvin Frachet
5ac0701e66
Changing locale is now stored in db (#9479) 2021-02-23 11:07:20 +01:00
Marvin Frachet
28f8182bdf
Splitting the profile page and adding the language toggle (#9421) 2021-02-19 09:30:13 +01:00
soupette
706baae9ec Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:58:33 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
Marvin Frachet
6c23b08920
[I18N] add tabs for navigating between forms (#9364) 2021-02-11 10:35:22 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Marvin Frachet
08b975c373
[I18N] Add permissions (#9331) 2021-02-08 13:47:43 +01:00
mfrachet
c26f8b5a90 [I18N] connecting backend / frontend for retrieving locales in settings 2021-02-05 10:49:24 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
mfrachet
1f2f4c2986 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-02 13:38:48 +01:00