From bcfe6d241d3ad5c38cf7361839d7013a58f421e0 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni <6173598+dpschen@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:07:39 +0200 Subject: [PATCH] docs: clarify licensing (#894) --- README.md | 25 ++++++++++++------- desktop/README.md | 6 ++++- frontend/README.md | 6 ++++- .../originalMedia/images/migration/README.md | 10 ++++++++ 4 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 frontend/originalMedia/images/migration/README.md diff --git a/README.md b/README.md index 0f3ee4e02..23b4207c6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://drone.kolaente.de/api/badges/vikunja/vikunjaa/status.svg)](https://drone.kolaente.de/vikunja/vikunja) -[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE) +[![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE) [![Install](https://img.shields.io/badge/download-v0.24.6-brightgreen.svg)](https://vikunja.io/docs/installing) [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/vikunja.svg)](https://hub.docker.com/r/vikunja/vikunja/) [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs) @@ -14,14 +14,15 @@ If Vikunja is useful to you, please consider [buying me a coffee](https://www.buymeacoffee.com/kolaente), [sponsoring me on GitHub](https://github.com/sponsors/kolaente) or buying [a sticker pack](https://vikunja.cloud/stickers). I'm also offering [a hosted version of Vikunja](https://vikunja.cloud/) if you want a hassle-free solution for yourself or your team. -# Table of contents +## Table of contents -* [Security Reports](#security-reports) -* [Features](#features) -* [Docs](#docs) -* [Roadmap](#roadmap) -* [Contributing](#contributing) -* [License](#license) +- [Security Reports](#security-reports) +- [Features](#features) +- [Docs](#docs) + - [Roadmap](#roadmap) +- [Contributing](#contributing) +- [License](#license) + - [Unsplash Images](#unsplash-images) ## Security Reports @@ -52,4 +53,10 @@ Please check out the contribution guidelines on [the website](https://vikunja.io ## License -This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text. \ No newline at end of file +Most of this repository is licensed under [AGPL‑3.0‑or‑later](LICENSE). +The contents of [`desktop/`](desktop/) are licensed under +[GPL‑3.0‑or‑later](desktop/LICENSE). + +### Unsplash Images + +Background images from Unsplash are distributed under the [Unsplash License](https://unsplash.com/license). The license requires giving credit to the photographer and Unsplash. See [Unsplash’s terms](https://unsplash.com/terms) for more information. diff --git a/desktop/README.md b/desktop/README.md index 048dddbe5..5396023a0 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -1,6 +1,6 @@ # Vikunja desktop -[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](LICENSE) +[![License: GPL-3.0-or-later](https://img.shields.io/badge/License-GPL--3.0--or--later-blue.svg)](LICENSE) The Vikunja frontend all repackaged as an electron app to run as a desktop app! @@ -38,3 +38,7 @@ pnpm start 2. Change the version in `package.json` (That's the one that will be used by electron-builder` 3. `pnpm install` 4. `pnpm run dist --linux --windows` + +## License + +This project is licensed under the GPL-3.0-or-later license. See the [LICENSE](LICENSE) file for details. diff --git a/frontend/README.md b/frontend/README.md index 4141bbf32..d56ed5c2f 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -2,7 +2,7 @@ > The todo app to organize your life. -[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE) +[![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE) [![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja) This is the web frontend for Vikunja, written in Vue.js. @@ -49,3 +49,7 @@ pnpm run build ```shell pnpm run lint ``` + +## License + +This project is licensed under the AGPL-3.0-or-later license. See the [LICENSE](LICENSE) file for details. diff --git a/frontend/originalMedia/images/migration/README.md b/frontend/originalMedia/images/migration/README.md new file mode 100644 index 000000000..ca36371ce --- /dev/null +++ b/frontend/originalMedia/images/migration/README.md @@ -0,0 +1,10 @@ +# Migration Logos + +The images in this directory are used by Vikunja's import feature to represent third-party services. Each logo is owned by its respective trademark holder: + +* **microsoft-todo.svg** – Microsoft To Do logo. See Microsoft's [Trademark and Brand Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks) for permitted uses. +* **todoist.svg** – Todoist logo. Trademark of Doist Ltd. Use must follow Doist's [brand guidelines](https://todoist.com/brand) or press kit. +* **trello.svg** – Trello logo. Trademark of Atlassian Pty Ltd. Use must comply with Atlassian's [Trademark Guidelines](https://www.atlassian.com/legal/trademark). +* **wunderlist.png** – Wunderlist logo. Trademark of Microsoft Corporation. Covered by Microsoft's [Trademark and Brand Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks). + +These logos are provided only to show that Vikunja can import tasks from these services. Their inclusion does not imply endorsement by the trademark owners. Do not use the logos except as allowed by the respective brand policies.