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

15673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
946c252fbd
Merge pull request #9279 from strapi/features/sso-upgrade-buffetjs 
Upgrade buffet.js
 2021-02-01 14:39:15 +01:00
soupette
88919eb84c Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-01 14:32:58 +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
40bd80730d
Merge pull request #9262 from strapi/sso/feature-var-env 
Conditional SSO with env var
 2021-01-29 17:19:11 +01:00
HichamELBSI
e80d9c9c3e Conditional SSO with env var 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-29 17:07:06 +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
Convly
55433bd9a5 Remove useless console.log 2021-01-29 11:58:47 +01:00
soupette
3515f025cd Fix cloud icon 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-29 11:58:47 +01:00
mfrachet
d1b89fd391 [ContentManager] Improving Drag&Drop experience 2021-01-29 11:58:47 +01:00
soupette
39c9bcba4f Add drop state to input file modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-29 11:58:46 +01:00
Convly
f35de0b8c1 Update auth events to make them for user friendly 2021-01-29 11:34:42 +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
Rémi de Juvigny
4fe9117229 Restore transaction name 2021-01-28 16:47:35 +01:00
cyril lopez
3c05702085
Merge pull request #9247 from strapi/fix/snapshots 
Fix snapshots
 2021-01-28 16:18:23 +01:00
Convly
56ca7365a4 Add e2e tests for provider login 2021-01-28 16:07:54 +01:00
Convly
f34da1f1c6 Update front tests snapshots 2021-01-28 12:01:23 +01:00
soupette
7e0d50c6da Fix snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-28 11:55:46 +01:00
Convly
f19b5d2831 Split sso/passport(ee|ce) unit tests 2021-01-28 11:32:27 +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
Convly
1d17fa383e Fix features-routes middleware loading 2021-01-28 10:50:36 +01:00
Convly
1a3887d27e Remove tmp file 2021-01-28 10:45:28 +01:00
Convly
4ff790830f Merge master into features/sso 2021-01-28 10:44:17 +01:00
Convly
bf92cc8698 Fix passport unit test 2021-01-28 10:40:57 +01:00
Rémi de Juvigny
e09f310639 Fix undefined transaction tag 2021-01-28 10:12:35 +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
Convly
6874d96666 Make enabled ee features available to the frontend 2021-01-27 18:24:24 +01:00