Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into mavericks
Conflicts: dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/EstimateShippingAndTaxStep.php dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
Showing
- CHANGELOG.md 33 additions, 0 deletionsCHANGELOG.md
- app/bootstrap.php 1 addition, 1 deletionapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/System/Messages.php 4 additions, 2 deletionsapp/code/Magento/AdminNotification/Block/System/Messages.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 42 additions, 7 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 1 addition, 4 deletions...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml 6 additions, 5 deletions...cation/view/adminhtml/templates/notification/window.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml 17 additions, 5 deletions...tification/view/adminhtml/templates/system/messages.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 16 additions, 11 deletions...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml 60 additions, 23 deletions...Notification/view/adminhtml/templates/toolbar_entry.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 9 additions, 7 deletions...minNotification/view/adminhtml/web/system/notification.js
- app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js 69 additions, 76 deletions...nto/AdminNotification/view/adminhtml/web/toolbar_entry.js
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/App/AbstractAction.php 1 addition, 1 deletionapp/code/Magento/Backend/App/AbstractAction.php
- app/code/Magento/Backend/Block/Dashboard/Graph.php 18 additions, 28 deletionsapp/code/Magento/Backend/Block/Dashboard/Graph.php
- app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php 1 addition, 3 deletionsapp/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
- app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php 1 addition, 3 deletionsapp/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
- app/code/Magento/Backend/Block/Menu.php 12 additions, 9 deletionsapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/Page.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Page.php
- app/code/Magento/Backend/Block/Page/Locale.php 2 additions, 2 deletionsapp/code/Magento/Backend/Block/Page/Locale.php
Please register or sign in to comment