yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,411 Commits 138 Branches 514 Tags
Commit Graph

15411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
788a81db95
Fixes #9294 (#9306) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-03 14:35:55 +01:00
cyril lopez
a68e7a160d
Merge pull request #9223 from virgilbugnariu/master 
Fix WYSIWYG Reverse text
 2021-02-03 11:52:23 +01:00
cyril lopez
afaf111b83
Merge branch 'master' into master 2021-02-03 11:42:10 +01:00
Florian Markusse
199d8e5c05
Update target.js (#8477) 
Signed-off-by: Florian Markusse <florianmarkusse@hotmail.com>
 2021-02-03 10:16:14 +01:00
cyril lopez
2cd2d223c2
Merge branch 'master' into master 2021-02-03 10:03:40 +01:00
Bobby Glidwell
76b2dfedbb
fix typo "to access to" (#9303) 2021-02-03 09:51:11 +01:00
cyril lopez
fd81e4777e
Merge branch 'master' into master 2021-02-03 09:43:13 +01:00
Alexandre BODIN
da266a1ab7
Merge pull request #9293 from strapi/fix/dot-rule-watch-admin 
Improve front end development
 2021-02-03 09:27:10 +01:00
soupette
7ad3619f79 Disable dot rule in watch mode 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-02 12:41:47 +01:00
dependabot[bot]
0771b659d5
Bump sharp from 0.26.2 to 0.27.1 (#9289) 
Bumps [sharp](https://github.com/lovell/sharp) from 0.26.2 to 0.27.1.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.26.2...v0.27.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-02 09:33:26 +01:00
Darron Park
6cf2e35da6
[Media Library] Get preview mime from thumbnail (#9184) 2021-02-01 18:26:10 +01:00
Davide Rossi
e1b0bca6b0
Adds missing import for italian translation of upload plugin (#9249) 
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2021-02-01 18:25:45 +01:00
Mattias van den Belt
23ead26f94
Fix undefined filter value (#8490) 
* Fix undefined filter value

Fixes #8201

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

* Move isNil() before .map() & update error message

Fixes #8201

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

* Fix allowing to find null values

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

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-01 16:18:17 +01:00
cyril lopez
0a283dd7ce
Merge branch 'master' into master 2021-02-01 09:56:47 +01:00
cyril lopez
53c7fb0970
Merge pull request #9263 from strapi/fix/input-uid-label 
Fix input UID label
 2021-02-01 09:55:06 +01:00
cyril lopez
d7d3fd1cd0
Merge branch 'master' into fix/input-uid-label 2021-02-01 09:40:50 +01:00
dependabot[bot]
1d44c63f1b
Bump graphql from 15.4.0 to 15.5.0 (#9276) 
Bumps [graphql](https://github.com/graphql/graphql-js) from 15.4.0 to 15.5.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v15.4.0...v15.5.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-01 09:37:52 +01:00
cyril lopez
eeff3cdd8c
Merge branch 'master' into fix/input-uid-label 2021-02-01 09:34:41 +01:00
dependabot[bot]
9077841beb
Bump @sentry/node from 5.27.3 to 6.0.3 (#9275) 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.27.3 to 6.0.3.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.27.3...6.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-01 09:32:53 +01:00
cyril lopez
de3a529fce
Merge branch 'master' into fix/input-uid-label 2021-02-01 09:14:24 +01:00
cyril lopez
512538a2b8
Merge pull request #9260 from strapi/fix/issue-8782-preview-unsupported-media 
Shows a preview message when media type is not supported
 2021-01-29 17:00:30 +01:00
soupette
e1b7c8b67c Fixes #9259 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-29 16:58:04 +01:00
Marvin Frachet
401a586455
Merge branch 'master' into fix/issue-8782-preview-unsupported-media 2021-01-29 16:49:49 +01:00
cyril lopez
47c05c5baf
Merge pull request #9261 from strapi/fix/question-button-hover-content 
Increasing padding bottom to prevent question button from overlapping
 2021-01-29 16:42:20 +01:00
mfrachet
2da67ed76a Modifying font size 2021-01-29 16:35:09 +01:00
mfrachet
865e0f47c5 Merge branch 'fix/issue-8782-preview-unsupported-media' of github.com:strapi/strapi into fix/issue-8782-preview-unsupported-media 2021-01-29 16:29:19 +01:00
mfrachet
3e1b8a0364 Reducing the amount of things pushed 2021-01-29 16:28:56 +01:00
mfrachet
326f6d8d51 Increasing padding bottom to prevent question button from overlapping 2021-01-29 15:24:57 +01:00
Marvin Frachet
fbbb152cd7
Merge branch 'master' into fix/issue-8782-preview-unsupported-media 2021-01-29 14:50:54 +01:00
mfrachet
59f0c4f30d Add test for reducer 2021-01-29 14:25:55 +01:00
mfrachet
3412505409 Shows a preview message when media type is not supported 2021-01-29 14:22:59 +01:00
dependabot[bot]
58716287cf
Bump swagger-ui-dist from 3.39.0 to 3.41.1 (#9253) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.39.0 to 3.41.1.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.39.0...v3.41.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:32:05 +01:00
dependabot[bot]
5c860e0efe
Bump @fortawesome/free-solid-svg-icons from 5.14.0 to 5.15.2 (#9255) 
Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 5.14.0 to 5.15.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.14.0...5.15.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:29:34 +01:00
dependabot[bot]
169238b2c1
Bump eslint-plugin-jsx-a11y from 6.3.1 to 6.4.1 (#9256) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.3.1...v6.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:29:16 +01:00
ELABBASSI Hicham
454f666b11
Merge pull request #9237 from strapi/fix/9236 
Fix regex validation
 2021-01-29 09:59:58 +01:00
cyril lopez
0b55c84d9f
Merge branch 'master' into fix/9236 2021-01-29 09:05:17 +01:00
Ben LeFevre
fd42889083
strapi-plugin-upload: Read responsive breakpoints from config (#9002) 
* Read responsive breakpoints from config

* Move strapi.config.get into function
 2021-01-28 17:31:09 +01:00
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
cyril lopez
3c05702085
Merge pull request #9247 from strapi/fix/snapshots 
Fix snapshots
 2021-01-28 16:18:23 +01:00
soupette
7e0d50c6da Fix snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-28 11:55:46 +01:00
Bobby Glidwell
b77b0644b9
add support for actionOptions for provider upload and delete functions (#9219) 
* add config.options to upload and delete functions

Supports options object in providerOptions which can contain any cloudinary upload/delete options

* add actionOptions to upload object and createProvider function

used to initialize upload/delete custom options which can be passed to a provider's upload/delete function

* Update README.md

added actionOptions description with link to available cloudinary upload/delete options

* wrapFunctionForErrors for upload and delete

* make actionOptions {} by default
 2021-01-28 11:24:11 +01:00
dependabot[bot]
e7894779ce
Bump react-select from 3.2.0 to 4.0.2 (#9244) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 3.2.0 to 4.0.2.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-28 09:50:17 +01:00
soupette
47edbcbfb0 Fixes #9236 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-27 15:42:18 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Virgil B
8eca3534c7
Merge branch 'master' into master 2021-01-26 13:45:19 +02:00
Virgil B
063c9b8ba5
Fixed syntax error 2021-01-26 13:43:53 +02:00
Virgil B
f67ca1688b
fix reverse text on code/quote blocks 2021-01-26 13:26:36 +02:00
Alexandre Bodin
4f9cc8a22c v3.4.5 v3.4.5 2021-01-26 11:59:47 +01:00
Virgil B
9168b8823a
Merge branch 'master' into master 2021-01-26 12:10:37 +02:00
cyril lopez
8b39f5ac05
Fixes #9180 (#9204) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 11:09:49 +01:00