15371 Commits

Author SHA1 Message Date
Alexandre BODIN
a13b7b0d5a
Merge pull request #5426 from nazrdogan/patch-1
fix typo
2020-03-12 09:33:12 +01:00
Alexandre BODIN
1a86d4395e
Merge pull request #5407 from ScottAgirs/patch-1
Minor typo fixes
2020-03-12 09:31:44 +01:00
Alexandre Bodin
32c021db37 Remove allowedType all option
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-12 09:29:01 +01:00
Alexandre BODIN
f2d92e72fc
Merge pull request #5487 from strapi/media-lib/refactoring
Media lib/refactoring
2020-03-12 09:28:23 +01:00
soupette
485faf352f Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-12 09:21:18 +01:00
Virginie Ky
f9574aac62 refacto
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-11 22:53:27 +01:00
Virginie Ky
8ed0849432 delete multiple medias
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-11 22:50:02 +01:00
Alexandre BODIN
78735792d7
Merge pull request #5486 from fodkastir/master
fix #5399 Strapi is not using the configured host when launching the server
2020-03-11 17:07:40 +01:00
soupette
ec47ad9b92 Remove
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-10 17:54:11 +01:00
soupette
d0841bc8b7 Remove useless ct
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-10 17:53:44 +01:00
Alexandre Bodin
02d042769f Remove file sha that was not standard
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-10 17:26:15 +01:00
Yen
222903baab use host value defined in config when launching server
Signed-off-by: Yen <fodkastir@gmail.com>
2020-03-10 11:01:56 -05:00
Jim LAURIE
6ef529b3a1 docs: rewrite sentence
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
2020-03-10 17:01:44 +01:00
Virginie Ky
f0240a2c5e reset yarn.lock
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-10 16:54:54 +01:00
Virginie Ky
eb4287a91f reset yarn.lock
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-10 16:53:02 +01:00
Jim LAURIE
11aeae4dc7 docs: add single type examples
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
2020-03-10 16:47:41 +01:00
Pierre Noël
15f4ae67d7 add test for replaceIdByPrimaryKey
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-10 16:44:28 +01:00
Virginie Ky
03d290ba73 image crop and other files display
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-10 16:32:12 +01:00
Virginie Ky
b1e184833b Merge branch 'features/media-lib' of github.com:strapi/strapi into front/card-preview-integration 2020-03-10 14:31:00 +01:00
soupette
82baebe930 Update buffet
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-10 14:01:44 +01:00
Alexandre BODIN
204044d250
Merge branch 'master' into fix/#4881/cantDisableOrOverrideRootPage 2020-03-10 12:13:55 +01:00
soupette
28c57d8af4 Temporarily fix input file until media lib is ok
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-10 11:50:48 +01:00
Virginie Ky
d00e806245 simplify handleSelectAll
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-10 11:37:13 +01:00
Virginie Ky
503df37fec Error state with icon and message ui
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-10 11:32:52 +01:00
soupette
819a403340 Created temp input file
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-10 10:25:24 +01:00
Pierre Noël
53d38433b5 set /public defer to false
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-10 09:36:04 +01:00
Ky
a735697f99 clean reducer
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-10 01:27:59 +01:00
Ky
3189cc656a ListView Select and unselect all
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-10 01:24:49 +01:00
Ky
b1446ec82a clean
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-10 00:37:14 +01:00
Ky
762cb6bba6 generalize img card
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-10 00:27:18 +01:00
Alexandre Bodin
2b5c332e09 Clean up
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 22:11:56 +01:00
Alexandre BODIN
f9d924dd47
Merge pull request #5473 from strapi/media-lib/responsive-dimensions
Add responsive formats to the upload plugin
2020-03-09 22:11:27 +01:00
Alexandre Bodin
571e829b7a Fix typos
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-09 21:52:23 +01:00
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