yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-24 07:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,673 Commits 126 Branches 496 Tags
Commit Graph

15673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
67fa9c93c7
Fixes #9524 (#9587) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-03 16:32:59 +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
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
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
Scott Agirs
5311ca776e
feat(new notification): SA/add "target" prop to link {} (#9472) 
* feat(NewNotification): Add "target" prop to link {}

Signed-off-by: ScottAgirs <scott@ijs.to>

* chore: Minor typo fix occured > occur(R)ed

Signed-off-by: ScottAgirs <scott@ijs.to>

* fix: Add missing target check

Signed-off-by: ScottAgirs <scott@ijs.to>

* chore: Remove external window arrow if !"_blank"

Signed-off-by: ScottAgirs <scott@ijs.to>

* chore: replace redundant fragment w Padded />

Signed-off-by: ScottAgirs <scott@ijs.to>

* fix: Indentation

Signed-off-by: ScottAgirs <scott@ijs.to>
 2021-03-01 10:47:42 +01:00
David Volquartz Lebech
de1575383c
Fix TypeError: action.value[0] is undefined (#9501) 
This commit fixes an error that occurs when an ADD_RELATION action is
called with an empty value from a relationship field.

To be extra safe, the fix is applied both in the component and the
reducer.

- Add isEmpty check in SelectWrapper component when adding relations.
- Add array check in reducer function for ADD_RELATION.
 2021-03-01 10:46:23 +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
Alexandre Bodin
5f4109efc9 Merge branch 'master' of github.com:strapi/strapi 2021-03-01 10:38:27 +01:00
Alexandre Bodin
75cdd68891 Allowing expireAt str 2021-03-01 10:38:19 +01:00
dependabot[bot]
7e45cd440d
Bump stylelint from 10.1.0 to 13.11.0 (#9550) 
Bumps [stylelint](https://github.com/stylelint/stylelint) from 10.1.0 to 13.11.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/10.1.0...13.11.0)

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:58 +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
dependabot[bot]
0903d5b04d
Bump react-redux from 7.2.0 to 7.2.2 (#9528) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.0 to 7.2.2.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.0...v7.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-26 09:28:10 +01:00
dependabot[bot]
4f7c224167
Bump eslint-plugin-import from 2.22.0 to 2.22.1 (#9526) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.22.0...v2.22.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-26 09:27:02 +01:00