Merge github.com:magento/magento2 into develop
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- .htaccess 128 additions, 38 deletions.htaccess
- .htaccess.sample 129 additions, 38 deletions.htaccess.sample
- .travis.yml 16 additions, 8 deletions.travis.yml
- .user.ini 1 addition, 1 deletion.user.ini
- CHANGELOG.md 690 additions, 0 deletionsCHANGELOG.md
- CONTRIBUTING.md 5 additions, 0 deletionsCONTRIBUTING.md
- app/.htaccess 8 additions, 2 deletionsapp/.htaccess
- app/autoload.php 0 additions, 3 deletionsapp/autoload.php
- app/bootstrap.php 13 additions, 5 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 2 additions, 5 deletions...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- app/code/Magento/AdminNotification/Block/Inbox.php 1 addition, 0 deletionsapp/code/Magento/AdminNotification/Block/Inbox.php
- app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php 1 addition, 0 deletions...Notification/Block/System/Messages/UnreadMessagePopup.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 1 addition, 2 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/Block/Window.php 1 addition, 0 deletionsapp/code/Magento/AdminNotification/Block/Window.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php 4 additions, 0 deletions...o/AdminNotification/Controller/Adminhtml/Notification.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php 5 additions, 0 deletions...cation/Controller/Adminhtml/System/Message/ListAction.php
- app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php 2 additions, 0 deletions...gento/AdminNotification/Model/Config/Source/Frequency.php
- app/code/Magento/AdminNotification/Model/Feed.php 16 additions, 3 deletionsapp/code/Magento/AdminNotification/Model/Feed.php
- app/code/Magento/AdminNotification/Model/Inbox.php 2 additions, 3 deletionsapp/code/Magento/AdminNotification/Model/Inbox.php
Please register or sign in to comment