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
Scott Agirs
c63662cd29
Minor typo fixes 2020-03-04 09:19:49 -05:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01: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
Alexandre Bodin
9159bb1c65 Migrate upload providers to new config system 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +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
Gambhiro
47bc549f82 standard or flexible environment 2020-02-29 13:12:49 +00:00
soupette
77e0e83b27 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:09 +01:00
Pouya Miralayi
6cde79bc3c
Update frontend-development.md 2020-02-27 01:23:01 +03:30
cyril lopez
0bb347f79b
Merge pull request #5322 from strapi/single-types/uid-ctm 
Add UID in CTM and fix Single types alignments
 2020-02-26 17:40:00 +01:00
Alexandre Bodin
2568898eb6 Merge branch 'single-types/endpoint-doc' into features/single-types 2020-02-26 16:12:07 +01:00
Alexandre BODIN
b613c10e86
Merge pull request #5332 from strapi/single-types/migration-guide 
Single types migration guide and policy doc update
 2020-02-26 16:11:46 +01:00
HichamELBSI
e8b9017219 Merge branch 'features/single-types' into single-types/uid-ctm 2020-02-26 14:56:27 +01:00
HichamELBSI
ff870e7aa0 Merge branch 'develop' into features/single-types 2020-02-26 14:54:33 +01:00
Alexandre BODIN
6b9e19d9a7
Merge pull request #5294 from sanvit/patch-1 
edited some minor typos
 2020-02-26 14:32:03 +01:00
Alexandre BODIN
d5de85e58f
Merge branch 'master' into docs/extend-service 2020-02-26 14:29:40 +01:00
Alexandre Bodin
fe5edf52bb Update policy documentations and add migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 13:39:05 +01:00
MattieBelt
0a22790e7b Fix 'Extending a Model Service' docs (create & update) 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-02-26 13:11:12 +01:00
Alexandre Bodin
ab2aab4cd5 Init migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-26 12:01:04 +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
Gambhiro
ba6520a00e upd 2020-02-26 07:00:21 +00:00
Gambhiro
0dc06354c9
Update docs/3.0.0-beta.x/guides/deployment.md 
Co-Authored-By: João Belo <joaobelo.dev@gmail.com>
 2020-02-26 06:52:39 +00:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
Alexandre Bodin
5c4151c8d8 Add single type endpoint doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-25 18:13:24 +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
soupette
6ee156f3cc Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:58:46 +01:00
soupette
2838d145b0 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 2020-02-24 10:40:56 +01:00
sanvit
b4c97628d4
Update CLI.md 2020-02-22 00:27:55 +09: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
52320ff7ea docs: update docker compose instruction 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 19:00:52 +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
26dfc9ae1b docs: fix conflicts 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-20 14:48:03 +01:00
Jim LAURIE
7cb4cb2b74 docs: udpate some wording 2020-02-20 14:43:07 +01:00
soupette
074d30ccfb Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 13:49:19 +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
soupette
09d1a6af3a Add option to add a link into the global setting section 2020-02-19 16:30:53 +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