2029 Commits

Author SHA1 Message Date
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
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