Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop
Showing
- app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 2 additions, 2 deletions...agento/Backend/view/adminhtml/templates/admin/login.phtml
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php 27 additions, 0 deletions...ode/Magento/Catalog/Controller/Adminhtml/Product/Save.php
- app/code/Magento/Catalog/Model/ImageExtractor.php 21 additions, 1 deletionapp/code/Magento/Catalog/Model/ImageExtractor.php
- app/code/Magento/Catalog/Model/Locator/RegistryLocator.php 35 additions, 6 deletionsapp/code/Magento/Catalog/Model/Locator/RegistryLocator.php
- app/code/Magento/Catalog/Model/Product/Link/Converter.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Link/Converter.php
- app/code/Magento/Catalog/Model/Product/Link/Resolver.php 5 additions, 1 deletionapp/code/Magento/Catalog/Model/Product/Link/Resolver.php
- app/code/Magento/Catalog/Model/ProductRepository.php 3 additions, 0 deletionsapp/code/Magento/Catalog/Model/ProductRepository.php
- app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php 40 additions, 0 deletions...de/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php 49 additions, 9 deletions...o/Catalog/Test/Unit/Model/Locator/RegistryLocatorTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php 85 additions, 0 deletions...to/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php 51 additions, 0 deletions...nto/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php
- app/code/Magento/Catalog/Test/Unit/Model/_files/converted_view.php 19 additions, 0 deletions...Magento/Catalog/Test/Unit/Model/_files/converted_view.php
- app/code/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml 18 additions, 0 deletions...ode/Magento/Catalog/Test/Unit/Model/_files/valid_view.xml
- app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php 1 addition, 1 deletion...taProvider/Product/Form/Modifier/AbstractModifierTest.php
- app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php 3 additions, 0 deletions...Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php 37 additions, 1 deletion...nto/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php 62 additions, 65 deletions...Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/ProductDataProvider.php 1 addition, 1 deletion...alog/Ui/DataProvider/Product/Form/ProductDataProvider.php
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml 3 additions, 3 deletions...minhtml/templates/catalog/product/attribute/options.phtml
- app/code/Magento/Catalog/view/adminhtml/web/js/components/import-handler.js 135 additions, 11 deletions...atalog/view/adminhtml/web/js/components/import-handler.js
Please register or sign in to comment