yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-06 07:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 112 Branches 487 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
1cab03f562
Merge pull request #8237 from strapi/dependabot/npm_and_yarn/axios-0.20.0 
Bump axios from 0.19.2 to 0.20.0
 2020-10-08 16:48:45 +02:00
Jim LAURIE
b7c24edac1 docs: update the draft and schedule guides 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-10-08 16:25:51 +02:00
soupette
641476ae7f Remove remove-markdown dependency 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-08 16:13:42 +02:00
cyril lopez
04e076ef2f
Merge branch 'master' into dependabot/npm_and_yarn/axios-0.20.0 2020-10-08 16:08:12 +02:00
cyril lopez
938f9fa29d
Merge pull request #8241 from TPXP/update-default-favicon 
ENH: Update the default favicon with the new logo
 2020-10-08 12:29:28 +02:00
Thomas P
5c792ff325 ENH: Update the default favicon with the new logo 
It looks so much better 😍

Signed-off-by: Thomas P <TPXP@users.noreply.github.com>
 2020-10-08 10:40:48 +02:00
cyril lopez
b5c7344c2a
Merge pull request #8092 from strapi/front/events 
Add events
 2020-10-08 09:42:02 +02:00
cyril lopez
3f7cd766d1
Merge branch 'master' into front/events 2020-10-08 09:41:40 +02:00
cyril lopez
8612af6a2c
Merge pull request #8230 from henrych4/fix-incorrect-notification 
Fix incorrect notification when copy media url to clipboard
 2020-10-08 09:40:47 +02:00
cyril lopez
d6a6af535a
Merge branch 'master' into fix-incorrect-notification 2020-10-08 09:40:18 +02:00
cyril lopez
ad2a2b0d0a
Merge pull request #8172 from pmrotule/fix/email-confirmation-redirection-copy 
Fix EN copy of email-confirmation-redirection description
 2020-10-08 09:39:34 +02:00
cyril lopez
cb1ffb6fb2
Merge branch 'master' into fix/email-confirmation-redirection-copy 2020-10-08 09:38:55 +02:00
cyril lopez
f3ad929665
Merge pull request #8229 from strapi/fix/glitch-compo-picker 
Fixes UI glitch
 2020-10-08 09:38:36 +02:00
