Skip to content

Change of copyright year from 2017 to 2018. #13027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2018
Merged

Change of copyright year from 2017 to 2018. #13027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95001c7
Change of copyright year from 2017 to 2018.
bhargavmehta Jan 7, 2018
7a8121f
Changed the Copyright as per the guidelines
bhargavmehta Jan 7, 2018
908a143
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
bhargavmehta Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COPYING.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2013-2017 Magento, Inc.
Copyright © 2013-2018 Magento, Inc.

Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license

Expand Down
2 changes: 1 addition & 1 deletion ...e/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/payload-extender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
Copy link
Contributor

@ishakhsuvarov ishakhsuvarov Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is an artifact form the previous copyright update.
Please change it to the one without specific year like in all other code files.

* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define(function () {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/web/js/invalidation-processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
define([
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Disallow: /*SID=
<welcome>Default welcome msg!</welcome>
</header>
<footer translate="copyright">
<copyright>Copyright &#169; 2013-2017 Magento, Inc. All rights reserved.</copyright>
<copyright>Copyright &#169; 2013-2018 Magento, Inc. All rights reserved.</copyright>
</footer>
</design>
<theme>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Empty,Empty
"1 column","1 column"
Configuration,Configuration
"Default welcome msg!","Default welcome msg!"
"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
"Copyright © 2013-2018 Magento, Inc. All rights reserved.","Copyright © 2013-2018 Magento, Inc. All rights reserved."
"Design Config Grid","Design Config Grid"
"Rebuild design config grid index","Rebuild design config grid index"
"Admin empty","Admin empty"
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private function getRequestParams()
'header_logo_height' => '',
'header_logo_alt' => '',
'header_welcome' => 'Default welcome msg!',
'footer_copyright' => 'Copyright © 2013-2017 Magento, Inc. All rights reserved.',
'footer_copyright' => 'Copyright © 2013-2018 Magento, Inc. All rights reserved.',
'footer_absolute_footer' => '',
'default_robots' => 'INDEX,FOLLOW',
'custom_instructions' => '',
Expand Down