Skip to content

Commit

Permalink
merge upstream (#2)
Browse files Browse the repository at this point in the history 
* MAGETWO-64607: Implement custom provider to collect store and system configuration

* MAGETWO-64608: Configure store and website reports for data collection

* MAGETWO-64612: Implement config for Analytics cron setting

* Create wishlist.js

* Delete wishlist.js

* Update requirejs-config.js

* MAGETWO-64607: Implement custom provider to collect store and system configuration

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64629: Add plugin for base url change

small refactoring

* MAGETWO-64630: Create cronjob that executes update command

* MAGETWO-64629: Add plugin for base url change

review fixes

* MTO-142: [Test] Captcha on front login

- Defects fixed.

* MTO-142: [Test] Captcha on front login

- Defects fixed.

* MAGETWO-64630: Create cronjob that executes update command

* MAGETWO-63406: [Github] Paypal Payment Order Transaction ID Link will result to 404 not found

- Fixed returned link
- Fixed unit tests

* Update Save.php

If quantity is changed using mass action for attribute changes, but no stock item exists for the product, saving the newly created stockItem in StockItemRepository->save($stockItem) returns without saving the stockItem, since $stockItem->getProductId() is null, due to it being added to the array with key '0' (see line 165). To fix this, the array key has been changed to "product_id", such that StockItemRepository successfully creates the stockItem.
Also, in my opinion, StockItemRepository->save() should not just return without notice, especially as it already encapsulates the functionality in a try/catch block. Throwing an exception would actually tell the user that something went wrong.

* MAGETWO-64630: Create cronjob that executes update command

* MAGETWO-64224: Remove usages of AttributeCache from customer module

- fixing annotation

* MAGETWO-64224: Remove usages of AttributeCache from customer module

- making inheritdoc lowercase

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64612: Implement config for Analytics cron setting

* MAGETWO-64629: Add plugin for base url change

add secure url check

* MAGETWO-64629: Add plugin for base url change

add secure url check test

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

* MAGETWO-64505: [Integration] Advanced Analytics subscription create API request

add data provider

* MAGETWO-64505: [Integration] Advanced Analytics subscription create API request

* MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode)

- Defects fixed.

* MTO-113: [Test] Captcha on admin login

- Defects fixed

* MAGETWO-64625: Implement API for file downloading by MA

allow only secure connections for analytics

* MAGETWO-53457: [COMMUNITY] [FEEDBACK] Improve error reporting for failed order placement (checkout) magento#4682

updated unit tests

* MTO-142: [Test] Captcha on front login

- Defects fixed.

* MTO-113: [Test] Captcha on admin login

- Defects fixed

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64630: Create cronjob that executes update command

* MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420

- fix code style issues

* MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420

- fix integrity tests issues

* MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420

- fix integration tests

* MAGETWO-64902: [GitHub][PR] bug magento#8277 fixing bug with https downloading. magento#8278

* MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519

- fix unit and integration tests

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

* MAGETWO-64625: Implement API for file downloading by MA

add base64 encoding for transferring binary vector

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64613: Implement service to enrypt collected data

* MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519

- fix unit tests

* MAGETWO-64613: Implement service to enrypt collected data

* MAGETWO-64609: Extend modules report for data colection

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

- covered skipping already converted data with integration test

* MAGETWO-64608: Configure store and website reports for data collection

* MAGETWO-64613: Implement service to enrypt collected data

* MAGETWO-64505: [Integration] Advanced Analytics subscription create API request

-- fix test

* MAGETWO-62322: Performance Profile Generator

* MAGETWO-62322: Performance Profile Generator

* Add correct return type in order service

The method return $this. I corrected the doc-block.

* MAGETWO-64625: Implement API for file downloading by MA

fix tests

* MAGETWO-62549: Collect Data by cron and encrypt file

-- fix code style

* MAGETWO-64625: Implement API for file downloading by MA

allow only secure connections for analytics

* MAGETWO-62549: Collect Data by cron and encrypt file

-- fix code style

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Issue added to variation

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64626: Web API test for file export

edit test for run on http

* MAGETWO-65006: [GitHub][PR] Keep transparency when resizing images magento#7307

 - fix is created based on public pull request magento#7307 by @kassner
 - closing magento#7307

* MAGETWO-51176: ST compiler supplies ObjectManagerInterface to direct third party dependencies

* Fixed Doc Block for the dispatch method of the Rest Controller

- provided more information on how dispatch method handles the Request

* remove unused ComponentRegistrar instance from being passed to Populator::populateMappings

* Fixed return type of OrderRepository::getList

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

- custom converters coverage

* MAGETWO-64626: Web API test for file export

edit test for run on http

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64626: Web API test for file export

edit test for run on http

* MAGETWO-64626: Web API test for file export

allow only secure connections for analytics

* MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode)

- Duplicated new line removed.

* MAGETWO-64626: Web API test for file export

edit test for run on http

* MTO-146: [Test] Create offline Order from "Edit Customer" Admin page

- Defects fixed

* MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter

- custom converters
- fixed integration test and removed dependency

* MTO-142: [Test] Captcha on front login

- Defects fixed.

* MAGETWO-64796: Added fixture for Customer module with assigned website

* MAGETWO-64601: [Integration] report page API request for Advanced analytics

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

* MAGETWO-64515: change comment in file due to PR risk

* MAGETWO-64515: change comment in file due to PR risk

* MAGETWO-62168: Improve field data converter logging and error reporting

