Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-86657
Showing
- README.md 4 additions, 4 deletionsREADME.md
- app/code/Magento/Backup/Model/Db.php 1 addition, 1 deletionapp/code/Magento/Backup/Model/Db.php
- app/code/Magento/Bundle/Model/ResourceModel/Option.php 46 additions, 16 deletionsapp/code/Magento/Bundle/Model/ResourceModel/Option.php
- app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php 1 addition, 1 deletionapp/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php 10 additions, 10 deletions...talog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
- app/code/Magento/Catalog/Block/Product/ProductList/Related.php 1 addition, 1 deletion...ode/Magento/Catalog/Block/Product/ProductList/Related.php
- app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php 2 additions, 2 deletions...code/Magento/Catalog/Block/Product/ProductList/Upsell.php
- app/code/Magento/Catalog/Helper/Product/View.php 4 additions, 4 deletionsapp/code/Magento/Catalog/Helper/Product/View.php
- app/code/Magento/Catalog/Model/Config.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Model/Config.php
- app/code/Magento/Catalog/Model/Layer/Filter/Price.php 2 additions, 2 deletionsapp/code/Magento/Catalog/Model/Layer/Filter/Price.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 1 addition, 1 deletion...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
- app/code/Magento/Catalog/Model/Product/Option/Value.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Product/Option/Value.php
- app/code/Magento/Catalog/Model/ProductRepository.php 14 additions, 172 deletionsapp/code/Magento/Catalog/Model/ProductRepository.php
- app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php 218 additions, 0 deletions...Catalog/Model/ProductRepository/MediaGalleryProcessor.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php 10 additions, 10 deletions...agento/Catalog/Model/ResourceModel/Product/Collection.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductRepository/MediaGalleryProcessorTest.php 227 additions, 0 deletions...nit/Model/ProductRepository/MediaGalleryProcessorTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 22 additions, 79 deletions...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
- app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml 2 additions, 2 deletions.../Catalog/view/frontend/templates/product/list/items.phtml
- app/code/Magento/CatalogInventory/etc/events.xml 0 additions, 3 deletionsapp/code/Magento/CatalogInventory/etc/events.xml
- app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml 1 addition, 2 deletions...view/frontend/templates/product/widget/content/grid.phtml
Please register or sign in to comment