yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 12:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 120 Branches 494 Tags
Commit Graph

17520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marvin Frachet
500a7b00d9
Fixing locale picker padding / margin (#9613) 2021-03-05 14:01:23 +01:00
Marvin Frachet
02137456a8
Fix description size (#9618) 2021-03-05 14:01:02 +01:00
dependabot[bot]
f6285fff2f
Bump aws-sdk from 2.785.0 to 2.857.0 (#9609) 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.785.0 to 2.857.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.785.0...v2.857.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-05 12:23:15 +01:00
Alexandre Bodin
0ac4e8ed3c Merge branch 'master' into features/i18n 2021-03-05 12:22:52 +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
mfrachet
c56a00660d Fix icon alignment in i18n settings 2021-03-05 11:50:14 +01:00
Marvin Frachet
0ff73c6216
Fix carret for modal edit/create locale dropdown (#9617) 2021-03-05 11:40:58 +01:00
Marvin Frachet
46dad6827f
Fixing font-weight on i18n list (#9614) 2021-03-05 11:40:10 +01:00
soupette
f84a1dab0b Fix cetb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-05 11:19:32 +01:00
soupette
dfb40c08b6 Created PermissionsManager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-05 10:50:27 +01:00
Ognjen Jevremović
9fa64f3ee4
fix: 🐛 Strapi parser middleware, catch block error (logging) (#9612) 
Throwing error inside of a controller (using plain javascript) results
in a different error in parser middleware. Before calling methods on the
`message` pr operty on the error object a check should be performed to
see if the `message` property is defined on the error instance.

✅ Closes: #9356
 2021-03-05 10:50:17 +01:00
Mattias van den Belt
8aaf797a1c
Add email test in plugin settings (#8156) 
* Add email test route and controller

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add email settings page

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add email Settings Container

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Remove unused getProviderConfig email service

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add email (disabled) config fields

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings config form

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings container

Move Test button
Add testEmail input
Update config fields

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings form

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email plugin settings

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email plugin docs

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings page

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings permissions

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update settings container form

* Update mail text
* Fix alignment
* Add yup validation
* Update form submission

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Fix e2e test

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Fix e2e test

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Fix Baseline

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email plugin docs

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update (temp) BaselineAlignment component

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update text and button styles and placement

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email routes and permissions

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email controller and service

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email admin permissions

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update test permissions snapshot

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email admin permissions

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update all test snapshot

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update email settings permissions

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update test snapshots

* Fix text width

* Update styling, baseline, and docs link

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-05 10:37:33 +01:00
dependabot[bot]
8cbb8b9f9c
Bump cloudinary from 1.23.0 to 1.25.0 (#9607) 
Bumps [cloudinary](https://github.com/cloudinary/cloudinary_npm) from 1.23.0 to 1.25.0.
- [Release notes](https://github.com/cloudinary/cloudinary_npm/releases)
- [Changelog](https://github.com/cloudinary/cloudinary_npm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cloudinary/cloudinary_npm/compare/1.23.0...1.25.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-05 10:10:24 +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
dependabot[bot]
aa301ab897
Bump qs from 6.9.4 to 6.9.6 (#9610) 
Bumps [qs](https://github.com/ljharb/qs) from 6.9.4 to 6.9.6.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.4...v6.9.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-05 09:52:04 +01:00
soupette
948a964ab8 Fix global actions disabled state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 18:52:25 +01:00
soupette
9075f22e35 Connect to API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 18:17:25 +01:00
Pierre Noël
b2de6bb8ea
add pluginOptions in model of CM GET /content-types (#9599) 2021-03-04 17:13:08 +01:00
cyril lopez
3b2ccf1ead
Merge pull request #9593 from strapi/dependabot/npm_and_yarn/react-router-5.2.0 
Bump react-router from 5.1.2 to 5.2.0
 2021-03-04 12:16:34 +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
cyril lopez
5ce7dfa274
Merge pull request #9596 from strapi/features/listview-locale-dropdown 
[i18n] add locale dropdown in listview filters
 2021-03-04 12:03:24 +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