* MAGETWO-62168: Improve field data converter logging and error reporting

* MAGETWO-62168: Improve field data converter logging and error reporting

* MAGETWO-62168: Improve field data converter logging and error reporting

* MAGETWO-62168: Improve field data converter logging and error reporting

* MAGETWO-62168: Improve field data converter logging and error reporting
  • Loading branch information
@markpol
markpol authored Mar 5, 2017
1 parent a3adb88 commit 2b81a6c
Show file tree
Hide file tree
Showing 24,822 changed files with 236,298 additions and 68,528 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ atlassian*
/lib/internal/flex/varien/.settings
/node_modules
/.grunt
/Gruntfile.js
/package.json

/pub/media/*.*
!/pub/media/.htaccess
/pub/media/analytics/*
/pub/media/catalog/*
!/pub/media/catalog/.htaccess
/pub/media/customer/*
Expand All @@ -49,3 +52,5 @@ atlassian*
!/var/.htaccess
/vendor/*
!/vendor/.htaccess
/generated/*
!/generated/.htaccess
2 changes: 1 addition & 1 deletion .php_cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ addons:
- postfix
language: php
php:
- 5.6
- 5.6.29
- 7.0
env:
global:
Expand All @@ -31,7 +31,7 @@ matrix:
before_install: ./dev/travis/before_install.sh
install: composer install --no-interaction --prefer-dist
before_script: ./dev/travis/before_script.sh
script:
script:
- cd dev/tests/$TEST_SUITE
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
- phpunit $TEST_FILTER
2 changes: 1 addition & 1 deletion Gruntfile.js.sample
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand Down
59 changes: 6 additions & 53 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,14 @@
<h2>Welcome</h2>
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.

The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
## Magento system requirements
[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)

<h2>New to Magento? Need some help?</h2>
If you're not sure about the following, you probably need a little help before you start installing the Magento software:
## Install Magento
To install Magento, see either:

* Is the Magento software <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
* What's a <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
* Where's my <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
* What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">PHP</a>?
* What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">Apache</a>?
* What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">MySQL</a>?

<h2>Step 1: Verify your prerequisites</h2>

Use the following table to verify you have the correct prerequisites to install the Magento software.

<table>
<tbody>
<tr>
<th>Prerequisite</th>
<th>How to check</th>
<th>For more information</th>
</tr>
<tr>
<td>Apache 2.2 or 2.4</td>
<td>Ubuntu: <code>apache2 -v</code><br>
CentOS: <code>httpd -v</code></td>
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
</tr>
<tr>
<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
<td><code>php -v</code></td>
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
</tr>
<tr><td>MySQL 5.6.x</td>
<td><code>mysql -u [root user name] -p</code></td>
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/mysql.html">MySQL</a></td>
</tr>
</tbody>
</table>

<h2>Step 2: Prepare to install</h2>

After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.

1. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
2. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>

<h2>Step 3: Install and verify the installation</h2>

1. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
2. Install Magento:
* <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
* <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
2. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/verify.html">Verify the installation</a>
* [Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
* [Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)

<h2>Contributing to the Magento 2 code base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
Expand Down
2 changes: 1 addition & 1 deletion app/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Register basic autoloader that uses include path
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
use Magento\Framework\Autoload\AutoloaderRegistry;
Expand Down
23 changes: 19 additions & 4 deletions app/bootstrap.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand All @@ -11,14 +11,14 @@
#ini_set('display_errors', 1);

/* PHP version validation */
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50605 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
if (PHP_SAPI == 'cli') {
echo 'Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
echo 'Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
} else {
echo <<<HTML
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
<p>Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
<p>Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
Magento System Requirements</a>.
</div>
Expand All @@ -35,6 +35,17 @@
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
umask($mask);

if (empty($_SERVER['ENABLE_IIS_REWRITES']) || ($_SERVER['ENABLE_IIS_REWRITES'] != 1)) {
/*
* Unset headers used by IIS URL rewrites.
*/
unset($_SERVER['HTTP_X_REWRITE_URL']);
unset($_SERVER['HTTP_X_ORIGINAL_URL']);
unset($_SERVER['IIS_WasUrlRewritten']);
unset($_SERVER['UNENCODED_URL']);
unset($_SERVER['ORIG_PATH_INFO']);
}

if (!empty($_SERVER['MAGE_PROFILER'])
&& isset($_SERVER['HTTP_ACCEPT'])
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
Expand All @@ -47,3 +58,7 @@
}

date_default_timezone_set('UTC');

/* Adjustment of precision value for several versions of PHP */
ini_set('precision', 17);
ini_set('serialize_precision', 17);
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Adminhtml AdminNotification Severity Renderer
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Adminhtml AdminNotification Severity Renderer
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block\Grid\Renderer;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Adminhtml AdminNotification Severity Renderer
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block\Grid\Renderer;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Adminhtml AdminNotification inbox grid
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/System/Messages.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block\System;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block\System\Messages;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/ToolbarEntry.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Block/Window.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Critical notification window
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Block;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Adminhtml AdminNotification controller
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Controller\Adminhtml\System\Message;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model\Config\Source;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/Feed.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/Inbox.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/InboxInterface.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/NotificationService.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model\ResourceModel;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model\ResourceModel\Inbox;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Critical messages collection
*
* Copyright © 2016 Magento. All rights reserved.
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
Expand Down
Loading

0 comments on commit 2b81a6c

Please sign in to comment.