Merge remote-tracking branch 'origin/develop' into MAGETWO-57963
Showing
- 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/Deploy/Console/Command/DeployStaticContentCommand.php 25 additions, 5 deletions...nto/Deploy/Console/Command/DeployStaticContentCommand.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
- 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/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
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml 2 additions, 2 deletions...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php 1 addition, 0 deletions...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml 2 additions, 2 deletions...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php 1 addition, 0 deletions...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml 2 additions, 4 deletions...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml 2 additions, 2 deletions...Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
Please register or sign in to comment