Merge remote-tracking branch 'mainline/develop' into bugs (e2e8bd21) · Commits · KIII-12 / Magento

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

Commit e2e8bd21 authored 9 years ago by

Serhiy Shkolyarenko

Browse files

Merge remote-tracking branch 'mainline/develop' into bugs

parents 5dd556a8 fb909a9f

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml 13 additions, 1 deletion

...ento/Backend/view/adminhtml/templates/system/search.phtml
app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php 2 additions, 4 deletions

...de/Magento/Catalog/Controller/Adminhtml/Category/Save.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 1 addition, 1 deletion

...og/Controller/Adminhtml/Product/Initialization/Helper.php
app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php 2 additions, 2 deletions

...gento/Catalog/Model/Category/Attribute/Backend/Sortby.php
app/code/Magento/Catalog/Model/CategoryRepository.php 19 additions, 22 deletions

app/code/Magento/Catalog/Model/CategoryRepository.php
app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php 1 addition, 14 deletions

.../Magento/Catalog/Model/ResourceModel/AbstractResource.php
app/code/Magento/Catalog/Model/ResourceModel/Product.php 21 additions, 12 deletions

app/code/Magento/Catalog/Model/ResourceModel/Product.php
app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php 28 additions, 0 deletions

...og/Plugin/Model/Attribute/Backend/AttributeValidation.php
app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php 2 additions, 2 deletions

...Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php 81 additions, 13 deletions

...agento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/CatalogImportExport/Model/Import/Product.php 1 addition, 1 deletion

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php 28 additions, 0 deletions

...to/CatalogImportExport/Model/Import/Product/Validator.php
app/code/Magento/CatalogRule/Model/Rule.php 2 additions, 1 deletion

app/code/Magento/CatalogRule/Model/Rule.php
app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php 1 addition, 1 deletion

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php
app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php 17 additions, 8 deletions

...Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php 9 additions, 1 deletion

...gin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php 75 additions, 21 deletions

...CatalogSearch/Model/ResourceModel/Advanced/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php 124 additions, 15 deletions

...CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php 145 additions, 0 deletions

...Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php

with 575 additions and 119 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into bugs