Merge remote-tracking branch 'mainline/develop' into MAGETWO-56989
Showing
- app/code/Magento/Bundle/view/base/web/js/price-bundle.js 4 additions, 0 deletionsapp/code/Magento/Bundle/view/base/web/js/price-bundle.js
- app/code/Magento/Catalog/Block/Product/AbstractProduct.php 1 addition, 1 deletionapp/code/Magento/Catalog/Block/Product/AbstractProduct.php
- app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php 1 addition, 1 deletion...o/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
- app/code/Magento/Catalog/Model/Product/Image.php 1 addition, 2 deletionsapp/code/Magento/Catalog/Model/Product/Image.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/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php 23 additions, 22 deletions.../Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php 2 additions, 2 deletions...ode/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
- app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php 23 additions, 1 deletion...Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php 15 additions, 0 deletions.../Catalog/Ui/DataProvider/Product/Form/Modifier/Images.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/CatalogInventory/Setup/UpgradeData.php 1 addition, 1 deletionapp/code/Magento/CatalogInventory/Setup/UpgradeData.php
- app/code/Magento/CatalogInventory/etc/events.xml 0 additions, 3 deletionsapp/code/Magento/CatalogInventory/etc/events.xml
- app/code/Magento/CatalogInventory/etc/module.xml 1 addition, 1 deletionapp/code/Magento/CatalogInventory/etc/module.xml
- app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml 12 additions, 21 deletions...view/frontend/templates/product/widget/content/grid.phtml
- app/code/Magento/Checkout/Controller/Cart/CouponPost.php 11 additions, 20 deletionsapp/code/Magento/Checkout/Controller/Cart/CouponPost.php
- app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php 16 additions, 0 deletions...nto/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
- app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 6 additions, 3 deletions...e/Magento/Checkout/view/frontend/web/js/region-updater.js
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml 2 additions, 2 deletions.../Cms/view/adminhtml/templates/browser/content/files.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml 1 addition, 1 deletion...s/view/adminhtml/templates/browser/content/uploader.phtml
Please register or sign in to comment