Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into BUGS
Showing
- app/code/Magento/Backend/Block/Widget/Button/Item.php 6 additions, 6 deletionsapp/code/Magento/Backend/Block/Widget/Button/Item.php
- app/code/Magento/Backend/Block/Widget/Button/Toolbar/Container.php 2 additions, 2 deletions...Magento/Backend/Block/Widget/Button/Toolbar/Container.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php 9 additions, 1 deletion...g/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php 1 addition, 1 deletion...og/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php 10 additions, 0 deletions...talog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php 13 additions, 1 deletion...g/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
- app/code/Magento/Catalog/Model/CategoryLinkManagement.php 4 additions, 4 deletionsapp/code/Magento/Catalog/Model/CategoryLinkManagement.php
- app/code/Magento/Catalog/Model/Config/Source/Product/Options/Type.php 1 addition, 1 deletion...ento/Catalog/Model/Config/Source/Product/Options/Type.php
- app/code/Magento/Catalog/Model/Product.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php 1 addition, 1 deletion...Magento/Catalog/Model/Product/Attribute/Backend/Media.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php 6 additions, 6 deletions.../Catalog/Model/Product/Option/Type/File/ValidatorFile.php
- app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php 19 additions, 0 deletions...ode/Magento/Catalog/Model/ResourceModel/Category/Flat.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Media.php 4 additions, 1 deletion...g/Model/ResourceModel/Product/Attribute/Backend/Media.php
- app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php 1 addition, 1 deletion...ock/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php
- app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php 5 additions, 4 deletions...to/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
- app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php 5 additions, 1 deletion...est/Unit/Model/Config/Source/Product/Options/TypeTest.php
- app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php 2 additions, 4 deletions...de/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml 1 addition, 1 deletion...talog/view/adminhtml/templates/catalog/product/edit.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml 1 addition, 1 deletion...ew/adminhtml/templates/catalog/product/edit/options.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml 2 additions, 1 deletion...nhtml/templates/catalog/product/edit/options/option.phtml
Please register or sign in to comment