Merge remote-tracking branch 'remotes/origin/develop' into for-pr (05059a05) · Commits · KIII-12 / Magento

Commit 05059a05 authored 9 years ago by

Hayder Sharhan

Browse files

Merge remote-tracking branch 'remotes/origin/develop' into for-pr

parents 61a40d12 73fb299b

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CacheInvalidate/etc/events.xml 3 additions, 0 deletions

app/code/Magento/CacheInvalidate/etc/events.xml
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 deletion

app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
app/code/Magento/Catalog/Model/Indexer/Category/Product.php 48 additions, 1 deletion

app/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 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Category.php
app/code/Magento/Catalog/Model/Indexer/Product/Eav.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Eav.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Flat.php
app/code/Magento/Catalog/Model/Indexer/Product/Price.php 29 additions, 0 deletions

app/code/Magento/Catalog/Model/Indexer/Product/Price.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/AffectCacheTest.php 0 additions, 54 deletions

...alog/Test/Unit/Model/Indexer/Category/AffectCacheTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/FlatTest.php 43 additions, 0 deletions

...nto/Catalog/Test/Unit/Model/Indexer/Category/FlatTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php 39 additions, 0 deletions

.../Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/AffectCacheTest.php 0 additions, 54 deletions

...talog/Test/Unit/Model/Indexer/Product/AffectCacheTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php 44 additions, 0 deletions

.../Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/EavTest.php 42 additions, 6 deletions

...gento/Catalog/Test/Unit/Model/Indexer/Product/EavTest.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FlatTest.php 39 additions, 5 deletions

...ento/Catalog/Test/Unit/Model/Indexer/Product/FlatTest.php
app/code/Magento/Catalog/etc/di.xml 0 additions, 16 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/Catalog/view/base/web/js/price-box.js 1 addition, 1 deletion

app/code/Magento/Catalog/view/base/web/js/price-box.js
app/code/Magento/CatalogInventory/Model/Indexer/Stock.php 29 additions, 3 deletions

app/code/Magento/CatalogInventory/Model/Indexer/Stock.php
app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php 23 additions, 2 deletions

...ode/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php

with 451 additions and 221 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'remotes/origin/develop' into for-pr