Merge remote-tracking branch 'upstream/develop' into MAGETWO-39119 (bf7c6eab) · Commits · KIII-12 / Magento

Commit bf7c6eab authored 9 years ago by

Maksym Savich

Browse files

Merge remote-tracking branch 'upstream/develop' into MAGETWO-39119

parents fb001c92 87f0ada5

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.htaccess 1 addition, 8 deletions

.htaccess
app/code/Magento/AdminNotification/Block/Window.php 1 addition, 1 deletion

app/code/Magento/AdminNotification/Block/Window.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php 1 addition, 21 deletions

...o/AdminNotification/Controller/Adminhtml/Notification.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php 8 additions, 0 deletions

...fication/Controller/Adminhtml/Notification/MarkAsRead.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php 8 additions, 0 deletions

...tion/Controller/Adminhtml/Notification/MassMarkAsRead.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php 8 additions, 0 deletions

...fication/Controller/Adminhtml/Notification/MassRemove.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php 8 additions, 0 deletions

...Notification/Controller/Adminhtml/Notification/Remove.php
app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php 1 addition, 1 deletion

...agento/AdminNotification/Model/System/Message/Baseurl.php
app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php 1 addition, 2 deletions

...tion/Model/System/Message/Media/Synchronization/Error.php
app/code/Magento/AdminNotification/Model/System/Message/Security.php 2 additions, 2 deletions

...gento/AdminNotification/Model/System/Message/Security.php
app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php 1 addition, 1 deletion

.../Model/System/Message/Media/Synchronization/ErrorTest.php
app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php 1 addition, 1 deletion

...ification/Test/Unit/Model/System/Message/SecurityTest.php
app/code/Magento/Authorization/Model/Acl/AclRetriever.php 5 additions, 2 deletions

app/code/Magento/Authorization/Model/Acl/AclRetriever.php
app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php 1 addition, 1 deletion

...to/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
app/code/Magento/Backend/Block/Cache.php 1 addition, 1 deletion

app/code/Magento/Backend/Block/Cache.php
app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 1 addition, 1 deletion

...ento/Backend/Controller/Adminhtml/System/Account/Save.php
app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php 1 addition, 1 deletion

...nto/Backend/Controller/Adminhtml/System/Design/Delete.php
app/code/Magento/Backend/Controller/Adminhtml/System/Store.php 1 addition, 1 deletion

...ode/Magento/Backend/Controller/Adminhtml/System/Store.php
app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php 1 addition, 1 deletion

...Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php 2 additions, 2 deletions

...end/Controller/Adminhtml/System/Store/DeleteGroupPost.php

with 54 additions and 47 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'upstream/develop' into MAGETWO-39119