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
11,557 Commits 127 Branches 497 Tags
Commit Graph

1017 Commits

Author SHA1 Message Date
HichamELBSI
ff870e7aa0 Merge branch 'develop' into features/single-types 2020-02-26 14:54:33 +01:00
Alexandre Bodin
2a0becb9b0 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 10:12:25 +01:00
Derrick Mehaffy
a5a48d8348
Added information about body and files to request docs 
These paths to body and files differ from Koa's typical pathing, adding them to the docs temporarily until the docs are reworked.
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-02-24 08:34:04 -07:00
Alexandre Bodin
9c39efecdc Merge branch 'develop' into features/single-types 2020-02-21 11:57:11 +01:00
Alexandre Bodin
bd53103e06 Merge branch 'master' into develop 2020-02-21 11:56:59 +01:00
Jim LAURIE
f6de4c8213 docs: update is owner pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 19:06:40 +01:00
Jim LAURIE
25e77a9bd1 docs: add tip is owner delete 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 16:23:07 +01:00
Jim LAURIE
ff466efb61 docs(guide): add guide for isOwner policy 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-19 17:08:16 +01:00
Alexandre Bodin
3ce852af61 User :: in policies prefix and update documentation accordingly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
acfcd68e2a
Merge branch 'master' into patch-1 2020-02-10 17:25:53 +01:00
Jim LAURIE
befdbc8631
Merge branch 'master' into doc/plugin-development 2020-02-10 17:18:02 +01:00
Coty
27ca0841b3 [Docs] Fix typos in third party client doc 
Signed-off-by: Coty <cotyhamilton@gmail.com>
 2020-02-08 23:41:44 -06:00
Bart Duisters
7c3e869e2e
Merge branch 'master' into patch-1 2020-02-08 20:03:38 +01:00
Bart Duisters
76caff32db Grammar and punctuation of webhooks.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
b5d5fb47b4 Grammar and punctuation of plugins.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
22df0d85a1 Grammar and punctuation of logging.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
e18408d4ba Grammar and punctuation of middlewares.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
ff0ef9a204 Grammar and punctuation of hooks.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
b12c965efc Grammar and punctuation of public-assets.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
9fe015c5f8 Grammar and punctuation of policies.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
6ead09f92f Grammar and punctuation of parameters.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
75ea7c51f0 Grammar and punctuation of services.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
4a49510d2d Grammar and punctuation of models.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
788ee8cc26 Grammar of controllers.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
f679e7d218 Grammar and punctuation of routing.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
e303178150 Grammar and punctuation of customization.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
d24a94d44e Grammar and punctuation of configurations.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
f9411d72be Punctuation file-structure.md 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
06add573f2 Grammar and correction of incorrect information 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
e27a727380 Grammar 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
2d720516a2 Grammar and consitent punctuation 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
3f62ac0998 Consistent use of punctuation in lists 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Bart Duisters
4a9536fea8 Grammar and punctuation 
Signed-off-by: Bart Duisters <bartduisters@bartduisters.com>
 2020-02-08 19:58:12 +01:00
Jim LAURIE
d256126cd9
Merge branch 'master' into docs-plugin-queries 2020-02-06 22:22:40 +01:00
soupette
7adc97b269 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 11:54:02 +01:00
Jim LAURIE
e97397a9eb
Merge branch 'master' into master 2020-02-05 15:56:50 +01:00
George.Tsopanoglou
9070549210 Update quick guide with correct button names 
Signed-off-by: George.Tsopanoglou <george.tsopanoglou@karmarama.com>
 2020-02-05 13:14:33 +00:00
Jim LAURIE
2cf6198b4c
Merge branch 'master' into master 2020-02-05 13:55:58 +01:00
Jim LAURIE
f780617f7c
Merge branch 'master' into patch-1 2020-02-05 13:51:57 +01:00
Jim LAURIE
13078d851b docs: remove queries section 
Since this section is no more interesting I remove it.
Related to close #5106
Signed-off-by: lauriejim <j.laurie6993@gmail.com>
 2020-02-04 17:22:59 +01:00
Derrick Mehaffy
1680fd0d81
Add warning messages to Alpha docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-02-04 01:39:53 -07:00
cyril lopez
1f928eb322
Merge branch 'master' into doc/plugin-development 2020-02-04 00:26:55 +01:00
Robin
72ef115ceb Remove empty code block from migration guide 
Signed-off-by: robin <almigod0718@gmail.com>
 2020-02-02 15:27:53 +08:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
Ily Trevino
225b48b955 Fixed mispelled word restaurant 
Signed-off-by: Ily Trevino <ily.trevino@gmail.com>
 2020-01-30 18:07:59 -06:00
soupette
4153fe9b7b Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 18:18:35 +01:00
soupette
0a33e3ade5 Add documentation about the settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 14:42:53 +01:00
Alexandre BODIN
355365eed0 [Docs] Fix typo in upload plugin 
Signed-off-by: antonin.beaufort <antonin.beaufort@gmail.com>
 2020-01-28 20:33:37 +01:00
Sébastien Chopin
6a85969adb [Docs] Fix typo in webhooks 
Signed-off-by: Sébastien Chopin <seb@nuxtjs.com>
 2020-01-27 16:17:28 +01:00