diff --git a/.idea/copyright/Nextcloud_Talk___Android_Client.xml b/.idea/copyright/Nextcloud_Talk___Android_Client.xml index e92aa5e06e3..98850d7cf6e 100644 --- a/.idea/copyright/Nextcloud_Talk___Android_Client.xml +++ b/.idea/copyright/Nextcloud_Talk___Android_Client.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 00000000000..ba63a0e2bee --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,58 @@ + +# Authors + +* Abhishek Tiwari +* Adam Serbinski +* Allan Nordhøy +* Álvaro Brey +* Amanda Rosene +* Andy Scherzinger +* Edvard Holst +* Bhavesh Kumawat +* Biswajit Das +* Christian Reiner +* Daniel Bailey +* Daniel Calviño Sánchez +* Dariusz Olszewski +* David Leibovych +* Dominik Schürmann +* eho +* Enrique López Mañas +* Ezhil Shanmugham +* fariba khandani +* Florian Ludwig +* gavine99 +* Giacomo Pacini +* Grigorii K. Shartsev +* hidrohase +* Jan-Christoph Borchardt +* jld3103 +* Joas Schilling +* John Molakvoæ +* Jos Poortvliet +* Josh +* Julius Linus +* Marcel Hibbe +* Mario Danic +* MichaIng <28480705+MichaIng@users.noreply.github.com> +* Morris Jobke +* o0lwj0o <373911550@qq.com> +* Parneet Singh +* Poussinou +* rakekniven +* rapterjet2004 +* sim +* Smarshal21 +* sokai +* Sowjanya Kota +* Stefan Niedermann +* Stephan Ritscher +* Tarek Loubani +* Tilo Spannagel +* Tim Krüger +* Tobias Kaminsky +* Valdnet <47037905+Valdnet@users.noreply.github.com> +* Viktor Balogh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20138aa854c..ab016153b93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -120,11 +120,11 @@ There are three build variants ### Apply a license Nextcloud doesn't require a CLA (Contributor License Agreement). -The copyright belongs to all the individual contributors. -Therefore we recommend that every contributor adds following line to the header of a file, if they changed it substantially: +The copyright belongs to all the individual contributors. +Therefore we recommend that every contributor adds the following line to the [AUTHORS.md](AUTHORS.md) file if they made substantial changes to the code: ``` -Copyright (c) +- ``` See section [Adding new files](#adding-new-files) for templates which can be used in new files. @@ -189,53 +189,25 @@ If automatic backport fails, it will create a comment. ### Adding new files If you create a new file it needs to contain a license header. We encourage you to use the same license (GPL3+) as we do. -Copyright of Nextcloud GmbH is optional. +Copyright of Nextcloud GmbH is optional. Individual contributor names shall go into [AUTHORS.md](AUTHORS.md) so headers are kept brief. Source code of app: ```java/kotlin /* - * Nextcloud Talk application + * Nextcloud Talk - Android Client * - * @author Your Name - * Copyright (C) 2021 Your Name - * Copyright (C) 2021 Nextcloud GmbH - * - * This program is free software: you can redistribute it and/or modify - * it 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-3.0-or-later */ ``` - XML (layout) file: + XML file: ```xml ```