Merge branch 'develop' of https://github.com/magento/magento2 into develop
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .htaccess 110 additions, 6 deletions.htaccess
- .htaccess.sample 79 additions, 16 deletions.htaccess.sample
- .travis.yml 9 additions, 13 deletions.travis.yml
- CHANGELOG.md 235 additions, 0 deletionsCHANGELOG.md
- Gruntfile.js 12 additions, 7 deletionsGruntfile.js
- app/autoload.php 10 additions, 1 deletionapp/autoload.php
- app/bootstrap.php 11 additions, 5 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 1 addition, 1 deletion...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- 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 5 additions, 15 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/Observer.php 0 additions, 52 deletionsapp/code/Magento/AdminNotification/Model/Observer.php
- app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php 0 additions, 29 deletions...ento/AdminNotification/Model/Resource/Grid/Collection.php
- app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection.php 0 additions, 35 deletions...nto/AdminNotification/Model/Resource/Inbox/Collection.php
- app/code/Magento/AdminNotification/Model/Resource/System/Message.php 0 additions, 26 deletions...gento/AdminNotification/Model/Resource/System/Message.php
Please register or sign in to comment