There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/MAGETWO-47017' into troll_bugfix
Showing
- app/code/Magento/Catalog/Block/Product/AbstractProduct.php 1 addition, 1 deletionapp/code/Magento/Catalog/Block/Product/AbstractProduct.php
- app/code/Magento/Catalog/Model/Product/Type/AbstractType.php 11 additions, 0 deletionsapp/code/Magento/Catalog/Model/Product/Type/AbstractType.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php 2 additions, 2 deletions...gento/Catalog/Test/Unit/Block/Product/ListProductTest.php
- app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js 11 additions, 0 deletions...gento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
- app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php 15 additions, 0 deletions...o/ConfigurableProduct/Model/Product/Type/Configurable.php
- app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml 12 additions, 10 deletions...es/view/frontend/templates/product/listing/renderer.phtml
- app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js 17 additions, 0 deletions...ento/Swatches/view/frontend/web/js/catalog-add-to-cart.js
- app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js 17 additions, 1 deletion.../Magento/Swatches/view/frontend/web/js/swatch-renderer.js
- dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php 18 additions, 0 deletions...nto/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProduct/Curl.php 1 addition, 1 deletion...igurableProduct/Test/Handler/ConfigurableProduct/Curl.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ListProduct.php 30 additions, 0 deletions...s/app/Magento/Swatches/Test/Block/Product/ListProduct.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php 71 additions, 0 deletions...o/Swatches/Test/Block/Product/ProductList/ProductItem.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ViewWithSwatches.php 45 additions, 0 deletions.../Magento/Swatches/Test/Block/Product/ViewWithSwatches.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Constraint/AssertSwatchConfigurableProductPage.php 97 additions, 0 deletions...s/Test/Constraint/AssertSwatchConfigurableProductPage.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/Cart/Item.php 17 additions, 0 deletions...nal/tests/app/Magento/Swatches/Test/Fixture/Cart/Item.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/ConfigurableProduct.xml 16 additions, 0 deletions...app/Magento/Swatches/Test/Fixture/ConfigurableProduct.xml
- dev/tests/functional/tests/app/Magento/Swatches/Test/Fixture/SwatchProductAttribute.xml 16 additions, 0 deletions.../Magento/Swatches/Test/Fixture/SwatchProductAttribute.xml
- dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php 49 additions, 0 deletions...nto/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/SwatchProductAttributeInterface.php 17 additions, 0 deletions...watchProductAttribute/SwatchProductAttributeInterface.php
- dev/tests/functional/tests/app/Magento/Swatches/Test/Page/Category/CatalogCategoryView.xml 12 additions, 0 deletions...gento/Swatches/Test/Page/Category/CatalogCategoryView.xml
Please register or sign in to comment