Merge remote-tracking branch 'origin/develop' into working
Showing
- app/code/Magento/Backend/Block/Template.php 3 additions, 8 deletionsapp/code/Magento/Backend/Block/Template.php
- app/code/Magento/Backend/etc/adminhtml/system.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Options/AjaxTest.php 0 additions, 8 deletions...og/Test/Unit/Block/Adminhtml/Product/Options/AjaxTest.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php 1 addition, 3 deletions.../Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
- app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php 23 additions, 8 deletions...UrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
- app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php 69 additions, 45 deletions...lRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
- app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php 23 additions, 20 deletions...talogUrlRewrite/Model/Category/Plugin/Category/Remove.php
- app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php 9 additions, 16 deletions...gento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
- app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php 1 addition, 1 deletion...o/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
- app/code/Magento/CatalogUrlRewrite/Model/CategoryBasedProductRewriteGenerator.php 10 additions, 10 deletions...UrlRewrite/Model/CategoryBasedProductRewriteGenerator.php
- app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php 68 additions, 30 deletions...o/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php 89 additions, 0 deletions...gento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php 135 additions, 0 deletions...rlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUsedInProductsHashMap.php 98 additions, 0 deletions...rlRewrite/Model/Map/DataCategoryUsedInProductsHashMap.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductHashMap.php 95 additions, 0 deletions...agento/CatalogUrlRewrite/Model/Map/DataProductHashMap.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php 124 additions, 0 deletions...UrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php 40 additions, 0 deletions...ento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapPool.php 78 additions, 0 deletions...e/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapPool.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php 45 additions, 0 deletions.../Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php
- app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapPool.php 79 additions, 0 deletionsapp/code/Magento/CatalogUrlRewrite/Model/Map/HashMapPool.php
Please register or sign in to comment