Merge remote-tracking branch... (a95106b1) · Commits · KIII-12 / Magento

Commit a95106b1 authored 9 years ago by

Vladimir Pelipenko

Merge remote-tracking branch...

Merge remote-tracking branch 'api/MAGETWO-37843-responsive-email-templates-in-blank-theme' into prs-ee

parents f87aea45 2489d637

Branches

Tags

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv 0 additions, 0 deletions

app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv
app/code/Magento/Authorization/i18n/en_US.csv 0 additions, 0 deletions

app/code/Magento/Authorization/i18n/en_US.csv
app/code/Magento/Backend/etc/adminhtml/system.xml 2 additions, 1 deletion

app/code/Magento/Backend/etc/adminhtml/system.xml
app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php 1 addition, 1 deletion

...nto/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php 1 addition, 1 deletion

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php 1 addition, 1 deletion

...ento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php 1 addition, 1 deletion

...Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php 1 addition, 1 deletion

...de/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php 1 addition, 1 deletion

...e/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php 2 additions, 2 deletions

...t/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php 2 additions, 2 deletions

...Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php
app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php 2 additions, 2 deletions

...st/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php
app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml 1 addition, 1 deletion

...ml/templates/sales/creditmemo/create/items/renderer.phtml
app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml 1 addition, 1 deletion

...html/templates/sales/creditmemo/view/items/renderer.phtml
app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml 1 addition, 1 deletion

...nhtml/templates/sales/invoice/create/items/renderer.phtml
app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml 1 addition, 1 deletion

...minhtml/templates/sales/invoice/view/items/renderer.phtml
app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml 3 additions, 6 deletions

...html/templates/sales/shipment/create/items/renderer.phtml
app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml 2 additions, 6 deletions

...inhtml/templates/sales/shipment/view/items/renderer.phtml
app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml 60 additions, 51 deletions

...tend/templates/email/order/items/creditmemo/default.phtml

with 84 additions and 81 deletions

Please register or to comment

Admin message

Merge remote-tracking branch...