Merge pull request #373 from magento-dragons/epam-swatches
[Epam - Swatches] Merge pull requests (EE: #5, CE: #10)
Showing
- app/code/Magento/Catalog/Block/Product/AbstractProduct.php 44 additions, 0 deletionsapp/code/Magento/Catalog/Block/Product/AbstractProduct.php
- app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml 3 additions, 0 deletions...to/Catalog/view/frontend/layout/catalog_category_view.xml
- app/code/Magento/Catalog/view/frontend/templates/product/list.phtml 3 additions, 2 deletions...agento/Catalog/view/frontend/templates/product/list.phtml
- app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml 3 additions, 0 deletions...ch/view/frontend/layout/catalogsearch_advanced_result.xml
- app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml 3 additions, 0 deletions...earch/view/frontend/layout/catalogsearch_result_index.xml
- app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php 51 additions, 11 deletions...ento/ConfigurableProduct/Model/SuggestedAttributeList.php
- app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php 37 additions, 2 deletions...bleProduct/Test/Unit/Model/SuggestedAttributeListTest.php
- app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php 1 addition, 1 deletion...to/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
- app/design/frontend/Magento/blank/etc/view.xml 8 additions, 0 deletionsapp/design/frontend/Magento/blank/etc/view.xml
- app/design/frontend/Magento/luma/etc/view.xml 8 additions, 0 deletionsapp/design/frontend/Magento/luma/etc/view.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php 1 addition, 1 deletion...nto/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
- dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php 2 additions, 1 deletion...tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
Please register or sign in to comment