yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,246 Commits 121 Branches 507 Tags
Commit Graph

14246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
d1e8b8df7c
Merge pull request #7450 from strapi/dependabot/npm_and_yarn/react-16.13.1 
Bump react from 16.13.0 to 16.13.1
 2020-08-31 15:24:08 +02:00
cyril lopez
64de3a2ea2
Merge pull request #7606 from strapi/deps/bump-buffetjs 
Bump Buffet.js version
 2020-08-28 16:56:50 +02:00
cyril lopez
eb62242bcc
Merge branch 'master' into deps/bump-buffetjs 2020-08-28 16:09:16 +02:00
cyril lopez
d9f701727b
Merge pull request #7527 from strapi/fix/decimal-input 
Fix decimal on content manager's inputs
 2020-08-27 10:20:53 +02:00
cyril lopez
8bf691cb73
Merge branch 'master' into fix/decimal-input 2020-08-26 10:20:15 +02:00
cyril lopez
36caab4176
Merge branch 'master' into deps/bump-buffetjs 2020-08-26 09:40:16 +02:00
cyril lopez
22d281c831
Merge pull request #7589 from strapi/fix/cm-issues 
CM bug fixes
 2020-08-26 09:30:48 +02:00
soupette
c7fcb70d8f Bump Buffet.js version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 09:10:57 +02:00
cyril lopez
051ee9b468
Merge branch 'master' into fix/cm-issues 2020-08-26 08:21:00 +02:00
cyril lopez
2957ad5b0d
Merge pull request #7597 from strapi/fix/small-issues 
Fix front-end small issues
 2020-08-26 08:20:50 +02:00
cyril lopez
6edaf61527
Merge branch 'master' into fix/cm-issues 2020-08-26 08:20:09 +02:00
soupette
a58442dcd5 Fixes #7503. 
This fix is temporary until we develop the menu API

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 18:11:43 +02:00
soupette
4e4cb8e5c1 Fixes #7523 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 18:00:12 +02:00
cyril lopez
e6589f64eb
Merge pull request #7590 from strapi/fix/7572 
Prevent from uninstalling the upload plugin in the admin panel
 2020-08-25 17:52:42 +02:00
soupette
3b0555b290 Fixes #7455 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 10:36:30 +02:00
soupette
b04d69835b Downgrade rollup plugin svg 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 10:00:42 +02:00
soupette
1b157c3d2f Fixes #7572 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 09:32:37 +02:00
HichamELBSI
a3e11f1362 Fix decimal on content manager's inputs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-25 09:25:17 +02:00
ELABBASSI Hicham
4ee79e2d9c
Merge pull request #7553 from strapi/fix/rename-add-comp-to-dz-event 
Rename addCompToDz event
 2020-08-23 14:40:47 +02:00
Convly
62d44368e2 Rename addComponentToDynamicZone to didAddComponentToDynamicZone 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-21 19:25:04 +02:00
Schaeferjo
ba218a2fe1
fix German word for E-Mail (#7534) 
Signed-off-by: Schaeferjo <mail@joschaefer.com>
 2020-08-20 18:03:23 +02:00
Jean-Sébastien Herbaux
1e67421668
Add utils::sanitize-entity tests (#7497) 
* Add utils::sanitize-entity tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-18 16:26:24 +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
ScottAgirs
a930d6e814 Grammar fix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-13 21:30:28 -04: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
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