Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-34621-move-update-commands
Conflicts: composer.lock dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php setup/src/Magento/Setup/Model/Installer.php
Showing
- .htaccess 7 additions, 0 deletions.htaccess
- .htaccess.sample 7 additions, 0 deletions.htaccess.sample
- CHANGELOG.md 222 additions, 41 deletionsCHANGELOG.md
- Gruntfile.js 21 additions, 33 deletionsGruntfile.js
- README.md 15 additions, 1 deletionREADME.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 1 addition, 1 deletion...cation/view/adminhtml/templates/notification/window.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 1 addition, 1 deletion...tification/view/adminhtml/templates/system/messages.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 1 addition, 1 deletion...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 6 additions, 8 deletions...minNotification/view/adminhtml/web/system/notification.js
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/App/Action/Context.php 4 additions, 1 deletionapp/code/Magento/Backend/App/Action/Context.php
- app/code/Magento/Backend/Block/Menu.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php 0 additions, 2 deletions.../Magento/Backend/Block/System/Design/Edit/Tab/General.php
- app/code/Magento/Backend/Block/Widget/Form.php 0 additions, 1 deletionapp/code/Magento/Backend/Block/Widget/Form.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php 0 additions, 4 deletions.../Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 0 additions, 1 deletion...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php 1 addition, 9 deletionsapp/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
- app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php 0 additions, 17 deletions...code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
- app/code/Magento/Backend/Controller/Adminhtml/Cache.php 0 additions, 8 deletionsapp/code/Magento/Backend/Controller/Adminhtml/Cache.php
Please register or sign in to comment