Merge remote-tracking branch 'upstream/develop' into MAGETWO-53353-refactor-escaper
Showing
- ISSUE_TEMPLATE.md 22 additions, 14 deletionsISSUE_TEMPLATE.md
- app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php 51 additions, 3 deletions...g/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
- app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php 12 additions, 0 deletionsapp/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
- app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php 113 additions, 3 deletions...ock/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
- app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php 33 additions, 0 deletions...to/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php 1 addition, 1 deletion...Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
- app/code/Magento/Catalog/i18n/en_US.csv 1 addition, 0 deletionsapp/code/Magento/Catalog/i18n/en_US.csv
- app/code/Magento/PageCache/etc/varnish3.vcl 1 addition, 0 deletionsapp/code/Magento/PageCache/etc/varnish3.vcl
- app/code/Magento/PageCache/etc/varnish4.vcl 1 addition, 0 deletionsapp/code/Magento/PageCache/etc/varnish4.vcl
- app/code/Magento/Sales/Api/Data/CreditmemoInterface.php 4 additions, 4 deletionsapp/code/Magento/Sales/Api/Data/CreditmemoInterface.php
- app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php 3 additions, 3 deletionsapp/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
- app/code/Magento/Sales/Api/Data/InvoiceInterface.php 4 additions, 4 deletionsapp/code/Magento/Sales/Api/Data/InvoiceInterface.php
- app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php 2 additions, 2 deletionsapp/code/Magento/Sales/Api/Data/InvoiceItemInterface.php
- app/code/Magento/Sales/Api/Data/OrderInterface.php 8 additions, 8 deletionsapp/code/Magento/Sales/Api/Data/OrderInterface.php
- app/code/Magento/Sales/Api/Data/OrderItemInterface.php 7 additions, 7 deletionsapp/code/Magento/Sales/Api/Data/OrderItemInterface.php
- app/code/Magento/Sales/Api/Data/TotalInterface.php 2 additions, 2 deletionsapp/code/Magento/Sales/Api/Data/TotalInterface.php
- app/code/Magento/Sales/Model/Order.php 129 additions, 129 deletionsapp/code/Magento/Sales/Model/Order.php
- app/code/Magento/Sales/Model/Order/Creditmemo.php 4 additions, 5 deletionsapp/code/Magento/Sales/Model/Order/Creditmemo.php
- app/code/Magento/Sales/Model/Order/Creditmemo/Item.php 28 additions, 28 deletionsapp/code/Magento/Sales/Model/Order/Creditmemo/Item.php
- app/code/Magento/Sales/Model/Order/Invoice.php 41 additions, 41 deletionsapp/code/Magento/Sales/Model/Order/Invoice.php
Please register or sign in to comment