Merge remote-tracking branch 'mainline/develop' into MAGETWO-56989
Showing
- app/code/Magento/Authorizenet/Model/Authorizenet.php 2 additions, 2 deletionsapp/code/Magento/Authorizenet/Model/Authorizenet.php
- app/code/Magento/Authorizenet/Model/Directpost/Request.php 2 additions, 2 deletionsapp/code/Magento/Authorizenet/Model/Directpost/Request.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php 46 additions, 24 deletions...agento/Backend/Block/Widget/Grid/Column/Renderer/Text.php
- 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/view/adminhtml/web/js/vault.js 1 addition, 1 deletionapp/code/Magento/Braintree/view/adminhtml/web/js/vault.js
- app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php 4 additions, 4 deletions...code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
- app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php 2 additions, 1 deletion...Magento/CatalogWidget/Block/Product/Widget/Conditions.php
- app/code/Magento/CatalogWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php 113 additions, 0 deletions...gWidget/Test/Unit/Block/Product/Widget/ConditionsTest.php
- app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml 2 additions, 0 deletions...dexer/view/adminhtml/layout/indexer_indexer_list_grid.xml
- app/code/Magento/OfflineShipping/Model/Quote/Address/FreeShipping.php 7 additions, 4 deletions...ento/OfflineShipping/Model/Quote/Address/FreeShipping.php
- app/code/Magento/OfflineShipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php 111 additions, 0 deletions...ipping/Test/Unit/Model/Quote/Address/FreeShippingTest.php
- app/code/Magento/Sales/Block/Status/Grid/Column/State.php 2 additions, 1 deletionapp/code/Magento/Sales/Block/Status/Grid/Column/State.php
- app/code/Magento/Sales/Model/Order/Config.php 18 additions, 0 deletionsapp/code/Magento/Sales/Model/Order/Config.php
- app/code/Magento/Sales/Setup/UpgradeSchema.php 3 additions, 2 deletionsapp/code/Magento/Sales/Setup/UpgradeSchema.php
- app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php 91 additions, 0 deletions...to/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php
- app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php 36 additions, 2 deletionsapp/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
- app/code/Magento/Ui/Component/MassAction/Filter.php 59 additions, 14 deletionsapp/code/Magento/Ui/Component/MassAction/Filter.php
- app/code/Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php 289 additions, 0 deletions.../Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php
- app/code/Magento/Vault/Setup/UpgradeData.php 9 additions, 26 deletionsapp/code/Magento/Vault/Setup/UpgradeData.php
- app/code/Magento/Vault/view/adminhtml/web/js/vault.js 13 additions, 5 deletionsapp/code/Magento/Vault/view/adminhtml/web/js/vault.js
Please register or sign in to comment