Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-84448
Showing
- .github/.htaccess 8 additions, 0 deletions.github/.htaccess
- .github/CODE_OF_CONDUCT.md 46 additions, 0 deletions.github/CODE_OF_CONDUCT.md
- .github/CONTRIBUTING.md 0 additions, 0 deletions.github/CONTRIBUTING.md
- .github/ISSUE_TEMPLATE.md 0 additions, 0 deletions.github/ISSUE_TEMPLATE.md
- .github/PULL_REQUEST_TEMPLATE.md 0 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- .htaccess 9 additions, 9 deletions.htaccess
- .htaccess.sample 9 additions, 9 deletions.htaccess.sample
- CHANGELOG.md 226 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Analytics/composer.json 2 additions, 2 deletionsapp/code/Magento/Analytics/composer.json
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 1 addition, 1 deletionapp/code/Magento/Backup/composer.json
- app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php 1 addition, 1 deletion...code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
- app/code/Magento/Braintree/composer.json 2 additions, 2 deletionsapp/code/Magento/Braintree/composer.json
- app/code/Magento/Bundle/composer.json 1 addition, 1 deletionapp/code/Magento/Bundle/composer.json
- app/code/Magento/Catalog/Block/Product/ImageBuilder.php 8 additions, 3 deletionsapp/code/Magento/Catalog/Block/Product/ImageBuilder.php
- app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php 1 addition, 1 deletion...ode/Magento/Catalog/Block/Product/ProductList/Toolbar.php
- app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php 20 additions, 8 deletions...e/Magento/Catalog/Console/Command/ImagesResizeCommand.php
- app/code/Magento/Catalog/Model/Category.php 5 additions, 2 deletionsapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php 112 additions, 60 deletions...Catalog/Model/Indexer/Category/Product/AbstractAction.php
Please register or sign in to comment