yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,488 Commits 123 Branches 496 Tags
Commit Graph

15488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ELABBASSI Hicham
1cf82089ec
Merge pull request #9394 from strapi/sso/use-sso-registration 
sso/use sso registration
 2021-02-16 09:52:53 +01:00
HichamELBSI
a61aebaaa3 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-02-15 19:09:40 +01:00
HichamELBSI
3d2538d72e Add new user EE for SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-02-12 17:32:04 +01:00
Convly
189740c92c Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-11 15:00:14 +01:00
Yusuf Islam
6b6a4f5c6b
make routes policies components sticky (#9341) 2021-02-11 13:38:57 +01:00
DMehaffy
6cdda5eb70
Do not use npm v7 on new projects (#9330) 
* Do not use npm v7 on new projects

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* pr feedback

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-02-10 17:35:02 +01:00
Convly
e9b9013e4a Prevent deactivated user to connect using sso 2021-02-10 12:14:21 +01:00
Convly
9f01afca88 Add useSSORegistration option for gold users on admin creation 2021-02-10 11:57:11 +01:00
dependabot[bot]
85a3e3e709
Bump snyk from 1.427.0 to 1.448.0 (#9361) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.427.0 to 1.448.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/compare/v1.427.0...v1.448.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-10 09:36:17 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Pierre Noël
2ed1c05302
fix pool options (#9348) 2021-02-08 17:59:36 +01:00
dependabot[bot]
781cf2b9c9
Bump ioredis from 4.17.3 to 4.19.4 (#9320) 
Bumps [ioredis](https://github.com/luin/ioredis) from 4.17.3 to 4.19.4.
- [Release notes](https://github.com/luin/ioredis/releases)
- [Changelog](https://github.com/luin/ioredis/blob/master/Changelog.md)
- [Commits](https://github.com/luin/ioredis/compare/v4.17.3...v4.19.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-08 09:48:58 +01:00
dependabot[bot]
de552b6dd5
Bump koa from 2.13.0 to 2.13.1 (#9311) 
Bumps [koa](https://github.com/koajs/koa) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/koajs/koa/releases)
- [Changelog](https://github.com/koajs/koa/blob/master/History.md)
- [Commits](https://github.com/koajs/koa/compare/2.13.0...2.13.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-08 09:38:42 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 v3.4.6 2021-02-03 19:32:36 +01:00
Alexandre BODIN
42d1d2b38e
test fix for many many perf issues (#9286) 2021-02-03 19:29:30 +01:00
Alexandre BODIN
8d342d33b7
Fix sanitize removing polymorphic relations (#9310) 2021-02-03 19:28:11 +01:00
Taylor Zajicek
dfcab111b5
Bug: Erroneous error if there is a database configuration for a custom session middleware storage provider. (#8457) 
* Error if there is no database configuration for a custom session.

Signed-off-by: Taylor Zajicek <tzajicek@flexion.us>

* Specs for session middleware

Signed-off-by: Taylor Zajicek <tzajicek@flexion.us>

* Fix up lint errors

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-03 17:55:32 +01:00
cyril lopez
788a81db95
Fixes #9294 (#9306) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-03 14:35:55 +01:00
Alexandre Bodin
8287e2ea21 Merge branch 'master' into features/sso 2021-02-03 12:11:03 +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
Alexandre BODIN
9660099792
Merge pull request #9300 from strapi/sso/login-button-ui-fix 
Fix sso login button UI
 2021-02-03 09:50:14 +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
8ceee89bc1 Fix login button width 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-02 17:23:38 +01:00
Alexandre BODIN
fe695e9821
Fix login providers hook (#9297) 2021-02-02 16:12:56 +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
Alexandre Bodin
ce77b2e98b Apply some feedbacks 2021-02-02 12:27:24 +01:00
Alexandre Bodin
4c3bd90ec0 Merge branch 'develop' into features/sso 2021-02-02 10:51:28 +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
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