Merge remote-tracking branch 'remotes/origin/develop' into bug-fixes (dfa038a4) · Commits · KIII-12 / Magento

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

Commit dfa038a4 authored 9 years ago by

Hayder Sharhan

Browse files

Merge remote-tracking branch 'remotes/origin/develop' into bug-fixes

parents dcb16035 f2efe768

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Helper/Dashboard/Order.php 15 additions, 7 deletions

app/code/Magento/Backend/Helper/Dashboard/Order.php
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 10 additions, 10 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.php 3 additions, 2 deletions

app/code/Magento/Catalog/Model/Category.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/Category/DataProvider.php 36 additions, 8 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/Model/CategoryRepository.php 19 additions, 22 deletions

app/code/Magento/Catalog/Model/CategoryRepository.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php 28 additions, 6 deletions

...nto/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php 4 additions, 0 deletions

...Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php 4 additions, 0 deletions

...agento/Catalog/Model/Indexer/Product/Flat/Action/Rows.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/Category.php 9 additions, 15 deletions

app/code/Magento/Catalog/Model/ResourceModel/Category.php
app/code/Magento/Catalog/Model/ResourceModel/Category/AggregateCount.php 35 additions, 0 deletions

...o/Catalog/Model/ResourceModel/Category/AggregateCount.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/Ui/Component/Listing/Columns/Websites.php 5 additions, 3 deletions

...Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
app/code/Magento/Catalog/etc/di.xml 3 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml

with 320 additions and 118 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'remotes/origin/develop' into bug-fixes