Merge remote-tracking branch 'origin/MAGETWO-56072' into BUGS (61df5bc3) · Commits · KIII-12 / Magento

Commit 61df5bc3 authored 8 years ago by

Sviatoslav Mankivskyi

Browse files

Merge remote-tracking branch 'origin/MAGETWO-56072' into BUGS

parents bbfff315 ee8dba2b

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Product/View/Gallery.php 2 additions, 4 deletions

app/code/Magento/Catalog/Block/Product/View/Gallery.php
app/code/Magento/Catalog/Helper/Image.php 5 additions, 9 deletions

app/code/Magento/Catalog/Helper/Image.php
app/code/Magento/Catalog/Model/Product/Image.php 100 additions, 99 deletions

app/code/Magento/Catalog/Model/Product/Image.php
app/code/Magento/Catalog/Model/View/Asset/Image.php 191 additions, 0 deletions

app/code/Magento/Catalog/Model/View/Asset/Image.php
app/code/Magento/Catalog/Model/View/Asset/Image/Context.php 59 additions, 0 deletions

app/code/Magento/Catalog/Model/View/Asset/Image/Context.php
app/code/Magento/Catalog/Model/View/Asset/Placeholder.php 181 additions, 0 deletions

app/code/Magento/Catalog/Model/View/Asset/Placeholder.php
app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php 2 additions, 15 deletions

...ento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php
app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php 0 additions, 10 deletions

app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 103 additions, 34 deletions

...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
app/code/Magento/Catalog/Test/Unit/Model/View/Asset/Image/ContextTest.php 76 additions, 0 deletions

.../Catalog/Test/Unit/Model/View/Asset/Image/ContextTest.php
app/code/Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php 148 additions, 0 deletions

.../Magento/Catalog/Test/Unit/Model/View/Asset/ImageTest.php
app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php 163 additions, 0 deletions

...to/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
app/code/Magento/Catalog/etc/di.xml 2 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/ConfigurableProduct/Helper/Data.php 2 additions, 4 deletions

app/code/Magento/ConfigurableProduct/Helper/Data.php
app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php 66 additions, 6 deletions

...Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
app/code/Magento/Swatches/Helper/Data.php 2 additions, 4 deletions

app/code/Magento/Swatches/Helper/Data.php
app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php 2 additions, 11 deletions

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
app/design/frontend/Magento/blank/etc/view.xml 8 additions, 0 deletions

app/design/frontend/Magento/blank/etc/view.xml
app/design/frontend/Magento/luma/etc/view.xml 8 additions, 0 deletions

app/design/frontend/Magento/luma/etc/view.xml
dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php 9 additions, 2 deletions

...ion/testsuite/Magento/Catalog/Model/Product/ImageTest.php

with 1129 additions and 198 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/MAGETWO-56072' into BUGS