Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665 (3df9f910) · Commits · KIII-12 / Magento

Commit 3df9f910 authored 10 years ago by

Roman Ganin

Browse files

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665

parents 04715bbc f9966b1f

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Model/Auth.php 2 additions, 0 deletions

app/code/Magento/Backend/Model/Auth.php
app/code/Magento/Backend/Model/Auth/Session.php 1 addition, 0 deletions

app/code/Magento/Backend/Model/Auth/Session.php
app/code/Magento/Backend/Model/Search/Order.php 1 addition, 6 deletions

app/code/Magento/Backend/Model/Search/Order.php
app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php 105 additions, 2 deletions

...code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml 1 addition, 1 deletion

...tend/templates/email/order/items/creditmemo/default.phtml
app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml 1 addition, 1 deletion

...rontend/templates/email/order/items/invoice/default.phtml
app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml 1 addition, 1 deletion

.../frontend/templates/email/order/items/order/default.phtml
app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml 1 addition, 1 deletion

...ontend/templates/email/order/items/shipment/default.phtml
app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml 1 addition, 1 deletion

...end/templates/sales/order/creditmemo/items/renderer.phtml
app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml 1 addition, 1 deletion

...ontend/templates/sales/order/invoice/items/renderer.phtml
app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml 1 addition, 1 deletion

.../view/frontend/templates/sales/order/items/renderer.phtml
app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml 1 addition, 1 deletion

...ntend/templates/sales/order/shipment/items/renderer.phtml
app/code/Magento/Catalog/etc/webapi.xml 1 addition, 1 deletion

app/code/Magento/Catalog/etc/webapi.xml
app/code/Magento/Email/Model/Template.php 8 additions, 3 deletions

app/code/Magento/Email/Model/Template.php
app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Edit/FormTest.php 103 additions, 0 deletions

...mail/Test/Unit/Block/Adminhtml/Template/Edit/FormTest.php
app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php 63 additions, 0 deletions

...nit/Block/Adminhtml/Template/Grid/Renderer/ActionTest.php
app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php 63 additions, 0 deletions

...nit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/TypeTest.php 53 additions, 0 deletions

.../Unit/Block/Adminhtml/Template/Grid/Renderer/TypeTest.php
app/code/Magento/Email/Test/Unit/Block/Adminhtml/TemplateTest.php 121 additions, 0 deletions

.../Magento/Email/Test/Unit/Block/Adminhtml/TemplateTest.php
app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/EditTest.php 259 additions, 0 deletions

...est/Unit/Controller/Adminhtml/Email/Template/EditTest.php

with 788 additions and 20 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665