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

17244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre BODIN
354aa1d8d2
Merge pull request #9658 from strapi/i18n/cm-fields 
Use non writables instead of static creator fields in fields logic
 2021-03-10 17:09:43 +01:00
dependabot[bot]
fcc409de7c
Bump date-fns from 2.16.1 to 2.19.0 (#9666) 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.16.1 to 2.19.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.16.1...v2.19.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 12:01:06 +01:00
Alexandre Bodin
4d51c2b2f2 Merge branch 'master' of github.com:strapi/strapi 2021-03-10 10:49:56 +01:00
Alexandre Bodin
7ebc29d85b Add workflow run on push to master 2021-03-10 10:49:44 +01:00
Alexandre BODIN
b3635962a3
Fix component assoc resolvers in graphql (#9660) 2021-03-10 10:46:46 +01:00
Alexandre Bodin
48c3817541 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n 2021-03-10 10:15:13 +01:00
Alexandre Bodin
ce6054f10c Allow listing locales in api 2021-03-10 10:15:01 +01:00
mfrachet
63f2441627 revert logs 2021-03-10 10:09:54 +01:00
mfrachet
09f6c1bf0f revert logs 2021-03-10 10:05:48 +01:00
mfrachet
651f598be8 fixing locale picker 2021-03-10 10:05:11 +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
Alexandre Bodin
298a954888 Use non writables instead of static creator fields in fields logic 2021-03-09 20:50:23 +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
henk23
8f8c25a1d3
Fix german translation (#9623) 2021-03-09 14:08:10 +01:00
cyril lopez
aea9758265
Merge pull request #9616 from strapi/i18n/rbac-permissions-manager 
[I18n] RBAC permissions manager
 2021-03-09 12:32:13 +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
Alexandre Bodin
85c8b4c739 Merge branch 'features/i18n' into i18n/localizations-sync 2021-03-09 11:48:03 +01:00
Alexandre BODIN
e82c7fb611
Merge pull request #9642 from strapi/i18n/default-params-locale 
I18n/default params locale
 2021-03-09 11:44:08 +01:00
Alexandre Bodin
745d543d57 Fix some typos 2021-03-09 11:43:12 +01:00
Alexandre Bodin
266e740c1c Auto add locale query param & add wrapOptions logic in entity service 2021-03-09 11:43:11 +01:00
Alexandre BODIN
3d625734e6
Merge pull request #9640 from strapi/i18n/lifecycles-entity-service 
Implement entity service decoration & move lifecycles to entity service
 2021-03-09 11:42:25 +01:00
Alexandre Bodin
8cd803eb94 Use ids instead of objects 2021-03-09 11:12:09 +01:00
Alexandre Bodin
9e547da9ff Implement entity service decorators & update lifecycles methods 2021-03-09 11:05:26 +01:00
Alexandre BODIN
6eca0ac1b7
Merge pull request #9621 from strapi/i18n/localizations-rel 
Move to many way & add populate option on assoc
 2021-03-09 11:03:49 +01:00
cyril lopez
6fdd53e80e
Merge pull request #9652 from strapi/features/i18n-change-url-based-on-locale 
[i18n] change locale query params based on locale picker
 2021-03-09 10:42:00 +01:00
mfrachet
76eab68839 revert api 2021-03-09 10:26:12 +01:00
mfrachet
f0c310ca18 refacto 2021-03-09 10:25:08 +01:00
mfrachet
a396b7ad41 [i18n] change locale query params based on locale picker 2021-03-09 09:30:59 +01:00
DMehaffy
ba0637e26b
Update all documentation links in the code-base and readmes (#9643) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-03-09 09:13:15 +01:00
dependabot[bot]
54b82b948e
Bump stylelint from 13.11.0 to 13.12.0 (#9648) 
Bumps [stylelint](https://github.com/stylelint/stylelint) from 13.11.0 to 13.12.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/13.11.0...13.12.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-09 09:09:34 +01:00
dependabot[bot]
c0794c013b
Bump nodemailer from 6.4.18 to 6.5.0 (#9651) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.18 to 6.5.0.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.18...v6.5.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-09 09:08:22 +01:00
soupette
34ebe0ca4b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 15:10:49 +01:00
soupette
e91ba99554 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 15:05:52 +01:00
dependabot[bot]
8661d31ba0
Bump lint-staged from 10.5.3 to 10.5.4 (#9632) 
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.5.3 to 10.5.4.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.5.3...v10.5.4)

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-08 14:09:24 +01:00
dependabot[bot]
efe6007487
Bump swagger-ui-dist from 3.43.0 to 3.44.1 (#9633) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.43.0 to 3.44.1.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.43.0...v3.44.1)

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-08 14:09:12 +01:00
dependabot[bot]
045a65d885
Bump koa-session from 6.0.0 to 6.1.0 (#9634) 
Bumps [koa-session](https://github.com/koajs/session) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/koajs/session/releases)
- [Changelog](https://github.com/koajs/session/blob/master/History.md)
- [Commits](https://github.com/koajs/session/compare/6.0.0...6.1.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-08 14:08:46 +01:00
Pierre Noël
44e4cb2c37
fix test (#9637) 2021-03-08 11:03:31 +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
cyril lopez
815e92d441
Merge pull request #9619 from strapi/features/i18n-fix-icon-alignment 
Fix icon alignment in i18n settings
 2021-03-08 10:27:40 +01:00
soupette
3fd0091c85 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 10:04:51 +01:00
mfrachet
1a003e5c34 fixing review from Hicham 2021-03-08 09:49:36 +01:00
soupette
6aad832464 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-08 09:43:50 +01:00
Alexandre Bodin
996341f5d5 Move to many way & add populate option on assoc 2021-03-05 15:44:23 +01:00