Merge remote-tracking branch...
Merge remote-tracking branch 'ogresCE/MAGETWO-36920-Use-dashes-instead-of-underscores' into MAGETWO-22864-system-maintenance-command-2 Conflicts: app/code/Magento/Indexer/composer.json dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php dev/tools/performance-toolkit/generate.php setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php setup/src/Magento/Setup/Fixtures/CategoriesFixture.php setup/src/Magento/Setup/Fixtures/ConfigsApplyFixture.php setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php setup/src/Magento/Setup/Fixtures/CustomersFixture.php setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php setup/src/Magento/Setup/Fixtures/SimpleProductsFixture.php setup/src/Magento/Setup/Fixtures/StoresFixture.php setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
Showing
- CHANGELOG.md 20 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml 4 additions, 4 deletions...Notification/view/adminhtml/templates/toolbar_entry.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js 4 additions, 4 deletions...nto/AdminNotification/view/adminhtml/web/toolbar_entry.js
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/App/Action/Context.php 6 additions, 1 deletionapp/code/Magento/Backend/App/Action/Context.php
- app/code/Magento/Backend/App/Config.php 5 additions, 3 deletionsapp/code/Magento/Backend/App/Config.php
- app/code/Magento/Backend/Block/Menu.php 26 additions, 16 deletionsapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php 3 additions, 1 deletion...Magento/Backend/Block/Page/System/Config/Robots/Reset.php
- app/code/Magento/Backend/Block/Widget/Grid.php 12 additions, 0 deletionsapp/code/Magento/Backend/Block/Widget/Grid.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 2 additions, 2 deletions...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/Block/Widget/Grid/Extended.php 8 additions, 0 deletionsapp/code/Magento/Backend/Block/Widget/Grid/Extended.php
- app/code/Magento/Backend/Model/Auth/Session.php 5 additions, 2 deletionsapp/code/Magento/Backend/Model/Auth/Session.php
- app/code/Magento/Backend/Model/Locale/Manager.php 1 addition, 1 deletionapp/code/Magento/Backend/Model/Locale/Manager.php
- app/code/Magento/Backend/Model/Session.php 0 additions, 33 deletionsapp/code/Magento/Backend/Model/Session.php
- app/code/Magento/Backend/Model/Session/Quote.php 6 additions, 3 deletionsapp/code/Magento/Backend/Model/Session/Quote.php
- app/code/Magento/Backend/Model/Url.php 3 additions, 3 deletionsapp/code/Magento/Backend/Model/Url.php
- app/code/Magento/Backend/Setup/ConfigOptionsList.php 1 addition, 1 deletionapp/code/Magento/Backend/Setup/ConfigOptionsList.php
- app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php 3 additions, 1 deletion...de/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
- app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php 97 additions, 70 deletions...ode/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
Please register or sign in to comment