Merge branch '2.2-develop' of github.com:magento/magento2 into quisse-2.2
Showing
- README.md 4 additions, 2 deletionsREADME.md
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 1 addition, 1 deletion...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php 1 addition, 1 deletion...it/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
- app/code/Magento/Analytics/etc/di.xml 18 additions, 0 deletionsapp/code/Magento/Analytics/etc/di.xml
- app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
- app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php 1 addition, 1 deletion.../Magento/Backend/Block/System/Store/Edit/AbstractForm.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 3 additions, 3 deletions...ento/Backend/Controller/Adminhtml/System/Account/Save.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php 1 addition, 1 deletion...nto/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php 1 addition, 1 deletion...agento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
- app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php 2 additions, 1 deletion...st/Unit/Model/Config/SessionLifetime/BackendModelTest.php
- app/code/Magento/Backend/etc/adminhtml/di.xml 3 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml 2 additions, 2 deletions...agento/Backend/view/adminhtml/templates/page/header.phtml
- app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml 4 additions, 4 deletions...ento/Backend/view/adminhtml/templates/system/search.phtml
- app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml 4 additions, 4 deletions...ckend/view/adminhtml/templates/widget/grid/extended.phtml
- app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php 0 additions, 1 deletion.../Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
- app/code/Magento/Captcha/i18n/en_US.csv 2 additions, 2 deletionsapp/code/Magento/Captcha/i18n/en_US.csv
- app/code/Magento/Captcha/view/adminhtml/templates/default.phtml 1 addition, 1 deletion...de/Magento/Captcha/view/adminhtml/templates/default.phtml
- app/code/Magento/Captcha/view/frontend/templates/default.phtml 2 additions, 2 deletions...ode/Magento/Captcha/view/frontend/templates/default.phtml
- app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html 2 additions, 2 deletions.../Captcha/view/frontend/web/template/checkout/captcha.html
- app/code/Magento/Catalog/Block/Product/ListProduct.php 115 additions, 39 deletionsapp/code/Magento/Catalog/Block/Product/ListProduct.php
Please register or sign in to comment