cyril lopez
acbfe598d5
Merge branch 'master' into fix/glitch-compo-picker 2020-10-08 09:37:32 +02:00
davidmauskop
43ff63cc38
Update /_health to accept GET requests (#8234) 
Signed-off-by: David Mauskop <david@render.com>
 2020-10-08 09:33:32 +02:00
soupette
5b2236def8 Add cursor not-allowed for ce conditions select 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-08 09:32:03 +02:00
cyril lopez
d716a9b076
Merge branch 'master' into fix/glitch-compo-picker 2020-10-08 08:55:00 +02:00
dependabot[bot]
a0c957348d
Bump axios from 0.19.2 to 0.20.0 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-08 06:09:48 +00:00
Alexandre BODIN
e87af3f6c6
do not set id to undefined (#8232) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-07 23:11:00 +02:00
Jean-Sébastien Herbaux
e7861232d0
Fix wrong query generation with bookshelf (#8228) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-07 23:10:38 +02:00
henrych4
0593ca14d8 Fix incorrect notification when copy media url to clipboard 
Signed-off-by: henrych4 <singyinhenry@gmail.com>
 2020-10-07 23:59:28 +08:00
cyril lopez
62129e9b4f
Merge branch 'master' into front/events 2020-10-07 16:56:56 +02:00
soupette
eb03a06b07 Fixes #8175 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-07 16:53:55 +02:00
chachew
e0287c8d27
Add missing 'format' reserved model word. (#8194) 
* Add missing 'format' reserved model word.

* Move reserved word to attribute name.

Co-authored-by: Matt Kirkland <mkirkland616@gmail.com>
 2020-10-07 15:06:59 +02:00
Alexandre Bodin
755d216fbe Merge branch 'documentation' 2020-10-07 14:53:27 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 v3.2.1 2020-10-07 14:50:47 +02:00
cyril lopez
f3a64f2fcf
Fix util when no data (#8224) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-07 14:49:35 +02:00
Adam Hunter
81a22229ba
fixes missing error message when ses sendEmail returns an error (#8086) 
Signed-off-by: Adam Hunter <arhunter@gmail.com>
 2020-10-07 14:38:18 +02:00
Stanko Tadić
848d554c79
fixes #8221 - fixed publish failing if non-repeateable component data is "null" (#8222) 
Signed-off-by: Stanko <stanko.tadic@gmail.com>
 2020-10-07 14:20:18 +02:00
Tanmoy Bhowmik
983c61c144
Add support for brotli compression (#8169) 
* chore(package): upgrade koa-compress

Signed-off-by: tanmoyopenroot <tanmoy.openroot@gmail.com>

* fix(middleware): add config option

Signed-off-by: tanmoyopenroot <tanmoy.openroot@gmail.com>

* chore(docs): update gzip docs

Signed-off-by: tanmoyopenroot <tanmoy.openroot@gmail.com>
 2020-10-07 09:49:18 +02:00
dependabot[bot]
9a2886036d
Bump swagger-ui-dist from 3.24.3 to 3.35.0 (#8200) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.24.3 to 3.35.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.24.3...v3.35.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-06 17:24:25 +02:00
Dan Wendorf
bf8c17f120
Bump node-fetch to 2.6.1 (#8191) 
node-fetch < 2.6.1 has a security vulnerability
(https://github.com/advisories/GHSA-w7rc-rwvf-8q5r)

This is a major version bump for strapi-plugin-upload (from 1.7.3), but
it does not look like strapi-plugin-upload is relying on any of the
functionality that has broken from 1.x to 2.x

Signed-off-by: Dan Wendorf <dan@render.com>
 2020-10-06 17:20:57 +02:00
Alexandre BODIN
162c3aaa61
Merge pull request #8205 from strapi/chore/migration-3-2 
Add 3.2 migration guide and improve migration guides homepage
 2020-10-06 15:19:07 +02:00
Alexandre Bodin
698dbc6c99 Add 3.2 migration guide and improve migration guides homepage 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 15:15:12 +02:00
Alexandre BODIN
7a8d820376
Merge pull request #8203 from strapi/doc/entries-values 
use entries instead of values
 2020-10-06 12:06:02 +02:00
Pierre Noël
a45d50aa58 use entries instead of values 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-06 11:49:51 +02:00
Ralph
b35b8f72b3
AWS Cognito provider (#6917) 
Add login provider AWS Cognito

Signed-off-by: ralphsomeday
 2020-10-06 11:45:22 +02:00
Jean-Sébastien Herbaux
46314a4054
Split init route to init & information endpoints (#8160) 
* Split init to init & information endpoints

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add unit tests / Rename controller

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove unnecessary comment

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-06 11:26:17 +02:00
Alexandre Bodin
48b138e81c Merge branch 'master' into documentation 2020-10-06 11:06:24 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre BODIN
fb66ece326
Merge pull request #8165 from strapi/docs/heroku/fixDatabaseGuide 
Fix heroku guide to set database settings in proper env path
 2020-10-06 10:56:38 +02:00
Alexandre BODIN
442f38a4ba
Merge pull request #8190 from strapi/fix/graphql-pubstate 
Fix publicationState for nested populations
 2020-10-06 10:54:07 +02:00
Alexandre Bodin
fcb2878987 Use a symbol to pass options add make it work with many before fixing them 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
Alexandre Bodin
60b52cf946 Add publicationState only if received in the args 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
Alexandre Bodin
5f7fcafc5f Fix publciationState for nested populations 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:30 +02:00
Alexandre BODIN
ab66df4369
Merge pull request #8182 from strapi/features/allow-setting-published-at-in-api 
Allow setting the published_at field in the API
 2020-10-05 20:22:23 +02:00
Alexandre BODIN
44894ce220
Merge pull request #8183 from strapi/3.2/docs 
Draft & Publish documentation
 2020-10-05 20:16:04 +02:00
Derrick Mehaffy
b8bd0b7b56 PR feedback from Megane 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-05 10:05:57 -07:00
Alexandre Bodin
af8a96c18b Fix search tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 18:07:50 +02:00
cyril lopez
5e165c151f
Merge pull request #8188 from strapi/chore/remove-modals 
Remove unneeded modals when D&P is disabled
 2020-10-05 17:46:59 +02:00