Merge remote-tracking branch 'origin/develop' into UI
Showing
- app/code/Magento/Backend/Model/Auth.php 2 additions, 0 deletionsapp/code/Magento/Backend/Model/Auth.php
- app/code/Magento/Backend/Model/Auth/Session.php 1 addition, 0 deletionsapp/code/Magento/Backend/Model/Auth/Session.php
- app/code/Magento/Backend/Model/Search/Order.php 1 addition, 6 deletionsapp/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 deletionapp/code/Magento/Catalog/etc/webapi.xml
- app/code/Magento/Email/Model/Template.php 8 additions, 3 deletionsapp/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
Please register or sign in to comment