Merge branch 'develop' of https://github.com/magento-frontend/magento2ce into MAGETWO-57210
Showing
- app/code/Magento/Backend/etc/config.xml 3 additions, 0 deletionsapp/code/Magento/Backend/etc/config.xml
- app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php 5 additions, 0 deletions...gento/Catalog/Controller/Adminhtml/Product/MassStatus.php
- app/code/Magento/Catalog/Model/Category.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Product.php 2 additions, 2 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File.php 14 additions, 4 deletionsapp/code/Magento/Catalog/Model/Product/Option/Type/File.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/Block/Product/ViewTest.php 3 additions, 3 deletions...code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 6 additions, 2 deletions...ontroller/Adminhtml/Product/Initialization/HelperTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php 102 additions, 36 deletions...Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php 22 additions, 4 deletions...to/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php 3 additions, 3 deletions.../Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php 30 additions, 11 deletions.../Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 10 additions, 10 deletionsapp/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
- app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/frontend/di.xml 0 additions, 3 deletionsapp/code/Magento/Catalog/etc/frontend/di.xml
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 34 additions, 15 deletions...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 10 additions, 3 deletions...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogInventory/Helper/Stock.php 4 additions, 1 deletionapp/code/Magento/CatalogInventory/Helper/Stock.php
- app/code/Magento/CatalogInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php 1 addition, 1 deletion...logInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php
- app/code/Magento/Cms/Model/Block.php 2 additions, 2 deletionsapp/code/Magento/Cms/Model/Block.php
Please register or sign in to comment