Merge pull request #1 from magento/develop
upstream on patch
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- .htaccess 46 additions, 14 deletions.htaccess
- .htaccess.sample 46 additions, 32 deletions.htaccess.sample
- .php_cs 0 additions, 1 deletion.php_cs
- .travis.yml 24 additions, 57 deletions.travis.yml
- .user.ini 4 additions, 0 deletions.user.ini
- CHANGELOG.md 4 additions, 0 deletionsCHANGELOG.md
- Gruntfile.js.sample 10 additions, 10 deletionsGruntfile.js.sample
- ISSUE_TEMPLATE.md 22 additions, 14 deletionsISSUE_TEMPLATE.md
- README.md 1 addition, 1 deletionREADME.md
- app/bootstrap.php 8 additions, 7 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 2 additions, 2 deletions...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php 2 additions, 3 deletions.../Magento/AdminNotification/Block/Grid/Renderer/Notice.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php 2 additions, 2 deletions...tion/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php 1 addition, 1 deletion...fication/Controller/Adminhtml/Notification/MarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php 1 addition, 1 deletion...tion/Controller/Adminhtml/Notification/MassMarkAsRead.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php 1 addition, 1 deletion...fication/Controller/Adminhtml/Notification/MassRemove.php
- app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php 1 addition, 1 deletion...Notification/Controller/Adminhtml/Notification/Remove.php
- app/code/Magento/AdminNotification/Model/Inbox.php 1 addition, 1 deletionapp/code/Magento/AdminNotification/Model/Inbox.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php 4 additions, 1 deletion...dminNotification/Model/ResourceModel/Inbox/Collection.php
Please register or sign in to comment