Merge branch 'develop' of github.com:magento/magento2ce into pr-develop
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/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/CatalogImportExport/Model/Export/Product.php 21 additions, 2 deletions...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 105 additions, 3 deletions...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php 16 additions, 14 deletions...ogImportExport/Model/Import/Product/Type/AbstractType.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php 33 additions, 15 deletions...to/CatalogImportExport/Model/Import/Product/Validator.php
- app/code/Magento/CatalogInventory/Helper/Stock.php 4 additions, 1 deletionapp/code/Magento/CatalogInventory/Helper/Stock.php
- app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php 10 additions, 0 deletions...Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
- app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php 10 additions, 0 deletions...Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
- app/code/Magento/ImportExport/Model/Export.php 5 additions, 0 deletionsapp/code/Magento/ImportExport/Model/Export.php
- app/code/Magento/ImportExport/Model/Import.php 5 additions, 0 deletionsapp/code/Magento/ImportExport/Model/Import.php
- app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml 3 additions, 0 deletions...tExport/view/adminhtml/templates/export/form/before.phtml
- app/code/Magento/Ui/view/base/web/js/grid/data-storage.js 4 additions, 0 deletionsapp/code/Magento/Ui/view/base/web/js/grid/data-storage.js
- dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml 5 additions, 5 deletions...agento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
- dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php 19 additions, 0 deletions...o/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php 1 addition, 0 deletions...Braintree/Test/TestCase/BraintreeSettlementReportTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml 1 addition, 1 deletion...Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php 1 addition, 0 deletions...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
Please register or sign in to comment