yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 113 Branches 488 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HichamELBSI
4e4a77ff0f Add new role 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-17 17:40:44 +02:00
Jim LAURIE
b39709a6ed
Merge pull request #7476 from XuluWarrior/docs/boom-before-sentry 
Boom middleware needs to be loaded before sentry middleware
 2020-08-17 15:19:35 +02:00
Jim LAURIE
979c5d3945
Merge pull request #7385 from ScottAgirs/master 
Update basic GraphQL Plugin information
 2020-08-17 14:56:54 +02:00
DMehaffy
bdf3b03c7e
Merge branch 'master' into master 2020-08-15 10:32:53 -07:00
XuluWarrior
122e4b7664 Boom middleware needs to be loaded before sentry middleware 
Signed-off-by: XuluWarrior <github@metaliving.plus.com>
 2020-08-14 15:05:27 +01:00
Jim LAURIE
009522d078
Merge pull request #7441 from dr5hn/improve/Docs 
Add how to change login page's logo
 2020-08-14 15:07:00 +02:00
Jim LAURIE
3a36229acb
Merge pull request #7471 from strapi/docs/docs-branch 
Setup docs branch to update directly the documentation branch
 2020-08-14 14:37:33 +02:00
Jim LAURIE
fb7f08d216 docs: setup docs branch 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-08-14 12:10:49 +02:00
Jim LAURIE
85978c9ec1
Merge pull request #7470 from strapi/docs/tips-template 
Remove tips in login provider tab causing templating issues
 2020-08-14 11:58:24 +02:00
