Merge branch 'maindevelop' into bugfix
Showing
- app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php 28 additions, 9 deletions...g/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
- app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php 4 additions, 0 deletions...talog/Model/ResourceModel/Category/Collection/Factory.php
- app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php 24 additions, 1 deletion...ode/Magento/Catalog/Model/ResourceModel/Category/Flat.php
- app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php 33 additions, 11 deletions...ock/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
- app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php 212 additions, 0 deletions...talog/Test/Unit/Model/ResourceModel/Category/FlatTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php 0 additions, 2 deletions...alog/Ui/DataProvider/Product/Form/Modifier/Categories.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php 0 additions, 3 deletions...Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php 0 additions, 3 deletions...taProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
- app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml 1 addition, 1 deletion...nto/Catalog/view/adminhtml/ui_component/category_form.xml
- app/code/Magento/CatalogImportExport/Model/Import/Product.php 1 addition, 1 deletion...code/Magento/CatalogImportExport/Model/Import/Product.php
- app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php 2 additions, 0 deletions.../DataProvider/Product/Form/Modifier/AdvancedInventory.php
- app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml 21 additions, 1 deletion...logInventory/view/adminhtml/ui_component/product_form.xml
- app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php 9 additions, 7 deletions...gento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
- app/code/Magento/Cms/Model/ResourceModel/Page.php 2 additions, 2 deletionsapp/code/Magento/Cms/Model/ResourceModel/Page.php
- app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php 46 additions, 26 deletions...o/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
- app/code/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php 133 additions, 0 deletions...de/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php
- app/code/Magento/Customer/view/frontend/templates/form/edit.phtml 6 additions, 6 deletions.../Magento/Customer/view/frontend/templates/form/edit.phtml
- app/code/Magento/Customer/view/frontend/templates/form/register.phtml 6 additions, 7 deletions...ento/Customer/view/frontend/templates/form/register.phtml
- app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php 6 additions, 1 deletionapp/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
- app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php 4 additions, 0 deletions...Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
Please register or sign in to comment