Merge remote-tracking branch 'mainline/develop' into API-Bug-Branch
Showing
- app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml 2 additions, 2 deletions...o/Braintree/view/frontend/templates/creditcard/edit.phtml
- app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php 51 additions, 0 deletions...e/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php
- app/code/Magento/Bundle/Model/Product/Type.php 5 additions, 0 deletionsapp/code/Magento/Bundle/Model/Product/Type.php
- app/code/Magento/Bundle/etc/adminhtml/di.xml 3 additions, 0 deletionsapp/code/Magento/Bundle/etc/adminhtml/di.xml
- app/code/Magento/Catalog/Ui/Component/ColumnFactory.php 16 additions, 0 deletionsapp/code/Magento/Catalog/Ui/Component/ColumnFactory.php
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml 0 additions, 2 deletions...dminhtml/templates/catalog/category/checkboxes/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 0 additions, 2 deletions...alog/view/adminhtml/templates/catalog/category/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml 1 addition, 2 deletions...ew/adminhtml/templates/catalog/category/widget/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml 0 additions, 2 deletions...inhtml/templates/catalog/product/attribute/set/main.phtml
- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js 3 additions, 0 deletionsapp/code/Magento/Checkout/view/frontend/web/js/sidebar.js
- app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml 8 additions, 0 deletions...nto/Cms/view/adminhtml/ui_component/cms_block_listing.xml
- app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml 8 additions, 0 deletions...ento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
- app/code/Magento/CustomerImportExport/Model/Import/Customer.php 3 additions, 1 deletion...de/Magento/CustomerImportExport/Model/Import/Customer.php
- app/code/Magento/Deploy/Model/Filesystem.php 5 additions, 5 deletionsapp/code/Magento/Deploy/Model/Filesystem.php
- app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php 173 additions, 0 deletions...to/Developer/Console/Command/SourceThemeDeployCommand.php
- app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php 11 additions, 9 deletions...l/Css/PreProcessor/FileGenerator/PublicationDecorator.php
- app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php 0 additions, 191 deletions...eloper/Test/Unit/Console/Command/CssDeployCommandTest.php
- app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php 156 additions, 0 deletions...est/Unit/Console/Command/SourceThemeDeployCommandTest.php
- app/code/Magento/Developer/Test/Unit/Model/Css/PreProcessor/FileGenerator/PublicationDecoratorTest.php 25 additions, 14 deletions...s/PreProcessor/FileGenerator/PublicationDecoratorTest.php
- app/code/Magento/Developer/etc/di.xml 71 additions, 1 deletionapp/code/Magento/Developer/etc/di.xml
Please register or sign in to comment