Merge remote-tracking branch 'mainline/develop' into W1
Showing
- app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php 6 additions, 3 deletionsapp/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/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/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/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 deletionapp/code/Magento/Review/Model/Review.php
- app/code/Magento/Review/Test/Unit/Model/ReviewTest.php 8 additions, 0 deletionsapp/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 deletionapp/code/Magento/Swatches/Model/Plugin/EavAttribute.php
- app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php 217 additions, 0 deletions.../Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
- app/code/Magento/Swatches/view/frontend/web/js/SwatchRenderer.js 10 additions, 1 deletion...e/Magento/Swatches/view/frontend/web/js/SwatchRenderer.js
- app/code/Magento/Widget/Model/Widget.php 29 additions, 1 deletionapp/code/Magento/Widget/Model/Widget.php
- app/code/Magento/Widget/Model/Widget/Instance.php 10 additions, 2 deletionsapp/code/Magento/Widget/Model/Widget/Instance.php
- app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php 43 additions, 1 deletionapp/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
- app/code/Magento/Wishlist/Block/AddToWishlist.php 78 additions, 0 deletionsapp/code/Magento/Wishlist/Block/AddToWishlist.php
Please register or sign in to comment