Merge remote-tracking branch 'mainline/develop' into pr-develop (88690dc0) · Commits · KIII-12 / Magento

Commit 88690dc0 authored 8 years ago by

Karpenko, Oleksandr

Browse files

Merge remote-tracking branch 'mainline/develop' into pr-develop

parents d6854d28 732d445f

Branches

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/Category/DataProvider.php 32 additions, 2 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/Model/Category/FileInfo.php 107 additions, 0 deletions

app/code/Magento/Catalog/Model/Category/FileInfo.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/Category/DataProviderTest.php 320 additions, 0 deletions

...nto/Catalog/Test/Unit/Model/Category/DataProviderTest.php
app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php 114 additions, 0 deletions

...Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.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/Catalog/view/adminhtml/web/template/image-preview.html 1 addition, 0 deletions

...to/Catalog/view/adminhtml/web/template/image-preview.html
app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php 3 additions, 0 deletions

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
app/code/Magento/ConfigurableProduct/Helper/Data.php 2 additions, 4 deletions

app/code/Magento/ConfigurableProduct/Helper/Data.php

with 1611 additions and 177 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into pr-develop