Merge remote-tracking branch 'mainline/develop' into checkout
Showing
- app/code/Magento/Backend/Block/Template/Context.php 7 additions, 1 deletionapp/code/Magento/Backend/Block/Template/Context.php
- app/code/Magento/Backend/Block/Widget/Context.php 7 additions, 1 deletionapp/code/Magento/Backend/Block/Widget/Context.php
- app/code/Magento/Catalog/Block/Product/Context.php 8 additions, 2 deletionsapp/code/Magento/Catalog/Block/Product/Context.php
- app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php 4 additions, 0 deletions...ogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
- app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php 4 additions, 0 deletions...ule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
- app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php 4 additions, 0 deletions...talogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
- app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php 1 addition, 0 deletions...agento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
- app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php 1 addition, 0 deletions...ode/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
- app/code/Magento/CatalogRule/Model/Resource/Rule.php 1 addition, 0 deletionsapp/code/Magento/CatalogRule/Model/Resource/Rule.php
- app/code/Magento/CatalogRule/Model/Resource/Rule/Collection.php 1 addition, 0 deletions...de/Magento/CatalogRule/Model/Resource/Rule/Collection.php
- app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price.php 1 addition, 0 deletions...Magento/CatalogRule/Model/Resource/Rule/Product/Price.php
- app/code/Magento/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php 1 addition, 0 deletions...alogRule/Model/Resource/Rule/Product/Price/Collection.php
- app/code/Magento/CatalogRule/Model/Rule.php 3 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Edit/FormTest.php 28 additions, 7 deletions...nto/Cms/Test/Unit/Block/Adminhtml/Block/Edit/FormTest.php
- app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php 1 addition, 1 deletionapp/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
- app/code/Magento/PageCache/Model/Observer/ProcessLayoutRenderElement.php 45 additions, 3 deletions...o/PageCache/Model/Observer/ProcessLayoutRenderElement.php
- app/code/Magento/PageCache/Test/Unit/Model/Observer/ProcessLayoutRenderElementTest.php 29 additions, 27 deletions...st/Unit/Model/Observer/ProcessLayoutRenderElementTest.php
- app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php 20 additions, 60 deletions...ports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
- app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Sales/Grid/Column/Renderer/DateTest.php 145 additions, 0 deletions...t/Block/Adminhtml/Sales/Grid/Column/Renderer/DateTest.php
- app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/AbstractControllerTest.php 133 additions, 0 deletions...it/Controller/Adminhtml/Report/AbstractControllerTest.php
Please register or sign in to comment