Merge remote-tracking branch 'upstream/develop' into develop
Showing
- .gitignore 5 additions, 0 deletions.gitignore
- .travis.yml 18 additions, 11 deletions.travis.yml
- COPYING.txt 1 addition, 1 deletionCOPYING.txt
- README.md 25 additions, 1 deletionREADME.md
- app/bootstrap.php 3 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/Inbox.php 3 additions, 0 deletionsapp/code/Magento/AdminNotification/Block/Inbox.php
- app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php 3 additions, 0 deletions...Notification/Block/System/Messages/UnreadMessagePopup.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 1 addition, 0 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/Block/Window.php 3 additions, 0 deletionsapp/code/Magento/AdminNotification/Block/Window.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php 1 addition, 0 deletions...dminNotification/Model/ResourceModel/Inbox/Collection.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 1 addition, 1 deletion...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml 26 additions, 35 deletions...ication/view/adminhtml/ui_component/notification_area.xml
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Activate.php 30 additions, 13 deletions.../Analytics/Controller/Adminhtml/Subscription/Activate.php
- app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php 7 additions, 7 deletions...nto/Analytics/Controller/Adminhtml/Subscription/Retry.php
- app/code/Magento/Analytics/Cron/SignUp.php 1 addition, 1 deletionapp/code/Magento/Analytics/Cron/SignUp.php
- app/code/Magento/Analytics/Cron/Update.php 1 addition, 1 deletionapp/code/Magento/Analytics/Cron/Update.php
- app/code/Magento/Analytics/Model/Condition/CanViewNotification.php 17 additions, 5 deletions...Magento/Analytics/Model/Condition/CanViewNotification.php
- app/code/Magento/Analytics/Model/Config/Backend/Enabled.php 5 additions, 0 deletionsapp/code/Magento/Analytics/Model/Config/Backend/Enabled.php
Please register or sign in to comment