yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 03:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 111 Branches 486 Tags
Commit Graph

1762 Commits

Author SHA1 Message Date
Eddie Palmans
5235d94dc6
Fixed link to deployment guide (#6174) 2020-05-12 12:27:34 +02:00
Pierre Noël
3787573828
updated server.url doc + remove server.admin.build doc (#6173) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-12 11:28:32 +02:00
Alireza Kavian
603ffc1830
google provider section modified (#5730) 
The second "Client Id" should be: "Client Secret"
 2020-05-12 11:20:35 +02:00
David Ye
ee312eeb0a
Fix typo (#5665) 2020-05-12 11:08:15 +02:00
Louis Guitton
735e96c68b Fix broken link 
Signed-off-by: Louis Guitton <louisguitton93@gmail.com>
 2020-05-09 16:47:31 +02:00
Kevin Pfeifer
b0d50ad21f
Merge branch 'master' into patch-1 2020-05-08 22:28:56 +02:00
Alexandre Bodin
900f0062cc Merge branch 'develop' 2020-05-08 13:53:36 +02:00
Ålevosía
cd8ccb3c7a
Fix typographical errors in Models concept of documentation (#6094) 
Changed from 'liked' to 'linked'
 2020-05-08 13:52:47 +02:00
John Angelo
a09754a73c
changed docker volume for postgres (#6086) 
Signed-off-by: John Angelo <gelomorn@gmail.com>
 2020-05-08 13:51:37 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

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

* refacto

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

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

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

* fix github login

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

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +02:00
Kevin Pfeifer
7de1f2d51f
Merge branch 'master' into patch-1 2020-05-07 22:28:51 +02:00
ScottAgirs
d41227b75d Merge branch 'master' into patch---adjust-naming-to-password-mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-07 13:05:29 -04:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Jim LAURIE
227a8cf8ed
Merge branch 'master' into chore/moveToGHDisc 2020-05-07 09:16:12 +02:00
Alexandre Bodin
b109d6878e Merge branch 'master' into develop 2020-05-06 21:48:20 +02:00
lpouvreau
9c90c7449e
Removed wrong extra double quote from plugins doc (#5981) 2020-05-05 19:40:24 +02:00
Kelvin Tsoi
4346cec95c
Heroku Error: self-signed certificate SSL fix (#6050) 
Heroku Error: self-signed certificate SSL fix for PG '^8.0.0'. Setting SSL options to `"ssl": { "rejectUnauthorized": false }` enables SSL but does not reject self-signed certificate for Heroku deployment. The issue occurs when Heroku invokes node application but fails at SSL cert for PG ^8.0.0.

Signed-off-by: Kelvin Tsoi <ktsoi@wearfigs.com>
 2020-05-05 19:23:03 +02:00
Robert Piosik
d5f3ab79c3
docs: remove duplication in menu; (#6039) 
Guides/Count with GraphQL

Signed-off-by: Robert Piosik <robertpiosik@gmail.com>
 2020-05-05 19:16:43 +02:00
Tomislav Biscan
f35de46519
Changes the App Engine HOST variable to '0.0.0.0' (#6040) 
Setting the `HOST` variable to one that has `*.appspot.com` domain seems to be causing connectivity issues for multiple people - https://github.com/strapi/strapi/issues/3433#issuecomment-621764964
The solution is simply setting `0.0.0.0`.
 2020-05-05 19:16:01 +02:00
Kwinten Li
02d808eec3 Update gcs file config in GAE deployment guide 
Update the Google Cloud Storage configuration guide according to the latest changes in version 3.0.0-beta.20 in the Google App Engine deployment guide

Signed-off-by: Kwinten <kwinten.yc.li@gmail.com>
Update gcs file config in GAE deployment guide
 2020-05-05 18:31:55 +08:00
Jozef Culen
08eeea7d0b
Updated code 
Using unedefined 'entry' variable is crashing the server
 2020-05-04 18:55:48 +02:00
Alexandre Bodin
b928013e43 Cleanup code and doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 17:27:09 +02:00
Alexandre Bodin
c364fcd0e2 Move lifecycles to sub field and added documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Kevin Pfeifer
4fd1565463 add npm/npx and strapi commands and convert to tabs elements 
Signed-off-by: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
 2020-05-03 16:14:47 +02:00
Robert Piosik
8675effa21 docs: add .js ext to graphql paths, fix code snip- 
et formatting

Signed-off-by: Robert Piosik <robertpiosik@gmail.com>
 2020-05-02 20:50:28 +02:00
Rasmus Nørskov
bd51793d2d Added slugify options 
Signed-off-by: Rasmus Nørskov <rasmus@norskov.org>
 2020-05-02 18:31:20 +02:00
Kevin Pfeifer
3125157913 Add rebuild after wysiwyg plugin has been created 
Me and my colleague just tried this step by step guide to install the CKEditor WYSIWYG with the current strapi version 3.0.0-beta.20.1 and it didn't work.
We had to spend some time till we found out that we have to rebuild strapi so the plugin is loaded correctly.
Found that on the "Update Strapi version" page.

Signed-off-by: Kevin Pfeifer <kevin.pfeifer@sunlime.at>
 2020-05-02 14:55:28 +02:00
Ky
ec71ed2c92 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:45:30 +02:00
Alexandre Bodin
55b977dc52 Review updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:24:05 +02:00
Alexandre Bodin
2d80ced7f5 Revert chagnes made on alpha doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:45 +02:00
Alexandre Bodin
dbda1cc254 Fix wrong behavior of env helper with defautl values 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
da910b0b39 Fix create new project cli option for mongo not handled correctly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Add tests for env helpers

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
789e29e2c5 Updated deployment doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
a877a00934 Update docuemntation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
cbdc83d6d7 Move core middleware configs to the middleware concept doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:41 +02:00
Alexandre Bodin
eb706f2168 Init doc updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Ky
18cd135268 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 17:51:19 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
Ky
0c1105a51a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 15:50:05 +02:00
Jim LAURIE
07a69517c4
Merge pull request #5966 from strapi/docs/rfcs 
Add rfcs into the contribution docs
 2020-04-27 14:56:08 +02:00
Jim LAURIE
44dab28519
Merge branch 'master' into bugfix/aws-documentation-typo 2020-04-27 11:30:01 +02:00
Jim LAURIE
f65644ba64
Merge branch 'master' into master 2020-04-27 11:29:14 +02:00
Alexandre Bodin
05f22aaf27 Merge branch 'master' into develop 2020-04-27 11:15:48 +02:00
Jim LAURIE
a81d265edd
Merge pull request #5725 from adriatic/adriatic 
Update documentation from Content to Collection Type
 2020-04-27 10:59:41 +02:00
Jim LAURIE
22a2da3ae0 docs: add rfcs into the contribution docs 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-27 10:16:59 +02:00
Jim LAURIE
8a1aefd28f Merge branch 'documentation' 2020-04-27 10:01:04 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
Daniel Schäfer
0e8dc2e917
Fix typo in documentation (#5866) 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-24 14:08:01 +02:00