Merge remote-tracking branch 'mainline/develop' into...
Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-32905-Refactor-API-Framework
Showing
- app/code/Magento/AdminNotification/Block/System/Messages.php 4 additions, 2 deletionsapp/code/Magento/AdminNotification/Block/System/Messages.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 31 additions, 1 deletionapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 1 addition, 4 deletions...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 6 additions, 5 deletions...cation/view/adminhtml/templates/notification/window.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 17 additions, 5 deletions...tification/view/adminhtml/templates/system/messages.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 16 additions, 11 deletions...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml 60 additions, 23 deletions...Notification/view/adminhtml/templates/toolbar_entry.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 9 additions, 7 deletions...minNotification/view/adminhtml/web/system/notification.js
- app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js 69 additions, 76 deletions...nto/AdminNotification/view/adminhtml/web/toolbar_entry.js
- app/code/Magento/Backend/Block/Menu.php 11 additions, 8 deletionsapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/Page/Locale.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Page/Locale.php
- app/code/Magento/Backend/Block/System/Design.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/System/Design.php
- app/code/Magento/Backend/Block/Widget/Button.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Widget/Button.php
- app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml 33 additions, 0 deletions...ode/Magento/Backend/view/adminhtml/layout/admin_login.xml
- app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml 4 additions, 5 deletions...to/Backend/view/adminhtml/layout/adminhtml_auth_login.xml
- app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml 3 additions, 3 deletions...ckend/view/adminhtml/layout/adminhtml_dashboard_index.xml
- app/code/Magento/Backend/view/adminhtml/layout/default.xml 7 additions, 6 deletionsapp/code/Magento/Backend/view/adminhtml/layout/default.xml
- app/code/Magento/Backend/view/adminhtml/layout/editor.xml 0 additions, 1 deletionapp/code/Magento/Backend/view/adminhtml/layout/editor.xml
- app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 21 additions, 40 deletions...agento/Backend/view/adminhtml/templates/admin/login.phtml
- app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml 4 additions, 2 deletions...ackend/view/adminhtml/templates/admin/login_buttons.phtml
Please register or sign in to comment