Jim LAURIE
cfcfea06c4 docs: remove tips in login provider tab causing templating issues 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-08-14 11:53:33 +02:00
ScottAgirs
a930d6e814 Grammar fix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-13 21:30:28 -04:00
Joeri Damme
0adc210956
chore: fixing typo in Plugin Development -> Frontend Development documentation. (#7461) 
Signed-off-by: Joeri Damme <joeri.damme@kpn.com>
 2020-08-13 15:30:21 -07:00
dependabot[bot]
888036ddbe
Bump react from 16.13.0 to 16.13.1 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-13 17:22:49 +00:00
Alexandre Bodin
331b73801f Merge branch 'documentation' 2020-08-13 19:12:56 +02:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 v3.1.4 2020-08-13 18:58:14 +02:00
David Janas
11f900085e
Increase parser arrayLimit to 100 (#7430) 
* Add queryStringParser settings to parser middleware

Signed-off-by: David Janas <davidjanasr@gmail.com>

* add queryStringParser config to middleware documentation

Signed-off-by: David Janas <davidjanasr@gmail.com>
 2020-08-13 18:35:38 +02:00
Jim LAURIE
a16542c9b7
Merge pull request #7408 from strapi/docs/FAQ/rbacUpdate 
Update FAQ with latest RBAC information
 2020-08-13 12:16:27 +02:00
Alexandre Gigleux
e3d6ce132e
Fix #7141 - Wrong conversion of to a boolean value (#7161) 
Signed-off-by: agigleux <alexandre.gigleux@sonarsource.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-08-13 09:16:36 +02:00
Tudor Ilisoi
f073aebe53
fixes #6725 (#6769) 
* fixes #6725

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>

* fixed L41

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-08-12 23:01:32 +02:00
dependabot[bot]
3c80a6c9a5
Bump stylelint-config-recommended from 2.2.0 to 3.0.0 (#7431) 
* Bump stylelint-config-recommended from 2.2.0 to 3.0.0

Bumps [stylelint-config-recommended](https://github.com/stylelint/stylelint-config-recommended) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/stylelint/stylelint-config-recommended/releases)
- [Changelog](https://github.com/stylelint/stylelint-config-recommended/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint-config-recommended/compare/2.2.0...3.0.0)

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

* Fix lint and dump stylelint

Signed-off-by: HichamELBSI <elabbassih@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-12 22:58:17 +02:00
dependabot[bot]
e80c21a7bc
Bump autoprefixer from 9.7.4 to 9.8.6 (#7276) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.4 to 9.8.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.8.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-12 22:57:28 +02:00
Darshan Gada
143e85cb8d ADD: How to change login page's logo 
Signed-off-by: Darshan Gada <gadadarshan@gmail.com>
 2020-08-12 18:35:01 +05:30
Alexandre Bodin
acf11ed9b1 Merge branch 'documentation' 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-08-12 14:52:37 +02:00
KULDIP PIPALIYA
fa8dfcc7cf
Formatting enhancements and Fixes (#6858) 
* Fix: formatting

Signed-off-by: KULDIP PIPALIYA <kuldipem@gmail.com>

* Fix: formatting

Signed-off-by: KULDIP PIPALIYA <kuldipem@gmail.com>

* Enhance: consistance formatting for NOTE

Signed-off-by: KULDIP PIPALIYA <kuldipem@gmail.com>

* Enhance: consistance formatting for NOTE

Signed-off-by: KULDIP PIPALIYA <kuldipem@gmail.com>
 2020-08-12 12:33:54 +02:00
JuanCarlosJr97
1afbdd663f
Updating email documentation adding a tip during initial setup to avoid issues during strapi creation (#7413) 
Signed-off-by: Juan Carlos Blanco Delgado <juancarlosjr97@gmail.com>
 2020-08-12 12:18:17 +02:00
p_0g_8mm3_
817c46cd45
Add and improve German translations (#7383) 
Signed-off-by: p_0g_8mm3_ <37022952+pr0gr8mm3r@users.noreply.github.com>
 2020-08-12 12:17:19 +02:00
Alexandre BODIN
c9ece305ce
Merge pull request #7109 from strapi/chore/ml-delete-assets 
Chore/ml delete assets
 2020-08-12 12:16:27 +02:00
Alexandre BODIN
95e6837d45
Merge branch 'master' into chore/ml-delete-assets 2020-08-12 12:16:18 +02:00
cyril lopez
99dfd24eaf
Fixes #7301 (#7312) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:15:39 +02:00
Brendan Abbott
b3be6dea99
Improve empty state grammar for Assets (#6922) 
Signed-off-by: Brendan Abbott <brendan.abbott@shopify.com>
 2020-08-12 12:15:13 +02:00
spobwoode
7e6896423f
Added instructions for installing the pg node module (#6744) 
* Fixes #6733

Signed-off-by: soupette <cyril.lpz@gmail.com>

* v3.0.4

* Added instructions for installing the `pg` node module

I believe this is necessary to deploy to Google app engine - my deployment didn't work until I did this

* Revert "Added instructions for installing the `pg` node module"

This reverts commit 3da33ec1dc1ab37267bad5fe526ff2d0c4b72502.

Co-authored-by: soupette <cyril.lpz@gmail.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-08-12 12:11:06 +02:00
Rob Bailey
6f37e75352
Fixing typo in translations/en.json. (#7274) 
"Enterprise" was incorrectly spelt as "Entreprise"
 2020-08-12 12:09:40 +02:00
Anthony Valera
f93bff8bfb
Fixes link to AWS Free landing page (#7291) 
Signed-off-by: Anthony Valera <anthony@anthonyvalera.com>
 2020-08-12 12:08:32 +02:00
Daniel Soares
6b34b5e8af
Added pt-BR localization to strapi-plugin-upload (#7375) 
Signed-off-by: Daniel Soares <daniel.soares@me.com>
 2020-08-12 12:08:09 +02:00
Laurent Comte
086677bee3
Fix/6641 (#7337) 
* Fix "Search for an asset" on Media Library loses focus
while typing

Signed-off-by: Laurent Comte <laurent.comte@gmail.com>

* Update the provider loggin doc + display absolute redirect uri in front

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* update grant + doc twitter

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* replace .fr by .com

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* move a tip

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Specify that only grant providers are supported

Signed-off-by: Pierre Noël <petersg83@gmail.com>

Co-authored-by: Pierre Noël <petersg83@gmail.com>
 2020-08-12 12:07:39 +02:00
cyril lopez
f6f5095cc5
Fix WYSIWYG bugs (#7370) 
* Fixes #7314

Signed-off-by: soupette <cyril.lpz@gmail.com>

* Fixes #4300

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:07:15 +02:00
Jason Prado
4749d61aff
Show error.message || error on failed command (#7388) 
Some exceptions, like module inclusion errors, don't generate nice
Error objects with message defined. This causes hard-to-debug failures.
When encountering an error with no message, show the whole Error object.

Signed-off-by: Jason Prado <jason.prado@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-08-12 12:06:39 +02:00
Alexandre BODIN
6acb73952f
Merge pull request #7416 from strapi/fix/7414 
Fixes #7414
 2020-08-12 12:06:00 +02:00
Valerian Pereira
5167a8a691
Points added one below the other (#7428) 
Signed-off-by: Valerian Pereira <valerianpereira25@gmail.com>
 2020-08-11 10:17:17 -07:00
Burak
d4c418bbfb
send-email.md updated. (#7426) 2020-08-11 09:12:54 -07:00
Alexandre BODIN
cc0e78140c
Merge pull request #7425 from strapi/docs/queries/fixMongooseCustom 
Fix custom mongoose query .toObject() is undefined
 2020-08-11 16:05:01 +02:00
Derrick Mehaffy
18a02baf77
Fix custom mongoose query .toObject() is undefined 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-11 07:02:32 -07:00
Alexandre BODIN
dcf93f7295
Merge pull request #7418 from strapi/docs/migration-username-admin 
Docs update on migration guide for username constraint
 2020-08-11 12:02:50 +02:00
Alexandre BODIN
8040a85c1a
Merge pull request #7367 from strapi/dependabot/npm_and_yarn/testing-library/react-10.4.8 
Bump @testing-library/react from 10.0.4 to 10.4.8
 2020-08-11 11:07:07 +02:00
Jim LAURIE
94d70f3e61 Update migration guide username not null 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-08-11 11:05:51 +02:00
soupette
9d06b5783b Merge branch 'master' of github.com:strapi/strapi into fix/7414 2020-08-11 10:52:12 +02:00
soupette
a8b95220f0 Fixes #7414 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-11 10:50:28 +02:00
dependabot[bot]
c2a975fc94
Bump @testing-library/react from 10.0.4 to 10.4.8 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 10.0.4 to 10.4.8.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v10.0.4...v10.4.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-11 08:32:24 +00:00
Alexandre BODIN
b56cc7f3c1
Merge pull request #7397 from strapi/dependabot/npm_and_yarn/rollup-plugin-svg-2.0.0 
Bump rollup-plugin-svg from 1.0.1 to 2.0.0
 2020-08-11 10:20:04 +02:00