Merge branch 'develop_mainline' into develop
Conflicts: composer.lock dev/tools/Magento/Tools/View/deploy.php
Showing
- CHANGELOG.md 33 additions, 0 deletionsCHANGELOG.md
- app/bootstrap.php 1 addition, 1 deletionapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/ToolbarEntry.php 11 additions, 6 deletionsapp/code/Magento/AdminNotification/Block/ToolbarEntry.php
- app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php 3 additions, 3 deletions...to/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php 2 additions, 2 deletions...de/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php 1 addition, 1 deletion...nNotification/Test/Unit/Model/NotificationServiceTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/BaseurlTest.php 245 additions, 0 deletions...tification/Test/Unit/Model/System/Message/BaseurlTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php 2 additions, 2 deletions...tion/Test/Unit/Model/System/Message/CacheOutdatedTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php 92 additions, 0 deletions.../Model/System/Message/Media/Synchronization/ErrorTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php 101 additions, 0 deletions...odel/System/Message/Media/Synchronization/SuccessTest.php
- app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php 2 additions, 2 deletions...ification/Test/Unit/Model/System/Message/SecurityTest.php
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php 3 additions, 1 deletion...to/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
- app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RoleTest.php 1 addition, 1 deletion...nto/Authorization/Test/Unit/Model/Acl/Loader/RoleTest.php
- app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RuleTest.php 69 additions, 0 deletions...nto/Authorization/Test/Unit/Model/Acl/Loader/RuleTest.php
- app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php 4 additions, 2 deletions...uthorization/Test/Unit/Model/CompositeUserContextTest.php
- 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
Please register or sign in to comment