diff options
| author | Leitwolf11 | 2026-11-15 19:33:50 +0300 |
|---|---|---|
| committer | Leitwolf11 | 2026-11-15 19:33:50 +0300 |
| commit | 75c934c6a524f2f51a058a15be19f921508ba0cb (patch) | |
| tree | 379c2d3c82b845755fa5a1639f899a37485828f8 | |
| parent | 509ad78a78cc4465aa9224e0060425df1fbb2612 (diff) | |
| parent | 9699a98d052260e076aea0afa206c40e018e919b (diff) | |
| download | tazel.net-75c934c6a524f2f51a058a15be19f921508ba0cb.tar.gz | |
Merge remote-tracking branch 'origin/main' into docs/code-of-conduct
57 files changed, 71 insertions, 77 deletions
diff --git a/.codacy.yml b/.codacy.yml index f40d1e9..fc55949 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later # The reference under content/en-US/docs is copied from Progmasoft/tazel and # the Tala grammar from Progmasoft/tala; both are reviewed where they live. diff --git a/.editorconfig b/.editorconfig index 362f144..86578f9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later root = true diff --git a/.gitattributes b/.gitattributes index 74062f9..d159906 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later * text=auto eol=lf *.png binary diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index 98084f3..4972fc1 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later name: tazel.net owned sources paths-ignore: diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 16d0fc7..84dd1bc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later // Renovate proposes the version updates of this repository. Dependabot keeps // its alerts and its security updates, which are repository settings; its diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05ee91b..c5d77be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later name: CI diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2ff7852..f1b6269 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later name: CodeQL on: diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index cb4653c..0a24b77 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later name: Workflow Security @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -# SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +# SPDX-License-Identifier: AGPL-3.0-or-later node_modules/ .nuxt/ diff --git a/.prettierignore b/.prettierignore index 267e531..2626fcc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,7 +4,6 @@ node_modules/ package-lock.json public/ LICENSE.txt -PATENTS LICENSES/ content/ coverage/ @@ -1,7 +1,7 @@ Copyright 2026 Progmasoft <[email protected]> Project-owned source code is licensed under AGPL-3.0-or-later with the Progmasoft Patent Grant, Version 1.1. -See LICENSE.txt, PATENTS, and LICENSES/AdditionRef-Progmasoft-Patent-Grant-1.1.txt. +See LICENSE.txt, PATENTS.md, and LICENSES/AdditionRef-Progmasoft-Patent-Grant-1.1.txt. The Tazel logo and the social preview image are marks of Progmasoft; the licence of the code does not grant use of them as marks. diff --git a/PATENTS b/PATENTS deleted file mode 100644 index 4d43676..0000000 --- a/PATENTS +++ /dev/null @@ -1,21 +0,0 @@ -Progmasoft Patent Grant - -Project-owned software in this repository that carries an SPDX expression containing -AdditionRef-Progmasoft-Patent-Grant-1.1 is covered by the Progmasoft Patent Grant, -Version 1.1. - -Canonical grant text: -LICENSES/AdditionRef-Progmasoft-Patent-Grant-1.1.txt - -SPDX custom addition identifier: -AdditionRef-Progmasoft-Patent-Grant-1.1 - -The grant is additional to the repository's copyright license. It neither changes the -license of third-party material nor removes source-code, network-source, notice, or -attribution duties imposed by MPL-2.0, AGPL-3.0-or-later, or another applicable -copyright license. - -A file's presence in this repository does not by itself make it project-owned or covered. -Third-party directories and material carrying a different SPDX expression remain under -their stated terms. The retained Version 1.0 text applies only to historical material that -expressly identifies AdditionRef-Progmasoft-Patent-Grant-1.0. diff --git a/PATENTS.md b/PATENTS.md new file mode 100644 index 0000000..68dc9b8 --- /dev/null +++ b/PATENTS.md @@ -0,0 +1,16 @@ +# Progmasoft Patent Grant + +Project-owned software in this repository is covered by the Progmasoft Patent Grant, Version 1.1, identified as +`AdditionRef-Progmasoft-Patent-Grant-1.1`. Its canonical text is +[LICENSES/AdditionRef-Progmasoft-Patent-Grant-1.1.txt](LICENSES/AdditionRef-Progmasoft-Patent-Grant-1.1.txt). + +This notice is what makes the grant apply (Section 9 of the grant). The SPDX expressions of the files name their +copyright license alone; the grant is a separate permission and does not appear in them. + +The grant is additional to the repository's copyright license, AGPL-3.0-or-later. It neither changes the license of +third-party material nor removes source-code, network-source, notice, or attribution duties imposed by AGPL-3.0-or-later +or another applicable copyright license. + +A file's presence in this repository does not by itself make it project-owned or covered. Third-party directories and +material carrying another copyright holder or license remain under their stated terms. The retained Version 1.0 text +applies only to historical material that expressly identifies AdditionRef-Progmasoft-Patent-Grant-1.0. @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> # tazel.net @@ -36,5 +36,5 @@ A page a language lacks is shown in English, with a note that says so. A release ## Licence The code of the site is under AGPL-3.0-or-later with the Progmasoft Patent Grant 1.1; see [LICENSE.txt](LICENSE.txt), -[PATENTS](PATENTS) and [NOTICE.txt](NOTICE.txt). The documents copied from Tazel and the Tala grammar keep their own +[PATENTS.md](PATENTS.md) and [NOTICE.txt](NOTICE.txt). The documents copied from Tazel and the Tala grammar keep their own licence, MPL-2.0 with the Progmasoft Exception 2.0, written at the top of each file or in the repository they come from. diff --git a/app/app.vue b/app/app.vue index 940a8c3..1e63c07 100644 --- a/app/app.vue +++ b/app/app.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <script setup lang="ts"> import { chrome } from "~/content/chrome"; diff --git a/app/assets/site.css b/app/assets/site.css index ded4834..2ae7ae3 100644 --- a/app/assets/site.css +++ b/app/assets/site.css @@ -1,5 +1,5 @@ /* SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> */ -/* SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 */ +/* SPDX-License-Identifier: AGPL-3.0-or-later */ /* Light is the default, as on progmasoft.com; dark is a choice the visitor makes and keeps. */ :root { diff --git a/app/components/CodeBlock.vue b/app/components/CodeBlock.vue index b6fb345..c610e67 100644 --- a/app/components/CodeBlock.vue +++ b/app/components/CodeBlock.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- A sample with the name of its file and a button that copies it. --> <script setup lang="ts"> diff --git a/app/components/DocsTree.vue b/app/components/DocsTree.vue index f46d66a..32d0312 100644 --- a/app/components/DocsTree.vue +++ b/app/components/DocsTree.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- The tree of the documentation: a group for each folder, open while it holds the current page. --> <script setup lang="ts"> diff --git a/app/components/FeatureIcon.vue b/app/components/FeatureIcon.vue index 439f098..1ca3a8c 100644 --- a/app/components/FeatureIcon.vue +++ b/app/components/FeatureIcon.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- The pictures of the features on the home page, in their order. --> <script setup lang="ts"> diff --git a/app/components/ProseText.vue b/app/components/ProseText.vue index 33b5d92..1a58f93 100644 --- a/app/components/ProseText.vue +++ b/app/components/ProseText.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- Text in which the flags of a command line, such as `--jobs` or `--`, are set as code that a diff --git a/app/components/SiteFooter.vue b/app/components/SiteFooter.vue index 4db0b2b..8d67c11 100644 --- a/app/components/SiteFooter.vue +++ b/app/components/SiteFooter.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <script setup lang="ts"> import { chrome } from "~/content/chrome"; diff --git a/app/components/SiteHeader.vue b/app/components/SiteHeader.vue index 1704b0a..304f74b 100644 --- a/app/components/SiteHeader.vue +++ b/app/components/SiteHeader.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <script setup lang="ts"> import { chrome } from "~/content/chrome"; diff --git a/app/components/TazelLogo.vue b/app/components/TazelLogo.vue index 307479e..e1151d1 100644 --- a/app/components/TazelLogo.vue +++ b/app/components/TazelLogo.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- The Tazel logo in the colour of the text around it: the leopard alone, or with the wordmark. --> <script setup lang="ts"> diff --git a/app/components/ThemeToggle.vue b/app/components/ThemeToggle.vue index 0cbe4ef..58132c1 100644 --- a/app/components/ThemeToggle.vue +++ b/app/components/ThemeToggle.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- Switches between the light and the dark theme and remembers the choice in this browser. --> <script setup lang="ts"> diff --git a/app/components/content/Note.vue b/app/components/content/Note.vue index de4649e..7217648 100644 --- a/app/components/content/Note.vue +++ b/app/components/content/Note.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- A remark beside the text of a document, written ::note in Markdown. --> <template> diff --git a/app/components/content/ProseA.vue b/app/components/content/ProseA.vue index 3fe1f24..92080b0 100644 --- a/app/components/content/ProseA.vue +++ b/app/components/content/ProseA.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- A link of a document: a page of the site keeps the language of the reader. --> <script setup lang="ts"> diff --git a/app/components/content/ProsePre.vue b/app/components/content/ProsePre.vue index 069a48f..a85aebc 100644 --- a/app/components/content/ProsePre.vue +++ b/app/components/content/ProsePre.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <!-- A highlighted code block of a document, with its file name and a button that copies it. --> <script setup lang="ts"> diff --git a/app/composables/useDocs.ts b/app/composables/useDocs.ts index da599a8..ac5598b 100644 --- a/app/composables/useDocs.ts +++ b/app/composables/useDocs.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later import type { Locale } from "~/content/locales"; diff --git a/app/composables/useSiteLocale.ts b/app/composables/useSiteLocale.ts index b89fc6a..1596751 100644 --- a/app/composables/useSiteLocale.ts +++ b/app/composables/useSiteLocale.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later import { defaultLocale, diff --git a/app/content/chrome.ts b/app/content/chrome.ts index 4a7c117..1e07d54 100644 --- a/app/content/chrome.ts +++ b/app/content/chrome.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later import type { Locale } from "./locales"; import type { Chrome } from "./types"; diff --git a/app/content/home.ts b/app/content/home.ts index fdc51fa..fc4cb9d 100644 --- a/app/content/home.ts +++ b/app/content/home.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later import type { Locale } from "./locales"; import type { HomeText } from "./types"; diff --git a/app/content/locales.ts b/app/content/locales.ts index 74ba086..8eb03fb 100644 --- a/app/content/locales.ts +++ b/app/content/locales.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later /** The languages the site is published in; the first is served without a prefix. */ export const locales = ["en-US", "de-DE", "ru-RU", "he-IL"] as const; diff --git a/app/content/site.ts b/app/content/site.ts index 2c8e990..8f2ae04 100644 --- a/app/content/site.ts +++ b/app/content/site.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later /** The address the site is published at, without a trailing slash. */ export const siteUrl = "https://tazel.net"; diff --git a/app/content/types.ts b/app/content/types.ts index b29a745..d665403 100644 --- a/app/content/types.ts +++ b/app/content/types.ts @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> -// SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 +// SPDX-License-Identifier: AGPL-3.0-or-later /** The words of the frame around every page. */ export type Chrome = { diff --git a/app/error.vue b/app/error.vue index 1c907e6..01a8397 100644 --- a/app/error.vue +++ b/app/error.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <script setup lang="ts"> import { chrome } from "~/content/chrome"; diff --git a/app/pages/[[locale]]/docs/[...slug].vue b/app/pages/[[locale]]/docs/[...slug].vue index 9bdbac9..84ec522 100644 --- a/app/pages/[[locale]]/docs/[...slug].vue +++ b/app/pages/[[locale]]/docs/[...slug].vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- SPDX-License-Identifier: AGPL-3.0-or-later --> <script setup lang="ts"> import { chrome } from "~/content/chrome"; diff --git a/app/pages/[[locale]]/index.vue b/app/pages/[[locale]]/index.vue index 3e3794b..c6d347a 100644 --- a/app/pages/[[locale]]/index.vue +++ b/app/pages/[[locale]]/index.vue @@ -1,5 +1,5 @@ <!-- SPDX-FileCopyrightText: 2026 Progmasoft <[email protected]> --> -<!-- SPDX-License-Identifier: AGPL-3.0-or-later WITH AdditionRef-Progmasoft-Patent-Grant-1.1 --> +<!-- S |