Merge remote-tracking branch 'mainline/develop' into bugs
Showing
- app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php 7 additions, 2 deletions...Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
- app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php 159 additions, 143 deletions.../Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml 1 addition, 1 deletion...templates/product/composite/fieldset/options/bundle.phtml
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php 3 additions, 1 deletion...to/Catalog/Controller/Adminhtml/Category/Image/Upload.php
- app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php 30 additions, 8 deletions...de/Magento/Catalog/Controller/Adminhtml/Category/Save.php
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 20 additions, 6 deletions...og/Controller/Adminhtml/Product/Initialization/Helper.php
- app/code/Magento/Catalog/Model/Category.php 5 additions, 5 deletionsapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php 49 additions, 15 deletions...agento/Catalog/Model/Category/Attribute/Backend/Image.php
- app/code/Magento/Catalog/Model/Category/DataProvider.php 28 additions, 5 deletionsapp/code/Magento/Catalog/Model/Category/DataProvider.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php 6 additions, 1 deletion...agento/Catalog/Model/ResourceModel/Product/Collection.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php 68 additions, 0 deletions...t/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php 109 additions, 72 deletions...alog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 83 additions, 138 deletions...ontroller/Adminhtml/Product/Initialization/HelperTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php 293 additions, 0 deletions.../Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
- app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php 175 additions, 85 deletionsapp/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php 94 additions, 8 deletions.../Test/Unit/Model/ResourceModel/Product/CollectionTest.php
- app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html 5 additions, 0 deletions...t/view/frontend/web/template/billing-address/details.html
- app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html 5 additions, 0 deletions...b/template/shipping-address/address-renderer/default.html
- app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html 5 additions, 0 deletions...mplate/shipping-information/address-renderer/default.html
- app/code/Magento/PageCache/etc/events.xml 0 additions, 5 deletionsapp/code/Magento/PageCache/etc/events.xml
Please register or sign in to comment