Merge pull request #354 from magento-firedrakes/MAGETWO-39255 (0e2a4ada) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 0e2a4ada authored 9 years ago by

Logvin, Michael(mlogvin)

Merge pull request #354 from magento-firedrakes/MAGETWO-39255

[Firedrakes] Sprint 57

parents ecf466f5 27e439b6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/CategoryRepository.php 21 additions, 1 deletion

app/code/Magento/Catalog/Model/CategoryRepository.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php 2 additions, 1 deletion

...o/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php 8 additions, 4 deletions

...to/Catalog/Model/Indexer/Product/Price/AbstractAction.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php 13 additions, 21 deletions

...agento/Catalog/Model/ResourceModel/Product/Collection.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Collection/ProductLimitation.php 153 additions, 0 deletions

...el/ResourceModel/Product/Collection/ProductLimitation.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php 3 additions, 0 deletions

...g/Model/ResourceModel/Product/Compare/Item/Collection.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php 3 additions, 0 deletions

...g/Model/ResourceModel/Product/Link/Product/Collection.php
app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php 30 additions, 1 deletion

...agento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php 33 additions, 0 deletions

...esourceModel/Product/Collection/ProductLimitationTest.php
app/code/Magento/Catalog/etc/di.xml 1 addition, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php 3 additions, 0 deletions

...CatalogSearch/Model/ResourceModel/Advanced/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php 3 additions, 0 deletions

...CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php 3 additions, 0 deletions

...o/CatalogSearch/Model/ResourceModel/Search/Collection.php
app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php 3 additions, 0 deletions

...del/Product/Type/Grouped/AssociatedProductsCollection.php
app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php 3 additions, 0 deletions

...agento/Reports/Model/ResourceModel/Product/Collection.php
app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php 3 additions, 0 deletions

...urceModel/Product/Index/Collection/AbstractCollection.php
app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php 3 additions, 0 deletions

...ports/Model/ResourceModel/Product/Lowstock/Collection.php
app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php 3 additions, 0 deletions

.../Review/Model/ResourceModel/Review/Product/Collection.php
app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less 0 additions, 4 deletions

...d/Magento/blank/Magento_Sales/web/css/source/_module.less
app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less 0 additions, 4 deletions

...nd/Magento/luma/Magento_Sales/web/css/source/_module.less

with 291 additions and 36 deletions

Please register or to comment

Admin message

Merge pull request #354 from magento-firedrakes/MAGETWO-39255