yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,039 Commits 127 Branches 497 Tags
Commit Graph

1239 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
soupette
03b7b3340f Improve doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:46:37 +02:00
soupette
8f22ee2c5a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:07:07 +02:00
Brian Dixon
0f8d150105 Fix Typo in AWS deployment documentation 
Following the instructions to install Node.js with npm will result in node version 10 being installed instead of version 12.

Signed-off-by: bjdixon <bjdixon@gmail.com>
 2020-04-24 13:51:27 +08:00
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) 
* fix shadow crud breaking build when resolvers are not defined in a plugin

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

* refacto

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-22 15:41:40 +02:00
soupette
ec5f4e2e96 Update documentation about language customisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:09 +02:00
soupette
cf3690d41c Update documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:06 +02:00
Alexandre Bodin
c9cfc59566 Add a simple example of using env vars in provider config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-21 14:58:02 +02:00
Jim LAURIE
05f24d93c0
Merge branch 'master' into docs/update_userperm_build 2020-04-20 16:03:15 +02:00
Jim LAURIE
f22c595e49
Merge branch 'master' into docs/clean_local_plugin 2020-04-20 16:01:28 +02:00
Jim LAURIE
42e88b6723 Merge branch 'master' of https://github.com/strapi/strapi into documentation 2020-04-20 15:37:08 +02:00
Jim LAURIE
c4f02be4f3 docs: remove options from the model documentation 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-20 15:26:45 +02:00
Derrick Mehaffy
a44d583828
Remove Stack Overflow and Spectrum from project and use GH Discussions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-20 04:05:27 -07:00
Alexandre BODIN
9f9eea03f0
Merge pull request #5778 from strapi/docs-upload-service 
Fix upload models name definition
 2020-04-20 09:32:32 +02:00
Jim LAURIE
88402aed1f docs: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-18 10:17:37 +02:00