Merge branch 'develop' of https://github.com/magento-frontend/magento2ce into MAGETWO-55594-2.2
Showing
- .htaccess 24 additions, 0 deletions.htaccess
- .user.ini 4 additions, 0 deletions.user.ini
- app/code/Magento/Backend/Block/Store/Switcher.php 1 addition, 7 deletionsapp/code/Magento/Backend/Block/Store/Switcher.php
- app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php 53 additions, 0 deletions...de/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
- app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml 5 additions, 2 deletions...inhtml/templates/system/shipping/applicable_country.phtml
- app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html 2 additions, 2 deletions...ackend/view/adminhtml/web/template/dynamic-rows/grid.html
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 4 additions, 8 deletions...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php 1 addition, 1 deletion...undle/Ui/DataProvider/Product/Form/Modifier/Composite.php
- app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-option-qty.js 16 additions, 4 deletions...dle/view/adminhtml/web/js/components/bundle-option-qty.js
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml 1 addition, 1 deletion...es/catalog/product/view/type/bundle/option/checkbox.phtml
- app/code/Magento/Captcha/view/adminhtml/templates/default.phtml 8 additions, 7 deletions...de/Magento/Captcha/view/adminhtml/templates/default.phtml
- app/code/Magento/Captcha/view/frontend/templates/default.phtml 8 additions, 7 deletions...ode/Magento/Captcha/view/frontend/templates/default.phtml
- app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php 2 additions, 26 deletions...g/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
- app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php 19 additions, 28 deletions...e/Magento/Catalog/Console/Command/ImagesResizeCommand.php
- app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php 1 addition, 1 deletion...ento/Catalog/Console/Command/ProductAttributesCleanUp.php
- app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php 3 additions, 0 deletions...gento/Catalog/Model/Product/Gallery/GalleryManagement.php
- app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php 1 addition, 1 deletion...ode/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php 2 additions, 0 deletions...g/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
- app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php 6 additions, 29 deletions...ock/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
- app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php 4 additions, 3 deletions...log/Test/Unit/Console/Command/ImagesResizeCommandTest.php
Please register or sign in to comment