merge magento/2.2-develop into magento-helix/MAGETWO-80811
Showing
- app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php 1 addition, 1 deletion...de/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
- app/code/Magento/Backend/etc/adminhtml/di.xml 5 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Bundle/Model/OptionRepository.php 1 addition, 1 deletionapp/code/Magento/Bundle/Model/OptionRepository.php
- app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 1 addition, 1 deletion...e/Magento/Checkout/view/frontend/web/js/region-updater.js
- app/code/Magento/Review/Block/Product/ReviewRenderer.php 4 additions, 3 deletionsapp/code/Magento/Review/Block/Product/ReviewRenderer.php
- app/code/Magento/Search/view/frontend/web/form-mini.js 42 additions, 38 deletionsapp/code/Magento/Search/view/frontend/web/form-mini.js
- app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php 78 additions, 5 deletionsapp/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
- app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php 89 additions, 2 deletions...to/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
- app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js 39 additions, 3 deletionsapp/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
- app/code/Magento/Ui/view/base/web/js/grid/provider.js 8 additions, 1 deletionapp/code/Magento/Ui/view/base/web/js/grid/provider.js
- app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js 1 addition, 1 deletionapp/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
- dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php 12 additions, 0 deletions...app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php 4 additions, 0 deletions...app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGridIsRendered.php 39 additions, 0 deletions...o/Catalog/Test/Constraint/AssertProductGridIsRendered.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertResetFilterMessage.php 38 additions, 0 deletions...ento/Catalog/Test/Constraint/AssertResetFilterMessage.php
- dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml 30 additions, 0 deletions.../Test/TestCase/Product/GridFilteringDeletedEntityTest.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml 37 additions, 0 deletions...nfigurableProduct/Test/Repository/ConfigurableProduct.xml
- dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml 21 additions, 0 deletions...duct/Test/Repository/ConfigurableProduct/CheckoutData.xml
- dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php 24 additions, 0 deletions...agento/Reports/Test/Block/Adminhtml/Product/Sold/Grid.php
- dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductReportForConfigurableProduct.php 58 additions, 0 deletions...aint/AssertOrderedProductReportForConfigurableProduct.php
Please register or sign in to comment