Merge commit 'refs/pull/5978/head' of https://github.com/magento/magento2 into MAGETWO-57989
Showing
- 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 31 additions, 35 deletions...de/Magento/Catalog/Controller/Adminhtml/Category/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 50 additions, 16 deletions...agento/Catalog/Model/Category/Attribute/Backend/Image.php
- app/code/Magento/Catalog/Model/Category/DataProvider.php 26 additions, 5 deletionsapp/code/Magento/Catalog/Model/Category/DataProvider.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php 72 additions, 0 deletions...t/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php 92 additions, 1 deletion...alog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php 296 additions, 0 deletions.../Test/Unit/Model/Category/Attribute/Backend/ImageTest.php
- app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php 96 additions, 24 deletionsapp/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
- app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js 8 additions, 2 deletions...Magento/Ui/view/base/web/js/form/element/file-uploader.js
Please register or sign in to comment