yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,838 Commits 121 Branches 507 Tags
Commit Graph

15838 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
Alexandre Bodin
996341f5d5 Move to many way & add populate option on assoc 2021-03-05 15:44:23 +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
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
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
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
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
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
e91572ce32 Fix test CTB 2021-03-04 10:53:02 +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
Aurélien GEORGET
f8a0f9f41d
Send unique identifier to detect activation (#9545) 2021-03-04 09:09:08 +01:00
dependabot[bot]
a2437c0b5d
Bump cropperjs from 1.5.9 to 1.5.11 (#9594) 
Bumps [cropperjs](https://github.com/fengyuanchen/cropperjs) from 1.5.9 to 1.5.11.
- [Release notes](https://github.com/fengyuanchen/cropperjs/releases)
- [Changelog](https://github.com/fengyuanchen/cropperjs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fengyuanchen/cropperjs/compare/v1.5.9...v1.5.11)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-04 08:44:21 +01:00
cvermand
d7caae52aa
Add delete function in store (#9532) 
* Add delete function in store

* Change function name to deleteFn

* Add tests on set and delete store functions

* Add space between variables

* Change test only to test

* Simplify delete function
 2021-03-04 08:40:34 +01:00
cyril lopez
242749f08a
Merge pull request #9508 from strapi/i18n/rbac-improve-doc 
I18n/rbac improve doc
 2021-03-03 17:04:36 +01:00
soupette
717edec5ed Improve doc to match styling guidelines 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 17:04:03 +01:00
cyril lopez
67fa9c93c7
Fixes #9524 (#9587) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 16:32:59 +01:00
soupette
4adb1fb194 Enable localization on media fields 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 15:31:23 +01:00
cyril lopez
31fff1e998
Revert "Issue: Domain name validation c Fixed. With Ref to Previous PR #9496" (#9588) 
* Revert "Issue: Domain name validation #6475 Fixed. With Ref to Previous PR #9496 (#9521)"

This reverts commit 3781ca2e2806eb59a421f00263ab538d4e9e6f33.

* Update yarn.lock

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 15:18:40 +01:00
Alexandre BODIN
628f128bc0
Merge pull request #9575 from strapi/i18n/defaultLocaleAndEmptyLocaleName 
create default locale and allow empty name for a locale
 2021-03-03 14:41:03 +01:00
Marvin Frachet
e3b3966896
[I18N]: moving locale fetching into redux flow (#9571) 2021-03-03 10:00:45 +01:00
dependabot[bot]
ebcfa07c33
Bump react-tooltip from 4.2.11 to 4.2.15 (#9581) 
Bumps [react-tooltip](https://github.com/wwayne/react-tooltip) from 4.2.11 to 4.2.15.
- [Release notes](https://github.com/wwayne/react-tooltip/releases)
- [Changelog](https://github.com/wwayne/react-tooltip/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wwayne/react-tooltip/compare/v4.2.11...v4.2.15)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-03 09:59:15 +01:00
Pierre Noël
a9941265f6 create default locale and allow empty name for a locale 2021-03-03 09:52:26 +01:00
dependabot[bot]
c46f5825be
Bump ci-info from 2.0.0 to 3.1.1 (#9580) 
Bumps [ci-info](https://github.com/watson/ci-info) from 2.0.0 to 3.1.1.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v2.0.0...v3.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-03 09:50:19 +01:00
dependabot[bot]
772a0a8b9e
Bump snyk from 1.448.0 to 1.467.0 (#9579) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.448.0 to 1.467.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-03 09:44:30 +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
DMehaffy
154e59c9c7
Use the MongoDB setting useUnifiedTopology when testing connection (#9561) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-03-02 08:56:41 +01:00
Alexandre BODIN
65bc2d04d3
Fix config renamed by error (#9559) 2021-03-01 19:12:54 +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 v3.5.2 2021-03-01 11:24:44 +01:00
Alexandre Bodin
df76149931 Fix test 2021-03-01 11:16:51 +01:00
Alexandre Bodin
5aa7019800 Update yarn lock 2021-03-01 10:57:30 +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
Prashant Gaikwad
3781ca2e28
Issue: Domain name validation #6475 Fixed. With Ref to Previous PR #9496 (#9521) 2021-03-01 10:53:12 +01:00
Sebastian Górski
6fb96362e4
Polish translation for Strapi Plugin Upload (#9495) 2021-03-01 10:48:35 +01:00
Brett Willis
c79334afc4
Media plugin: Fix parsing model timestamp config (#9474) 
* Fix parsing model timestamp config

* Update getFileModelTimestamps tests

* Update getFileModelTimestamps tests

* Fix test for error
 2021-03-01 10:48:20 +01:00