33691 Commits

Author SHA1 Message Date
Alexandre Bodin
939c8354c0 Create file formatters
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 21:52:23 +01:00
Virginie Ky
e1e85ab452 card integration
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 19:12:21 +01:00
Pierre Noël
18a8b410c6 Typo
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-09 17:36:10 +01:00
Pierre Noël
a1774db410 return null instead of promise
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-09 17:22:36 +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
Alexandre BODIN
c183abcce4
Merge pull request #5472 from strapi/media-lib/optimization
Media lib/optimization
2020-03-09 16:29:28 +01:00
Pierre Noël
74e63ea77c Move index.html to public middleware + add config var "defaultIndex"
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-09 15:48:42 +01:00
Virginie Ky
6cc7d070e8 remove unused file
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 15:35:53 +01:00
Virginie Ky
75efcfe4a2 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/card-preview-integration 2020-03-09 15:08:12 +01:00
Jim LAURIE
44b1b302bc
Merge pull request #5298 from strapi/docs/one-click
Add DigitalOcean one-click docs
2020-03-09 14:59:53 +01:00
Virginie Ky
245cd894df update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 14:59:40 +01:00
Jim LAURIE
41695b3113
Merge branch 'master' into docs/one-click 2020-03-09 14:57:44 +01:00
Jim LAURIE
cd1a2112c0
Merge pull request #5476 from strapi/docs/add-settings-api
Add front-end settings API to documentation
2020-03-09 14:51:26 +01:00
Virginie Ky
4d193e282c remove useless file
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 14:41:58 +01:00
Alexandre BODIN
88400557ce
Merge pull request #5449 from strapi/media-lib/thumbnail
Media lib/thumbnail
2020-03-09 13:52:20 +01:00
Pierre Noël
b5f9795dbc small refacto of findOne + fix deleteMany of connector-mongoose
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-09 12:09:43 +01:00
Virginie Ky
85c94ea101 update unit tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 11:24:31 +01:00
Virginie Ky
762ac47fa8 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 2020-03-09 10:59:21 +01:00
virginieky
1698dfe98c Merge branch 'develop' into front/ui-improvements
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 10:57:49 +01:00
virginieky
1e91524fbc
Merge branch 'develop' into front/ui-improvements 2020-03-09 10:57:23 +01:00
Virginie Ky
8310bd01a6 reset yarn lock
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-09 10:55:20 +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
4b93599134
Merge pull request #5447 from strapi/docs-guide-count-graphql
Add count GraphQL guide
2020-03-09 09:08:29 +01:00
Alexandre BODIN
69c7021063
Merge branch 'master' into docs-guide-count-graphql 2020-03-09 09:08:20 +01:00
Alexandre Bodin
2d12f88394 Optimize file
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:05:43 +01:00
Alexandre Bodin
e0b1c1181e Change upload bootsrap comment
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:05:42 +01:00
Alexandre Bodin
8d025b89f3 Init optimization func and clean up code
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:05:42 +01:00
Alexandre Bodin
e6322e64dc Move util out of service
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:05:41 +01:00
Alexandre Bodin
5459981188 Update tests
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:04:32 +01:00
Alexandre Bodin
30f28d9ac7 Merge branch 'features/media-lib' into media-lib/thumbnail 2020-03-09 09:03:02 +01:00
Alexandre Bodin
587cdb5a05 Save thumbnail in forats json
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 09:02:51 +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
Alexandre Bodin
a70991a37e Update yarn.lock
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-08 22:25:13 +01:00
ScottAgirs
ac1364239a Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1
Signed-off-by: ScottAgirs <scott@ijs.to>
2020-03-07 13:08:45 -05: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
607e87431a Move util out of service
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-06 19:20:48 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-06 19:16:51 +01:00
Virginie Ky
a3644a42c7 Some alignment fixes
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-06 18:52:18 +01:00
Alexandre BODIN
8b50b046a1
Merge pull request #5398 from dstrants/patch-1
Fixes typo on mongo image
2020-03-06 17:36:41 +01: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
Virginie Ky
76f41a6ec0 Upload modal card
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-06 17:19:20 +01:00