Merge branch 'mainline-develop' into MAGETWO-56350
Showing
- app/code/Magento/Catalog/Helper/Product/Compare.php 4 additions, 0 deletionsapp/code/Magento/Catalog/Helper/Product/Compare.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php 22 additions, 1 deletion...ento/Catalog/Model/ResourceModel/Product/Option/Value.php
- app/code/Magento/Catalog/Test/Unit/Helper/Product/CompareTest.php 6 additions, 2 deletions.../Magento/Catalog/Test/Unit/Helper/Product/CompareTest.php
- app/code/Magento/Catalog/view/frontend/requirejs-config.js 0 additions, 1 deletionapp/code/Magento/Catalog/view/frontend/requirejs-config.js
- app/code/Magento/Catalog/view/frontend/web/js/compare.js 0 additions, 36 deletionsapp/code/Magento/Catalog/view/frontend/web/js/compare.js
- app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js 11 additions, 16 deletions...nto/Catalog/view/frontend/web/js/view/compare-products.js
- app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php 39 additions, 13 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
- app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php 43 additions, 4 deletions...Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
- app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php 23 additions, 1 deletion...o/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
- app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml 1 addition, 1 deletion...to/Sales/view/adminhtml/templates/order/create/form.phtml
- app/code/Magento/SalesRule/etc/di.xml 1 addition, 1 deletionapp/code/Magento/SalesRule/etc/di.xml
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php 14 additions, 0 deletions...agento/Catalog/Test/Block/Product/Compare/ListCompare.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php 14 additions, 0 deletions...pp/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
- dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php 15 additions, 4 deletions...tegration/testsuite/Magento/Catalog/Model/ProductTest.php
- dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options.php 114 additions, 0 deletions...nto/Catalog/_files/product_simple_with_custom_options.php
- dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options_rollback.php 26 additions, 0 deletions...og/_files/product_simple_with_custom_options_rollback.php
- dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates.php 28 additions, 0 deletions...n/testsuite/Magento/OfflineShipping/_files/tablerates.php
- dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates_rollback.php 12 additions, 0 deletions...te/Magento/OfflineShipping/_files/tablerates_rollback.php
- dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php 95 additions, 0 deletions...uite/Magento/Quote/Model/ShippingMethodManagementTest.php
- dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt 0 additions, 5 deletions...ic/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
Please register or sign in to comment