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

15673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
8d2ab6e1b0 Move sentry middleware to middlewares folder 2021-02-15 15:45:30 +01:00
Thew Dhanat
06ebbee166
strapi-plugin-upload accepts localServer configuration (#9191) 
* Update index.js

* Update index.js

* Update index.js

* Update index.js
 2021-02-15 14:58:59 +01:00
Paul Weinsberg
96516d5d7f
Enable develop --poll flag to watch file changes in network directories (#8773) 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-02-15 14:34:44 +01:00
alexey
e29483bb09
plugin-documentation: added missed manyWay relation (#9379) 2021-02-15 09:34:12 +01:00
alexey
b2d73ccefc
plugin-documentation: added enum for associations (#9381) 2021-02-15 09:32:24 +01:00
ngjoni
92ba4efb2b
Translation Update (german) (#9387) 
* update german translation

* Additional german translation
 2021-02-15 09:21:10 +01:00
Tuna Sakar
f8898b1662
Update README.md (#9380) 
fastandcomfy.io is down!
 2021-02-15 08:49:44 +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
dependabot[bot]
1b5da26cca
Bump @babel/plugin-transform-runtime from 7.11.5 to 7.12.15 (#9363) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.11.5 to 7.12.15.
- [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.12.15/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-12 15:26:28 +01:00
dependabot[bot]
04d1ac3de5
Bump sqlite3 from 5.0.0 to 5.0.1 (#9389) 
Bumps [sqlite3](https://github.com/mapbox/node-sqlite3) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/compare/v5.0.0...v5.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-12 09:20:36 +01:00
dependabot[bot]
b42470e593
Bump nodemailer from 6.4.17 to 6.4.18 (#9390) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.17 to 6.4.18.
- [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.17...v6.4.18)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-12 09:20:09 +01:00
Alexandre BODIN
a850042d90
Merge branch 'master' into features/sentry-plugin 2021-02-11 16:25:50 +01:00
Alexandre BODIN
a53d2dbaca
Fix mongoose autopopulate recursively looping to infinity when cycles appear (#9367) 2021-02-11 15:52:59 +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
Rémi de Juvigny
6f03b09e95
Merge branch 'master' into features/sentry-plugin 2021-02-09 10:50:01 +01:00
Rémi de Juvigny
bd221816f3 Update strapi-generate-new's Sentry version 2021-02-09 10:48:06 +01:00
Pierre Noël
2ed1c05302
fix pool options (#9348) 2021-02-08 17:59:36 +01:00
Rémi de Juvigny
f0ebed1dc2 Update @sentry/node to 6.1.0 2021-02-08 17:25:21 +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
Alexandre Bodin
aa806d1a79 Merge branch 'master' into features/sentry-plugin 2021-02-01 18:32:25 +01:00
Alexandre Bodin
ab70e3acc7 Merge branch 'master' into features/sentry-plugin 2021-02-01 18:30:24 +01:00
Alexandre Bodin
28f872a146 Update sentry dep 2021-02-01 18:29:49 +01:00
Darron Park
6cf2e35da6
[Media Library] Get preview mime from thumbnail (#9184) 2021-02-01 18:26:10 +01:00