Skip to content

Commit 101aabc

Browse files
author
Vitaliy
authored
Merge pull request #71 from magento/legal-review
Legal review update
2 parents 3c595b1 + a19eb37 commit 101aabc

File tree

78 files changed

+144
-9867
lines changed

Some content is hidden

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

78 files changed

+144
-9867
lines changed

‎CODE_OF_CONDUCT.md ‎.github/CODE_OF_CONDUCT.md

‎CONTRIBUTING.md ‎.github/CONTRIBUTING.md

‎.github/ISSUE_TEMPLATE.md

+33

‎.github/PULL_REQUEST_TEMPLATE.md

+34

‎COPYING.txt

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
Copyright © 2015-present Dmytro Kvashnin.
1+
Copyright © 2015-present Magento, Inc.
22

3-
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
4-
5-
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
6-
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
7-
8-
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
9-
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
3+
Each Magento source file included in this distribution is licensed under OSL-3.0 license
4+
Please see LICENSE.txt for the full text of the OSL-3.0 license or visit http://opensource.org/licenses/osl-3.0.php

‎LICENSE.md ‎LICENSE.txt

File renamed without changes.

‎META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
/**
3-
* Copyright © Dmytro Kvashnin. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
-->

‎README.md

+4-1

‎resources/META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
/**
3-
* Copyright © Dmytro Kvashnin. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
-->

‎src/com/magento/idea/magento2plugin/MagentoIcons.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin;

‎src/com/magento/idea/magento2plugin/completion/provider/CompositeCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/EventNameCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/FilePathCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutBlockCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutContainerCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/LayoutUpdateCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/ModuleNameCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/PhpClassCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/PhpClassMemberCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/PhpConstructorArgumentCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/PhpServiceMethodCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/provider/VirtualTypeCompletionProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.provider;

‎src/com/magento/idea/magento2plugin/completion/xml/XmlCompletionContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.completion.xml;

‎src/com/magento/idea/magento2plugin/indexes/DiIndex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.indexes;

‎src/com/magento/idea/magento2plugin/indexes/EventIndex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.indexes;

‎src/com/magento/idea/magento2plugin/indexes/IndexManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.indexes;

‎src/com/magento/idea/magento2plugin/indexes/LayoutIndex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.indexes;

‎src/com/magento/idea/magento2plugin/indexes/XmlIndex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.indexes;

‎src/com/magento/idea/magento2plugin/php/linemarker/ClassConfigurationLineMarkerProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.linemarker;

‎src/com/magento/idea/magento2plugin/php/linemarker/PluginLineMarkerProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.linemarker;

‎src/com/magento/idea/magento2plugin/php/linemarker/WebApiLineMarkerProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.linemarker;

‎src/com/magento/idea/magento2plugin/php/module/ComposerPackageModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/module/ComposerPackageModelImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/module/MagentoComponent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/module/MagentoComponentImp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/module/MagentoComponentManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/module/MagentoModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.module;

‎src/com/magento/idea/magento2plugin/php/util/PhpPatternsHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.util;

‎src/com/magento/idea/magento2plugin/php/util/PhpRegex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.php.util;

‎src/com/magento/idea/magento2plugin/project/ProjectDetector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.project;

‎src/com/magento/idea/magento2plugin/project/Settings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.project;

‎src/com/magento/idea/magento2plugin/project/SettingsForm.form

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Dmytro Kvashnin. All rights reserved.
4+
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

‎src/com/magento/idea/magento2plugin/project/SettingsForm.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.project;

‎src/com/magento/idea/magento2plugin/reference/js/JsReferenceContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.js;

‎src/com/magento/idea/magento2plugin/reference/php/PhpReferenceContributor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.php;

‎src/com/magento/idea/magento2plugin/reference/provider/CompositeReferenceProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.provider;

‎src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.provider;

‎src/com/magento/idea/magento2plugin/reference/provider/EventNameReferenceProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.provider;

‎src/com/magento/idea/magento2plugin/reference/provider/FilePathReferenceProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.provider;

‎src/com/magento/idea/magento2plugin/reference/provider/LayoutBlockReferenceProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © Dmytro Kvashnin. All rights reserved.
2+
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55
package com.magento.idea.magento2plugin.reference.provider;

0 commit comments

Comments
 (0)