Merge remote-tracking branch 'upstream/develop' into pr
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/Catalog/Model/Product/Gallery/GalleryManagement.php 4 additions, 1 deletion...gento/Catalog/Model/Product/Gallery/GalleryManagement.php
- app/code/Magento/Catalog/Model/Product/Gallery/Processor.php 2 additions, 2 deletionsapp/code/Magento/Catalog/Model/Product/Gallery/Processor.php
- app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php 20 additions, 11 deletionsapp/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/GalleryManagementTest.php 16 additions, 3 deletions...Test/Unit/Model/Product/Gallery/GalleryManagementTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.php 52 additions, 0 deletions...Catalog/Test/Unit/Model/Product/Gallery/ProcessorTest.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/ConfigurableProduct/Block/Product/View/Type/Configurable.php 24 additions, 2 deletions...figurableProduct/Block/Product/View/Type/Configurable.php
- app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php 25 additions, 0 deletions...gento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
- app/code/Magento/ConfigurableProduct/view/base/layout/catalog_product_prices.xml 4 additions, 0 deletions...urableProduct/view/base/layout/catalog_product_prices.xml
- app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml 26 additions, 0 deletions...roduct/view/base/templates/product/price/tier_price.phtml
- app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 33 additions, 2 deletions.../ConfigurableProduct/view/frontend/web/js/configurable.js
- 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
Please register or sign in to comment