Merge remote-tracking branch 'mainline/develop' into bugs
Showing
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 17 additions, 6 deletions...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
- app/code/Magento/Backend/Model/Session/AdminConfig.php 8 additions, 8 deletionsapp/code/Magento/Backend/Model/Session/AdminConfig.php
- app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php 8 additions, 11 deletions...gento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
- app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 1 addition, 1 deletion...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
- app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html 4 additions, 1 deletion...Braintree/view/frontend/web/template/payment/cc-form.html
- app/code/Magento/Catalog/etc/di.xml 5 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 1 addition, 1 deletion...alog/view/adminhtml/templates/catalog/category/tree.phtml
- app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js 1 addition, 4 deletions...view/adminhtml/web/catalog/product/composite/configure.js
- app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php 64 additions, 18 deletions...CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
- app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml 9 additions, 0 deletions...uct/configurable/affected-attribute-set-selector/js.phtml
- app/code/Magento/Cookie/composer.json 1 addition, 1 deletionapp/code/Magento/Cookie/composer.json
- app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php 1 addition, 1 deletion.../Customer/Console/Command/UpgradeHashAlgorithmCommand.php
- app/code/Magento/Deploy/composer.json 1 addition, 1 deletionapp/code/Magento/Deploy/composer.json
- app/code/Magento/DownloadableImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/DownloadableImportExport/composer.json
- app/code/Magento/EncryptionKey/composer.json 1 addition, 1 deletionapp/code/Magento/EncryptionKey/composer.json
- app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml 8 additions, 2 deletions...oduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
- app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js 4 additions, 4 deletions...o/GroupedProduct/view/adminhtml/web/js/grouped-product.js
- app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php 4 additions, 4 deletions...de/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
- app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml 2 additions, 2 deletions...rtExport/view/adminhtml/templates/export/form/after.phtml
- app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php 1 addition, 1 deletion...agento/Integration/Block/Adminhtml/Integration/Tokens.php
Please register or sign in to comment