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

1762 Commits

Author SHA1 Message Date
Loren
88de1fa692
Fixed sentence structure and grammatical errors. (#5507) 
* Fixed sentence structure and grammatical errors.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Updated plugin link to point to beta 3.0.0 docs.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>
 2020-03-22 18:30:31 +01:00
Michael-Scott-PC
e56fa01c1c
Documentation improvements 2020-03-22 18:28:03 +01:00
nikolasmelui
a74239c19c
Fix syntax error (#5516) 2020-03-20 14:45:47 +01:00
Ralph
dae9cfa415
Make plugins documentation generation optional (#5465) 
* Make plugins documentation generation optional

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Removing "-" character from schema names for generated plugin documentation so it becomes compatible with AWS API gateway import API feature using OAS file. Adding only one property to the settings file pluginsForWhichToGenerateDoc so that the user can choose for which plugin he wishes to generate documentation. Adding a parameter to generate or not the default response (this can now be set to false to have a documentation that is compatible with AWS API Gateway).

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating settings.json to start without the pluginsForWhichToGenerateDoc key so that all plugins documentation gets generated by default. Updated the documentation to reflect this change.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating documentation to correct typos and rephrase some sentences to make them more clear.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring the config to the var pluginsForWhichToGenerateDoc instead of renaming it to take into account comment from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring generateDefaultResponse and pluginsForWhichToGenerateDoc from strapi config object based on feedback from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-20 14:03:51 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +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
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
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +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
soupette
23cdc180b9 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-12 17:45:42 +01: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
soupette
485faf352f Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 09:21:18 +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
Alexandre BODIN
204044d250
Merge branch 'master' into fix/#4881/cantDisableOrOverrideRootPage 2020-03-10 12:13:55 +01:00
Pierre Noël
773a6525d4 little refacto of loading config + add doc 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 17:04:15 +01:00
Jim LAURIE
41695b3113
Merge branch 'master' into docs/one-click 2020-03-09 14:57:44 +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
Alexandre Bodin
ecc24c5a4d Merge branch 'develop' into features/media-lib 2020-03-09 08:34:25 +01: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
Gambhiro
eace943edc remove parts not specific to deployment 2020-03-06 15:57:13 +00: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
soupette
faa1873003 Update doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:44:54 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
2eef042ffd Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 09:11:48 +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
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
soupette
e34aa517db Created a new guide about the Field API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 17:32:53 +01:00
soupette
d1de5f588d Add documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 17:04:42 +01: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
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
soupette
9dec284470 Update migration guide 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 17:39:40 +01:00