Merge branch 'upstream-develop' into MAGETWO-51068-admin-session
Showing
- app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 2 additions, 2 deletions...agento/Backend/view/adminhtml/templates/admin/login.phtml
- app/code/Magento/CacheInvalidate/etc/events.xml 3 additions, 0 deletionsapp/code/Magento/CacheInvalidate/etc/events.xml
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php 27 additions, 0 deletions...ode/Magento/Catalog/Controller/Adminhtml/Product/Save.php
- app/code/Magento/Catalog/Model/ImageExtractor.php 21 additions, 1 deletionapp/code/Magento/Catalog/Model/ImageExtractor.php
- app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php 0 additions, 39 deletions...de/Magento/Catalog/Model/Indexer/Category/AffectCache.php
- app/code/Magento/Catalog/Model/Indexer/Category/Flat.php 27 additions, 1 deletionapp/code/Magento/Catalog/Model/Indexer/Category/Flat.php
- app/code/Magento/Catalog/Model/Indexer/Category/Product.php 48 additions, 1 deletionapp/code/Magento/Catalog/Model/Indexer/Category/Product.php
- app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php 0 additions, 39 deletions...ode/Magento/Catalog/Model/Indexer/Product/AffectCache.php
- app/code/Magento/Catalog/Model/Indexer/Product/Category.php 26 additions, 0 deletionsapp/code/Magento/Catalog/Model/Indexer/Product/Category.php
- app/code/Magento/Catalog/Model/Indexer/Product/Eav.php 29 additions, 0 deletionsapp/code/Magento/Catalog/Model/Indexer/Product/Eav.php
- app/code/Magento/Catalog/Model/Indexer/Product/Flat.php 29 additions, 0 deletionsapp/code/Magento/Catalog/Model/Indexer/Product/Flat.php
- app/code/Magento/Catalog/Model/Indexer/Product/Price.php 29 additions, 0 deletionsapp/code/Magento/Catalog/Model/Indexer/Product/Price.php
- app/code/Magento/Catalog/Model/Locator/RegistryLocator.php 35 additions, 6 deletionsapp/code/Magento/Catalog/Model/Locator/RegistryLocator.php
- app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php 1 addition, 1 deletion...ode/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
- app/code/Magento/Catalog/Model/Product/Link/Converter.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Link/Converter.php
- app/code/Magento/Catalog/Model/Product/Link/Resolver.php 5 additions, 1 deletionapp/code/Magento/Catalog/Model/Product/Link/Resolver.php
- app/code/Magento/Catalog/Model/ProductRepository.php 3 additions, 0 deletionsapp/code/Magento/Catalog/Model/ProductRepository.php
- app/code/Magento/Catalog/Setup/InstallSchema.php 9 additions, 0 deletionsapp/code/Magento/Catalog/Setup/InstallSchema.php
- app/code/Magento/Catalog/Setup/UpgradeSchema.php 21 additions, 0 deletionsapp/code/Magento/Catalog/Setup/UpgradeSchema.php
- app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php 40 additions, 0 deletions...de/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
Please register or sign in to comment