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

Commit d110f47e authored 9 years ago by

Hayder Sharhan

Browse files

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

parents cf003c07 f227f6ab

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php 6 additions, 3 deletions

app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php 7 additions, 0 deletions

...log/Controller/Adminhtml/Product/SuggestAttributeSets.php
app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php 9 additions, 4 deletions

...atalog/Controller/Adminhtml/Product/SuggestAttributes.php
app/code/Magento/Catalog/Model/Category/DataProvider.php 2 additions, 0 deletions

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php 3 additions, 1 deletion

.../Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php
app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml 1 addition, 2 deletions

...o/Catalog/view/adminhtml/ui_component/product_listing.xml
app/code/Magento/Catalog/view/adminhtml/web/js/components/url-key-handle-changes.js 20 additions, 19 deletions

...iew/adminhtml/web/js/components/url-key-handle-changes.js
app/code/Magento/CatalogImportExport/Model/Export/Product.php 5 additions, 0 deletions

...code/Magento/CatalogImportExport/Model/Export/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product.php 31 additions, 9 deletions

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php 7 additions, 8 deletions

...to/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php 5 additions, 6 deletions

...lugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php 6 additions, 4 deletions

.../DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
app/code/Magento/CatalogUrlRewrite/view/adminhtml/ui_component/category_form.xml 4 additions, 1 deletion

...gUrlRewrite/view/adminhtml/ui_component/category_form.xml
app/code/Magento/CatalogUrlRewrite/view/adminhtml/web/js/components/url-key-handle-changes.js 0 additions, 59 deletions

...iew/adminhtml/web/js/components/url-key-handle-changes.js
app/code/Magento/CatalogWidget/Block/Product/ProductsList.php 7 additions, 4 deletions

...code/Magento/CatalogWidget/Block/Product/ProductsList.php
app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php 15 additions, 4 deletions

...atalogWidget/Test/Unit/Block/Product/ProductsListTest.php
app/code/Magento/Review/Model/Review.php 1 addition, 1 deletion

app/code/Magento/Review/Model/Review.php
app/code/Magento/Review/Test/Unit/Model/ReviewTest.php 8 additions, 0 deletions

app/code/Magento/Review/Test/Unit/Model/ReviewTest.php
app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php 1 addition, 0 deletions

.../Swatches/Block/Product/Renderer/Listing/Configurable.php
app/code/Magento/Swatches/Model/Plugin/EavAttribute.php 1 addition, 1 deletion

app/code/Magento/Swatches/Model/Plugin/EavAttribute.php

with 139 additions and 126 deletions

Please register or to comment

Admin message

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