Merge remote-tracking branch 'origin/develop' into UI
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/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/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/view/adminhtml/templates/catalog/product/attribute/options.phtml 5 additions, 5 deletions...minhtml/templates/catalog/product/attribute/options.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml 1 addition, 1 deletion...inhtml/templates/catalog/product/edit/attribute_set.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml 21 additions, 21 deletions...nhtml/templates/catalog/product/edit/options/option.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml 8 additions, 8 deletions...ml/templates/catalog/product/edit/options/type/date.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml 10 additions, 10 deletions...ml/templates/catalog/product/edit/options/type/file.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml 15 additions, 15 deletions.../templates/catalog/product/edit/options/type/select.phtml
Please register or sign in to comment