Merge branch 'm-develop' into MAGETWO-60453
Showing
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 115 additions, 30 deletions...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Media.php 5 additions, 10 deletions...alogImportExport/Model/Import/Product/Validator/Media.php
- app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php 26 additions, 3 deletions...rt/Test/Unit/Model/Import/Product/Validator/MediaTest.php
- app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php 37 additions, 0 deletions...atalogImportExport/Test/Unit/Model/Import/ProductTest.php
- app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php 6 additions, 1 deletion...Rewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
- app/code/Magento/Checkout/Controller/Cart/CouponPost.php 11 additions, 20 deletionsapp/code/Magento/Checkout/Controller/Cart/CouponPost.php
- app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php 16 additions, 0 deletions...nto/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
- app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php 23 additions, 3 deletionsapp/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
- app/code/Magento/Cms/Setup/UpgradeData.php 7 additions, 1 deletionapp/code/Magento/Cms/Setup/UpgradeData.php
- app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php 67 additions, 107 deletions...ento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
- app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php 133 additions, 0 deletions...ewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
- app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml 2 additions, 1 deletion...nd/templates/product/view/type/options/configurable.phtml
- app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 43 additions, 37 deletions.../ConfigurableProduct/view/frontend/web/js/configurable.js
- app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php 39 additions, 39 deletions.../Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
- app/code/Magento/Customer/Model/Account/Redirect.php 12 additions, 2 deletionsapp/code/Magento/Customer/Model/Account/Redirect.php
- app/code/Magento/Customer/Model/Url.php 35 additions, 4 deletionsapp/code/Magento/Customer/Model/Url.php
- app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php 14 additions, 1 deletion...Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
- app/code/Magento/Eav/Model/AttributeManagement.php 29 additions, 4 deletionsapp/code/Magento/Eav/Model/AttributeManagement.php
- app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php 18 additions, 0 deletions...e/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
- app/code/Magento/Sales/Model/Order/Payment.php 1 addition, 1 deletionapp/code/Magento/Sales/Model/Order/Payment.php
Please register or sign in to comment