yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,883 Commits 112 Branches 488 Tags
Commit Graph

1084 Commits

Author SHA1 Message Date
Virginie Ky
c69a84f91a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 08:34:34 +01:00
Derrick Mehaffy
734ce70df4 Minor fixes to DO one-click docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-18 22:29:06 -07:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:49:59 +01:00
Virginie Ky
fe20425215 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-16 14:52:58 +01:00
Nikolay Tyurin
9bbb395e3a
Update graphql.md (#5510) 
changed link in the https://www.apollographql.com/
 2020-03-16 14:17:59 +01:00
Alexandre BODIN
863ac59f6a
Merge branch 'master' into docs-updates 2020-03-16 10:07:52 +01:00
Derrick Mehaffy
7f87d86d6d
Update DO Docs per https://github.com/strapi/one-click-deploy/pull/6 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-13 02:53:29 -07:00
Jozef Cipa
e8c4629779
Fix/admin path serve (#5287) 
* Add config option to disable serving admin assets

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Add serveAdminPanel option to docs

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>

* Inherit default value for serving admin from config

Signed-off-by: Jozef Cipa <cipa.jozef@gmail.com>
 2020-03-12 09:39:25 +01:00
Brad Christie
b2d19c8ad8
Add --no-run and --use-npm (#5420) 
Not sure if you want to call-out that it will leverage yarn if/when possible (if npm flag is not set).

Did notice other APIs need an update, but unsure how `---tpl` relates to new cli. I assume it's been refactored into `--extend`, but unsure.

Signed-off-by: Brad Christie <bch@sitecore.net>
 2020-03-12 09:34:01 +01:00
Alexandre BODIN
a13b7b0d5a
Merge pull request #5426 from nazrdogan/patch-1 
fix typo
 2020-03-12 09:33:12 +01:00
Alexandre BODIN
1a86d4395e
Merge pull request #5407 from ScottAgirs/patch-1 
Minor typo fixes
 2020-03-12 09:31:44 +01:00
Jim LAURIE
6ef529b3a1 docs: rewrite sentence 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 17:01:44 +01:00
Jim LAURIE
11aeae4dc7 docs: add single type examples 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-10 16:47:41 +01:00
Jim LAURIE
41695b3113
Merge branch 'master' into docs/one-click 2020-03-09 14:57:44 +01:00
virginieky
1e91524fbc
Merge branch 'develop' into front/ui-improvements 2020-03-09 10:57:23 +01:00
soupette
5ed5912ef0 Add front-end settings api to documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-09 10:52:27 +01:00
Alexandre BODIN
69c7021063
Merge branch 'master' into docs-guide-count-graphql 2020-03-09 09:08:20 +01:00
Derrick Mehaffy
0e5955e570
PR fixes - remove extra link 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:31 -07:00
Derrick Mehaffy
5aef99c337
Move docs to installation area per Jim and change referral link 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
ad8e82553f
simplify documentation for now 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
d1836862d5
still wip 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
5f570c8cb6
setting up production migration structure 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
5f0e04aa29
more DO docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Derrick Mehaffy
8ae3cd9b50
Adding initial DO docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-09 00:35:10 -07:00
Scott Agirs
c56c3a0aae
Merge branch 'master' into patch-1 2020-03-07 13:06:30 -05:00
Derrick Mehaffy
9ab7144b18
PR Feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-06 11:24:33 -07:00
Alexandre BODIN
bd65a99482
Merge branch 'master' into patch-1 2020-03-06 17:36:33 +01:00
virginieky
4b76be27c3
Merge branch 'develop' into front/ui-improvements 2020-03-06 17:28:22 +01:00
Jim LAURIE
419d1c1c5c docs: add count graphql guide 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-06 15:23:36 +01:00
Dimitris
d80d7b593e fixes typo on mongo image 
Signed-off-by: Dimitrios Strantsalis <dstrants@gmail.com>
 2020-03-05 21:06:18 +02:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
Nazır Doğan
666b3c6ed8 fix typo 
Signed-off-by: Nazir Dogan <nazrdogan@gmail.com>
 2020-03-05 20:21:19 +03:00
ScottAgirs
0a7c75d859 Typofix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-05 11:44:18 -05:00
Scott Agirs
9d7a267f41 Typofix 
convetion > convetion

Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-05 11:40:44 -05:00
Jim LAURIE
abdbb4adb3
Merge pull request #5336 from pouyamiralayi/patch-4 
Update frontend-development.md
 2020-03-05 16:24:33 +01:00
Jim LAURIE
e718947657
Merge branch 'master' into docs/awsURLs 2020-03-05 15:37:01 +01:00
soupette
9dec284470 Update migration guide 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 17:39:40 +01:00
Scott Agirs
c63662cd29
Minor typo fixes 2020-03-04 09:19:49 -05:00
Derrick Mehaffy
cc9d693f22
Add documentation reference for AWS SES URLs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-04 02:23:57 -07:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Alexandre BODIN
9f8387d6a9
Merge branch 'master' into docs/broken-links 2020-03-04 09:10:31 +01:00
Pouya Miralayi
8feea3e6ba
Merge branch 'master' into patch-4 2020-03-03 22:46:24 +03:30
Jim LAURIE
8136fcc68a docs: fix platformsh steps titles 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-03 15:27:01 +01:00
Derrick Mehaffy
d2931fb803
minor typo and grammar changes 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:38:09 -07:00
DMehaffy
3affef4226
Fix prettier doing stuff it shouldn't 2020-03-03 03:32:49 -07:00
Derrick Mehaffy
dc675ab1d6
merge faq page with new troubleshooting page. 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:25:29 -07:00
Derrick Mehaffy
a70b55eeaf
Add FAQ and modify create provider docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:18:02 -07:00
Jim LAURIE
c3010876c0
Merge branch 'master' into docs-v2 2020-03-03 11:12:05 +01:00
Jim LAURIE
b625cc4fad docs: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-03 11:11:17 +01:00
Nathan Waelkens
8f223c6277 Fixed two broken links 
Signed-off-by: Nathan Waelkens <nathan@imigo.nl>
 2020-02-29 23:11:13 +01:00