Skip to content

Commit 86f563c

Browse files
author
Igor Melnikov
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-67296-string-localization
2 parents 5f8cfe6 + 8868a95 commit 86f563c

File tree

1,150 files changed

+12680
-4184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,150 files changed

+12680
-4184
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
group: edge
34
addons:
45
apt:
56
packages:

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Controller\Adminhtml;
99

10+
/**
11+
* @api
12+
*/
1013
abstract class Notification extends \Magento\Backend\App\AbstractAction
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification update frequency source
1010
*
1111
* @codeCoverageIgnore
12+
* @api
1213
*/
1314
class Frequency implements \Magento\Framework\Option\ArrayInterface
1415
{

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Feed extends \Magento\Framework\Model\AbstractModel
1718
{

‎app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @method int getIsRemove()
3030
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
3131
*
32-
* @author Magento Core Team <core@magentocommerce.com>
32+
* @api
3333
*/
3434
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3535
{

‎app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification Inbox interface
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @api
1213
*/
1314
interface InboxInterface
1415
{

‎app/code/Magento/AdminNotification/Model/NotificationService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Notification service model
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @api
1213
*/
1314
class NotificationService
1415
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Grid;
1313

14+
/**
15+
* @api
16+
*/
1417
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
namespace Magento\AdminNotification\Model\ResourceModel;
77

88
/**
9-
* AdminNotification Inbox model
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
9+
* @api
1210
*/
1311
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @api
1212
* @author Magento Core Team <core@magentocommerce.com>
13+
* @api
1314
*/
1415
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1516
{

0 commit comments

Comments
 (0)