Merge remote-tracking branch 'mainline/develop' into bugs
Showing
- app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 2 deletionsapp/code/Magento/Braintree/etc/adminhtml/system.xml
- app/code/Magento/Braintree/view/adminhtml/web/styles.css 2 additions, 2 deletionsapp/code/Magento/Braintree/view/adminhtml/web/styles.css
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 39 additions, 1 deletion...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php 9 additions, 0 deletions...ogImportExport/Model/Import/Product/Type/AbstractType.php
- app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php 60 additions, 0 deletions...ento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
- app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php 137 additions, 0 deletions...bleProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
- app/code/Magento/ConfigurableProduct/view/base/layout/catalog_product_prices.xml 21 additions, 0 deletions...urableProduct/view/base/layout/catalog_product_prices.xml
- app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml 60 additions, 0 deletions...oduct/view/base/templates/product/price/final_price.phtml
- app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 20 additions, 1 deletion.../ConfigurableProduct/view/frontend/web/js/configurable.js
- app/code/Magento/Customer/view/base/ui_component/customer_form.xml 4 additions, 0 deletions...Magento/Customer/view/base/ui_component/customer_form.xml
- app/code/Magento/Email/Model/Template/Css/Processor.php 67 additions, 0 deletionsapp/code/Magento/Email/Model/Template/Css/Processor.php
- app/code/Magento/Email/Model/Template/Filter.php 49 additions, 2 deletionsapp/code/Magento/Email/Model/Template/Filter.php
- app/code/Magento/Email/Test/Unit/Model/Template/Css/ProcessorTest.php 59 additions, 0 deletions...ento/Email/Test/Unit/Model/Template/Css/ProcessorTest.php
- app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php 93 additions, 6 deletions...ode/Magento/Email/Test/Unit/Model/Template/FilterTest.php
- app/code/Magento/Multishipping/Block/Checkout/Billing.php 4 additions, 2 deletionsapp/code/Magento/Multishipping/Block/Checkout/Billing.php
- app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php 43 additions, 0 deletionsapp/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
- app/code/Magento/Payment/Api/PaymentMethodListInterface.php 30 additions, 0 deletionsapp/code/Magento/Payment/Api/PaymentMethodListInterface.php
- app/code/Magento/Payment/Block/Form/Container.php 64 additions, 9 deletionsapp/code/Magento/Payment/Block/Form/Container.php
- app/code/Magento/Payment/Helper/Data.php 1 addition, 0 deletionsapp/code/Magento/Payment/Helper/Data.php
- app/code/Magento/Payment/Model/Method/InstanceFactory.php 42 additions, 0 deletionsapp/code/Magento/Payment/Model/Method/InstanceFactory.php
Please register or sign in to comment