Merge remote-tracking branch 'mainline/develop' into develop
Showing
- app/code/Magento/Backend/App/Action/Context.php 6 additions, 1 deletionapp/code/Magento/Backend/App/Action/Context.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 2 additions, 2 deletions...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/etc/adminhtml/di.xml 18 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml 1 addition, 1 deletion...nto/Backend/view/adminhtml/templates/dashboard/grid.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml 2 additions, 1 deletion...templates/product/composite/fieldset/options/bundle.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml 28 additions, 21 deletions...ml/templates/sales/creditmemo/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml 2 additions, 2 deletions...html/templates/sales/creditmemo/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml 21 additions, 18 deletions...nhtml/templates/sales/invoice/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml 2 additions, 2 deletions...minhtml/templates/sales/invoice/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml 18 additions, 18 deletions...adminhtml/templates/sales/order/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml 6 additions, 3 deletions...html/templates/sales/shipment/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml 2 additions, 2 deletions...inhtml/templates/sales/shipment/view/items/renderer.phtml
- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js 7 additions, 5 deletionsapp/code/Magento/Checkout/view/frontend/web/js/sidebar.js
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml 3 additions, 3 deletions...adminhtml/templates/product/edit/downloadable/links.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml 3 additions, 3 deletions...minhtml/templates/product/edit/downloadable/samples.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml 6 additions, 3 deletions...html/templates/sales/items/column/downloadable/name.phtml
- app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml 2 additions, 2 deletions.../adminhtml/templates/sales/order/create/giftoptions.phtml
- app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php 8 additions, 9 deletions...gleShopping/Controller/Adminhtml/Googleshopping/Items.php
- app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php 13 additions, 19 deletions...troller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
- app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Grid.php 30 additions, 9 deletions...opping/Controller/Adminhtml/Googleshopping/Items/Grid.php
Please register or sign in to comment