Merge remote-tracking branch 'mainline/develop' into jsonapi_compliant
Showing
- 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/Newsletter/Model/Queue/TransportBuilder.php 16 additions, 1 deletionapp/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
- app/code/Magento/Newsletter/Model/Template/Filter.php 1 addition, 1 deletionapp/code/Magento/Newsletter/Model/Template/Filter.php
- app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php 9 additions, 1 deletion...Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php
- app/code/Magento/Newsletter/Test/Unit/Model/Template/FilterTest.php 128 additions, 0 deletions...agento/Newsletter/Test/Unit/Model/Template/FilterTest.php
- app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml 17 additions, 10 deletions.../adminhtml/templates/catalog/product/attribute/text.phtml
- app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml 17 additions, 10 deletions...dminhtml/templates/catalog/product/attribute/visual.phtml
- app/code/Magento/Ui/Component/Filters.php 5 additions, 0 deletionsapp/code/Magento/Ui/Component/Filters.php
- app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js 0 additions, 13 deletions...ode/Magento/Ui/view/base/web/js/form/element/ui-select.js
Please register or sign in to comment