Merge remote-tracking branch 'origin/develop' into PR
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/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php 6 additions, 0 deletions...o/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
- 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/Controller/Adminhtml/Product/Set/Save.php 3 additions, 0 deletions...Magento/Catalog/Controller/Adminhtml/Product/Set/Save.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/Product/Attribute/Backend/Sku.php 4 additions, 1 deletion...e/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
- app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php 22 additions, 2 deletions...e/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
- app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php 11 additions, 6 deletionsapp/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
- app/code/Magento/Catalog/Model/ResourceModel/Category.php 3 additions, 1 deletionapp/code/Magento/Catalog/Model/ResourceModel/Category.php
- app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php 4 additions, 7 deletions...ode/Magento/Catalog/Model/ResourceModel/Eav/Attribute.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/Model/ResourceModel/Product/Link.php 24 additions, 0 deletions...code/Magento/Catalog/Model/ResourceModel/Product/Link.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
Please register or sign in to comment