Merge branch 'mainline' into MAGETWO-44464 (5262ea46) · Commits · KIII-12 / Magento

Commit 5262ea46 authored 9 years ago by

Volodymyr Kholoshenko

Browse files

Merge branch 'mainline' into MAGETWO-44464

parents 336aa133 ec5598bd

Branches

Hide whitespace changes

Inline Side-by-side

Showing

.htaccess 26 additions, 0 deletions

.htaccess
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php 1 addition, 1 deletion

...tion/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php 1 addition, 1 deletion

...nNotification/Controller/Adminhtml/Notification/Index.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/Controller/Adminhtml/System/Message/ListAction.php 1 addition, 1 deletion

...cation/Controller/Adminhtml/System/Message/ListAction.php
app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/SuccessTest.php 0 additions, 101 deletions

...odel/System/Message/Media/Synchronization/SuccessTest.php
app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php 1 addition, 1 deletion

...ingImportExport/Controller/Adminhtml/Export/GetFilter.php
app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php 1 addition, 1 deletion

...oller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php 1 addition, 1 deletion

...er/Adminhtml/Authorizenet/Directpost/Payment/Redirect.php
app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php 1 addition, 1 deletion

...Adminhtml/Authorizenet/Directpost/Payment/ReturnQuote.php
app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php 1 addition, 1 deletion

...rizenet/Controller/Directpost/Payment/BackendResponse.php
app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php 1 addition, 1 deletion

...ento/Authorizenet/Controller/Directpost/Payment/Place.php
app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php 1 addition, 1 deletion

...o/Authorizenet/Controller/Directpost/Payment/Redirect.php
app/code/Magento/Authorizenet/Controller/Directpost/Payment/Response.php 1 addition, 1 deletion

...o/Authorizenet/Controller/Directpost/Payment/Response.php
app/code/Magento/Authorizenet/Controller/Directpost/Payment/ReturnQuote.php 1 addition, 1 deletion

...uthorizenet/Controller/Directpost/Payment/ReturnQuote.php
app/code/Magento/Authorizenet/Test/Unit/Controller/Adminhtml/Authorizenet/Directpost/Payment/RedirectTest.php 11 additions, 6 deletions

...dminhtml/Authorizenet/Directpost/Payment/RedirectTest.php
app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php 2 additions, 2 deletions

...net/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

with 55 additions and 125 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'mainline' into MAGETWO-44464

Some changes are not shown.