Merge branch 'develop_mainline' into MAGETWO-35679-cannot-access-admin-store-code
Showing
- app/code/Magento/AdminNotification/Block/System/Messages.php 5 additions, 8 deletionsapp/code/Magento/AdminNotification/Block/System/Messages.php
- app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php 3 additions, 3 deletions...Notification/Block/System/Messages/UnreadMessagePopup.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 4 additions, 4 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/Block/Window.php 3 additions, 3 deletionsapp/code/Magento/AdminNotification/Block/Window.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php 3 additions, 3 deletions...cation/Controller/Adminhtml/System/Message/ListAction.php
- app/code/Magento/AdminNotification/Model/Feed.php 2 additions, 2 deletionsapp/code/Magento/AdminNotification/Model/Feed.php
- app/code/Magento/AdminNotification/Model/Inbox.php 3 additions, 3 deletionsapp/code/Magento/AdminNotification/Model/Inbox.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php 3 additions, 3 deletions...AdminNotification/Model/ResourceModel/Grid/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php 2 additions, 2 deletions...e/Magento/AdminNotification/Model/ResourceModel/Inbox.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php 3 additions, 3 deletions...dminNotification/Model/ResourceModel/Inbox/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php 3 additions, 3 deletions...ication/Model/ResourceModel/Inbox/Collection/Critical.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php 3 additions, 3 deletions...ification/Model/ResourceModel/Inbox/Collection/Unread.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php 2 additions, 2 deletions.../AdminNotification/Model/ResourceModel/System/Message.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php 5 additions, 5 deletions...ication/Model/ResourceModel/System/Message/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php 3 additions, 3 deletions.../ResourceModel/System/Message/Collection/Synchronized.php
- app/code/Magento/AdminNotification/Model/System/Message.php 1 addition, 1 deletionapp/code/Magento/AdminNotification/Model/System/Message.php
- app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php 1 addition, 1 deletion...agento/AdminNotification/Model/System/Message/Baseurl.php
- app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php 2 additions, 2 deletions...to/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/BaseurlTest.php 1 addition, 1 deletion...tification/Test/Unit/Model/System/Message/BaseurlTest.php
- app/code/Magento/AdminNotification/etc/adminhtml/events.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/events.xml
Please register or sign in to comment