Merge remote-tracking branch 'mainline/develop' into MAGETWO-34878
Conflicts: app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
Showing
- app/code/Magento/Backend/Block/Widget/Grid/Extended.php 5 additions, 1 deletionapp/code/Magento/Backend/Block/Widget/Grid/Extended.php
- app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 21 additions, 13 deletions...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
- app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml 2 additions, 2 deletions...nto/Backend/view/adminhtml/templates/media/uploader.phtml
- app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml 4 additions, 4 deletions...ento/Backend/view/adminhtml/templates/system/search.phtml
- app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php 6 additions, 6 deletions...lock/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
- app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php 6 additions, 6 deletions...html/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
- app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml 26 additions, 26 deletions...view/adminhtml/templates/product/edit/bundle/option.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml 28 additions, 28 deletions...html/templates/product/edit/bundle/option/selection.phtml
- app/code/Magento/Bundle/view/base/web/js/price-bundle.js 2 additions, 2 deletionsapp/code/Magento/Bundle/view/base/web/js/price-bundle.js
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml 17 additions, 18 deletions...iew/frontend/templates/catalog/product/view/summary.phtml
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml 9 additions, 13 deletions.../templates/catalog/product/view/type/bundle/options.phtml
- app/code/Magento/Catalog/Api/Data/CategoryAttributeInterface.php 0 additions, 2 deletions...e/Magento/Catalog/Api/Data/CategoryAttributeInterface.php
- app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php 0 additions, 2 deletions...de/Magento/Catalog/Api/Data/ProductAttributeInterface.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php 4 additions, 4 deletions...talog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php 2 additions, 2 deletions.../Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php 4 additions, 4 deletions.../Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php 3 additions, 3 deletions...Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php 14 additions, 3 deletions...Magento/Catalog/Controller/Adminhtml/Product/Validate.php
- app/code/Magento/Catalog/Model/Category/AttributeRepository.php 13 additions, 2 deletions...de/Magento/Catalog/Model/Category/AttributeRepository.php
- app/code/Magento/Catalog/Model/Product/Attribute/Repository.php 4 additions, 1 deletion...de/Magento/Catalog/Model/Product/Attribute/Repository.php
Please register or sign in to comment