Merge remote-tracking branch 'mainline/develop' into MAGETWO-60420-remove-unserialize-from-menu (7b76e12c) · Commits · KIII-12 / Magento

Commit 7b76e12c authored 8 years ago by

Olga Kopylova

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-60420-remove-unserialize-from-menu

parents a859802f b5b1a667

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/composer.json 3 additions, 0 deletions

app/code/Magento/Authorizenet/composer.json
app/code/Magento/Authorizenet/etc/di.xml 10 additions, 0 deletions

app/code/Magento/Authorizenet/etc/di.xml
app/code/Magento/Backend/Block/Cache/Grid/Massaction/ProductionModeVisibilityChecker.php 36 additions, 0 deletions

...Cache/Grid/Massaction/ProductionModeVisibilityChecker.php
app/code/Magento/Backend/Block/Widget/Grid/Massaction.php 1 addition, 4 deletions

app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php 20 additions, 6 deletions

...ckend/Block/Widget/Grid/Massaction/AbstractMassaction.php
app/code/Magento/Backend/Block/Widget/Grid/Massaction/VisibilityCheckerInterface.php 18 additions, 0 deletions

...ock/Widget/Grid/Massaction/VisibilityCheckerInterface.php
app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php 40 additions, 3 deletions

...agento/Backend/Controller/Adminhtml/Cache/MassDisable.php
app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php 40 additions, 3 deletions

...Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php 134 additions, 66 deletions

...to/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php 224 additions, 0 deletions

.../Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php 224 additions, 0 deletions

...d/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
app/code/Magento/Backend/etc/di.xml 18 additions, 0 deletions

app/code/Magento/Backend/etc/di.xml
app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml 2 additions, 0 deletions

...o/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
app/code/Magento/Braintree/etc/di.xml 14 additions, 2 deletions

app/code/Magento/Braintree/etc/di.xml
app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php 26 additions, 6 deletions

...Model/ResourceModel/Product/StatusBaseSelectProcessor.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php 37 additions, 10 deletions

...l/ResourceModel/Product/StatusBaseSelectProcessorTest.php
app/code/Magento/CatalogRule/Model/Rule.php 2 additions, 8 deletions

app/code/Magento/CatalogRule/Model/Rule.php
app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php 1 addition, 1 deletion

...code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
app/code/Magento/Checkout/etc/di.xml 7 additions, 0 deletions

app/code/Magento/Checkout/etc/di.xml
app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js 1 addition, 1 deletion

...de/Magento/Checkout/view/frontend/web/js/view/shipping.js

with 858 additions and 110 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-60420-remove-unserialize-from-menu