From d7a2fea7404d55eff64fa17614505f0ad5627315 Mon Sep 17 00:00:00 2001 From: David Langley Date: Fri, 17 Jan 2025 11:27:46 +0000 Subject: [PATCH 1/4] Add commercial license file, update package.json and licence description in README --- LICENSE-COMMERCIAL | 6 ++++++ README.md | 15 +++++++++++++++ package.json | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 LICENSE-COMMERCIAL diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL new file mode 100644 index 00000000..13484859 --- /dev/null +++ b/LICENSE-COMMERCIAL @@ -0,0 +1,6 @@ +Licensees holding a valid commercial license with Element may use this +software in accordance with the terms contained in a written agreement +between you and Element. + +To purchase a commercial license please contact our sales team at +licensing@element.io \ No newline at end of file diff --git a/README.md b/README.md index 2c2f2c98..d24ebe41 100644 --- a/README.md +++ b/README.md @@ -155,3 +155,18 @@ For a developer guide, see the [translating dev doc](https://github.com/vector-i If you run into any bugs or have feedback you'd like to share, please let us know on GitHub. To help avoid duplicate issues, please [view existing issues](https://github.com/vector-im/element-web/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc) first (and add a +1) or [create a new issue](https://github.com/vector-im/element-web/issues/new/choose) if you can't find it. Please note that this issue tracker is associated with the [element-web](https://github.com/vector-im/element-web) repo, but is also applied to the code in this repo as well. + +## Copyright & License + +Copyright (c) 2016-2017 OpenMarket Ltd +Copyright (c) 2017 Vector Creations Ltd +Copyright (c) 2017-2025 New Vector Ltd + +This software is multi licensed by New Vector Ltd (Element). It can be used either: + +(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR + +(2) for free under the terms of the GNU General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR + +(3) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to). +Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses. diff --git a/package.json b/package.json index 01c35544..07dea95c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "type": "git", "url": "https://github.com/vector-im/element-desktop" }, - "license": "AGPL-3.0-only OR GPL-3.0-only", + "license": "SEE LICENSE IN README.md", "type": "module", "files": [], "engines": { From 845ede49891a0a0741256c7fc1d38a7445729999 Mon Sep 17 00:00:00 2001 From: David Langley Date: Fri, 17 Jan 2025 11:44:49 +0000 Subject: [PATCH 2/4] Add commercial license to source headers --- hak/keytar/build.ts | 2 +- hak/keytar/check.ts | 2 +- hak/matrix-seshat/build.ts | 2 +- hak/matrix-seshat/check.ts | 2 +- playwright.config.ts | 2 +- playwright/e2e/launch/config-options.spec.ts | 2 +- playwright/e2e/launch/launch.spec.ts | 2 +- playwright/element-desktop-test.ts | 2 +- scripts/@types/node-pre-gyp.d.ts | 2 +- scripts/hak/build.ts | 2 +- scripts/hak/check.ts | 2 +- scripts/hak/clean.ts | 2 +- scripts/hak/copy.ts | 2 +- scripts/hak/dep.ts | 2 +- scripts/hak/fetch.ts | 2 +- scripts/hak/fetchDeps.ts | 2 +- scripts/hak/hakEnv.ts | 2 +- scripts/hak/index.ts | 2 +- scripts/hak/link.ts | 2 +- scripts/hak/target.ts | 2 +- src/@types/global.d.ts | 2 +- src/@types/matrix-seshat.d.ts | 2 +- src/displayMediaCallback.ts | 2 +- src/electron-main.ts | 2 +- src/ipc.ts | 2 +- src/keytar.ts | 2 +- src/language-helper.ts | 2 +- src/macos-titlebar.ts | 2 +- src/media-auth.ts | 2 +- src/preload.cts | 2 +- src/protocol.ts | 2 +- src/seshat.ts | 2 +- src/settings.ts | 2 +- src/squirrelhooks.ts | 2 +- src/tray.ts | 2 +- src/updater.ts | 2 +- src/utils.ts | 2 +- src/vectormenu.ts | 2 +- src/webcontents-handler.ts | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/hak/keytar/build.ts b/hak/keytar/build.ts index 39dd92c7..b3495969 100644 --- a/hak/keytar/build.ts +++ b/hak/keytar/build.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/hak/keytar/check.ts b/hak/keytar/check.ts index 3f08c2a8..3ced7f8a 100644 --- a/hak/keytar/check.ts +++ b/hak/keytar/check.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/hak/matrix-seshat/build.ts b/hak/matrix-seshat/build.ts index 5cad6097..b4e46f1f 100644 --- a/hak/matrix-seshat/build.ts +++ b/hak/matrix-seshat/build.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020, 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/hak/matrix-seshat/check.ts b/hak/matrix-seshat/check.ts index 416239c4..8e292df8 100644 --- a/hak/matrix-seshat/check.ts +++ b/hak/matrix-seshat/check.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020, 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/playwright.config.ts b/playwright.config.ts index 6848f1dc..2c8e364e 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2023 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/playwright/e2e/launch/config-options.spec.ts b/playwright/e2e/launch/config-options.spec.ts index c3c91fcd..39d7c1d5 100644 --- a/playwright/e2e/launch/config-options.spec.ts +++ b/playwright/e2e/launch/config-options.spec.ts @@ -1,7 +1,7 @@ /* Copyright 2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/playwright/e2e/launch/launch.spec.ts b/playwright/e2e/launch/launch.spec.ts index ce6d4e6b..3b231ff2 100644 --- a/playwright/e2e/launch/launch.spec.ts +++ b/playwright/e2e/launch/launch.spec.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2022, 2023 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/playwright/element-desktop-test.ts b/playwright/element-desktop-test.ts index 431bac68..d8916592 100644 --- a/playwright/element-desktop-test.ts +++ b/playwright/element-desktop-test.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2023 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/@types/node-pre-gyp.d.ts b/scripts/@types/node-pre-gyp.d.ts index a3f9f94a..ee05dec8 100644 --- a/scripts/@types/node-pre-gyp.d.ts +++ b/scripts/@types/node-pre-gyp.d.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/build.ts b/scripts/hak/build.ts index 13c68a09..ccc680f6 100644 --- a/scripts/hak/build.ts +++ b/scripts/hak/build.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/check.ts b/scripts/hak/check.ts index 5c15ee9b..2936091a 100644 --- a/scripts/hak/check.ts +++ b/scripts/hak/check.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/clean.ts b/scripts/hak/clean.ts index d0f01b98..30d545e1 100644 --- a/scripts/hak/clean.ts +++ b/scripts/hak/clean.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/copy.ts b/scripts/hak/copy.ts index c70be2ab..6fda80f9 100644 --- a/scripts/hak/copy.ts +++ b/scripts/hak/copy.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020, 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/dep.ts b/scripts/hak/dep.ts index 083e0529..bbb717e1 100644 --- a/scripts/hak/dep.ts +++ b/scripts/hak/dep.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/fetch.ts b/scripts/hak/fetch.ts index 853eda5f..dc2dbd66 100644 --- a/scripts/hak/fetch.ts +++ b/scripts/hak/fetch.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/fetchDeps.ts b/scripts/hak/fetchDeps.ts index 109f154e..22dbfd5c 100644 --- a/scripts/hak/fetchDeps.ts +++ b/scripts/hak/fetchDeps.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/hakEnv.ts b/scripts/hak/hakEnv.ts index c38c9145..bcffd14f 100644 --- a/scripts/hak/hakEnv.ts +++ b/scripts/hak/hakEnv.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020, 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/index.ts b/scripts/hak/index.ts index d8277b0a..86ef2e18 100644 --- a/scripts/hak/index.ts +++ b/scripts/hak/index.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020, 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/link.ts b/scripts/hak/link.ts index 87975c33..dc74cfd1 100644 --- a/scripts/hak/link.ts +++ b/scripts/hak/link.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts index 64c2a9a5..3323e0f5 100644 --- a/scripts/hak/target.ts +++ b/scripts/hak/target.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2021 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index b4a95b05..2075193c 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -1,7 +1,7 @@ /* Copyright 2021-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/@types/matrix-seshat.d.ts b/src/@types/matrix-seshat.d.ts index 68926023..e93147b6 100644 --- a/src/@types/matrix-seshat.d.ts +++ b/src/@types/matrix-seshat.d.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/displayMediaCallback.ts b/src/displayMediaCallback.ts index 812f5759..53d8658a 100644 --- a/src/displayMediaCallback.ts +++ b/src/displayMediaCallback.ts @@ -1,7 +1,7 @@ /* Copyright 2023, 2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/electron-main.ts b/src/electron-main.ts index 28d24c6c..a1385a0e 100644 --- a/src/electron-main.ts +++ b/src/electron-main.ts @@ -4,7 +4,7 @@ Copyright 2017-2019 Michael Telatynski <7t3chguy@gmail.com> Copyright 2016 Aviral Dasgupta Copyright 2016 OpenMarket Ltd -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/ipc.ts b/src/ipc.ts index d1bc144b..55513f43 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/keytar.ts b/src/keytar.ts index 60297783..fdcddfde 100644 --- a/src/keytar.ts +++ b/src/keytar.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/language-helper.ts b/src/language-helper.ts index f646f43a..32f472a5 100644 --- a/src/language-helper.ts +++ b/src/language-helper.ts @@ -1,7 +1,7 @@ /* Copyright 2021-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/macos-titlebar.ts b/src/macos-titlebar.ts index 5ca62cc1..dd6023b1 100644 --- a/src/macos-titlebar.ts +++ b/src/macos-titlebar.ts @@ -1,7 +1,7 @@ /* Copyright 2023, 2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/media-auth.ts b/src/media-auth.ts index 5985d4bf..c2b015f7 100644 --- a/src/media-auth.ts +++ b/src/media-auth.ts @@ -1,7 +1,7 @@ /* Copyright 2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/preload.cts b/src/preload.cts index 12c76243..5ab287da 100644 --- a/src/preload.cts +++ b/src/preload.cts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2018, 2019 , 2021 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/protocol.ts b/src/protocol.ts index b04e931a..6cb31ae5 100644 --- a/src/protocol.ts +++ b/src/protocol.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2020 The Matrix.org Foundation C.I.C. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/seshat.ts b/src/seshat.ts index 0a192c90..cea557c7 100644 --- a/src/seshat.ts +++ b/src/seshat.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/settings.ts b/src/settings.ts index f85cd074..fbda6e9f 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/squirrelhooks.ts b/src/squirrelhooks.ts index 6fb5bdee..50b30a4e 100644 --- a/src/squirrelhooks.ts +++ b/src/squirrelhooks.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2017 OpenMarket Ltd -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/tray.ts b/src/tray.ts index a9291fa5..bbf477bf 100644 --- a/src/tray.ts +++ b/src/tray.ts @@ -3,7 +3,7 @@ Copyright 2024 New Vector Ltd. Copyright 2017 Karl Glatz Copyright 2017 OpenMarket Ltd -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/updater.ts b/src/updater.ts index 23511822..d0cdf7f8 100644 --- a/src/updater.ts +++ b/src/updater.ts @@ -1,7 +1,7 @@ /* Copyright 2016-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/utils.ts b/src/utils.ts index 6a716ebd..0b1f41fd 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,7 @@ /* Copyright 2022-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/vectormenu.ts b/src/vectormenu.ts index 0a364d77..555daaa5 100644 --- a/src/vectormenu.ts +++ b/src/vectormenu.ts @@ -2,7 +2,7 @@ Copyright 2024 New Vector Ltd. Copyright 2016 OpenMarket Ltd -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ diff --git a/src/webcontents-handler.ts b/src/webcontents-handler.ts index 8d3032a9..e715f863 100644 --- a/src/webcontents-handler.ts +++ b/src/webcontents-handler.ts @@ -1,7 +1,7 @@ /* Copyright 2021-2024 New Vector Ltd. -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only +SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial Please see LICENSE files in the repository root for full details. */ From c63899e2241d2da195bdfc57062c95e11f00dc71 Mon Sep 17 00:00:00 2001 From: David Langley Date: Wed, 22 Jan 2025 15:43:50 +0000 Subject: [PATCH 3/4] Fix Spacing of copyright in readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d24ebe41..47156350 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,9 @@ To help avoid duplicate issues, please [view existing issues](https://github.com ## Copyright & License Copyright (c) 2016-2017 OpenMarket Ltd + Copyright (c) 2017 Vector Creations Ltd + Copyright (c) 2017-2025 New Vector Ltd This software is multi licensed by New Vector Ltd (Element). It can be used either: From 7b7c071225f4ee3dcb69fe52588af8cf0f651552 Mon Sep 17 00:00:00 2001 From: David Langley Date: Wed, 22 Jan 2025 15:44:38 +0000 Subject: [PATCH 4/4] Update contribution guidelines to avoid duplication/inconsistency with Readme --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed7d90d5..9e75c274 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ # Contributing code to element-desktop -Everyone is welcome to contribute code to element-desktop, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/element-desktop) (CLA). This ensures that their contribution will be made available under an OSI-approved open-source license, currently licensed under Affero General Public License v3 (AGPLv3) or General Public License v3 (GPLv3) at your choice. +Everyone is welcome to contribute code to element-desktop, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/element-desktop) (CLA). This ensures that their contribution will be made available under an approved licence(as described in the [README](/README.md#copyright--license)). element-desktop follows the same pattern as element-web, please find more contributing guidelines at https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md