15371 Commits

Author SHA1 Message Date
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
Alexandre Bodin
c567616ba8 Resize only when necessary
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-06 17:01:33 +01:00
Alexandre Bodin
2e0913d5d5 Support thumbnail replacement
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-06 17:01:32 +01:00
Alexandre Bodin
b144b19372 Add thumbnail on upload and handle deletion
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-06 17:01:32 +01:00
Alexandre Bodin
8f6903ac52 Init image manipulation, add dimensions
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-06 17:01:31 +01:00
Gambhiro
eace943edc remove parts not specific to deployment 2020-03-06 15:57:13 +00:00
cyril lopez
12da5a4493
Merge pull request #5443 from strapi/chore/identify-doc-frontend-file-to-update
Identify doc frontend file to update
2020-03-06 16:01:57 +01:00
Pierre Noël
2d677be6b4 Add possibility to delete index.html + remove use of production.html
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-06 15:24:43 +01: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
Alexandre BODIN
ca1ecdac69
Merge pull request #5446 from strapi/update/lodash
Update lodash to fix security issues
2020-03-06 15:07:10 +01:00
Derrick Mehaffy
615bb166c3
Update lodash to fix security issues
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2020-03-06 06:42:35 -07:00
soupette
34bf5c43fa Merge branch 'features/media-lib' of github.com:strapi/strapi into chore/identify-doc-frontend-file-to-update
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 13:58:01 +01:00
soupette
faa1873003 Update doc
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 13:44:54 +01:00
soupette
5b5bd67e07 Use override file for dateFormats
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 13:36:17 +01:00
soupette
f3bcddcf89 Identify front-end core files
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 13:33:32 +01:00
Alexandre BODIN
d867e55533
Merge pull request #5430 from strapi/media-lib/upload-allowed-type
Add Upload allowed type parameter and option to replace an image
2020-03-06 13:28:45 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
cyril lopez
15a1578a2d
Merge pull request #5431 from strapi/core/admin-field-api
Introducing the front-end Field API
2020-03-06 11:43:20 +01:00