Merge branch 'mainline' into MAGETWO-44464
Showing
- app/bootstrap.php 9 additions, 2 deletionsapp/bootstrap.php
- app/code/Magento/Catalog/etc/product_options_merged.xsd 1 addition, 1 deletionapp/code/Magento/Catalog/etc/product_options_merged.xsd
- app/code/Magento/Catalog/etc/product_types.xsd 1 addition, 1 deletionapp/code/Magento/Catalog/etc/product_types.xsd
- app/code/Magento/Catalog/etc/product_types_merged.xsd 1 addition, 1 deletionapp/code/Magento/Catalog/etc/product_types_merged.xsd
- app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml 1 addition, 1 deletion...o/Catalog/view/adminhtml/ui_component/product_listing.xml
- app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_listing.xml 1 addition, 1 deletion...Inventory/view/adminhtml/ui_component/product_listing.xml
- app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml 1 addition, 1 deletion...nto/Cms/view/adminhtml/ui_component/cms_block_listing.xml
- app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml 1 addition, 1 deletion...ento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
- app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php 5 additions, 14 deletions...er/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
- app/code/Magento/Config/etc/system_include.xsd 1 addition, 1 deletionapp/code/Magento/Config/etc/system_include.xsd
- app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml 1 addition, 1 deletion.../ui_component/configurable_associated_product_listing.xml
- app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml 1 addition, 1 deletion...iew/adminhtml/ui_component/product_attributes_listing.xml
- app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml 1 addition, 1 deletion...Customer/view/adminhtml/ui_component/customer_listing.xml
- app/code/Magento/Customer/view/adminhtml/ui_component/customer_online_grid.xml 1 addition, 1 deletion...omer/view/adminhtml/ui_component/customer_online_grid.xml
- app/code/Magento/Customer/view/base/ui_component/customer_form.xml 1 addition, 1 deletion...Magento/Customer/view/base/ui_component/customer_form.xml
- app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php 178 additions, 0 deletions...o/Developer/Console/Command/XmlCatalogGenerateCommand.php
- app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php 22 additions, 0 deletions...nto/Developer/Model/XmlCatalog/Format/FormatInterface.php
- app/code/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php 106 additions, 0 deletions...de/Magento/Developer/Model/XmlCatalog/Format/PhpStorm.php
- app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php 73 additions, 0 deletions...st/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
- app/code/Magento/Developer/Test/Unit/Console/Command/_files/test.xml 14 additions, 0 deletions...gento/Developer/Test/Unit/Console/Command/_files/test.xml
Please register or sign in to comment