diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-11-06 15:56:42 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-11-06 16:56:19 +0100 |
commit | 0eebff152a177dd59ed8773df26f1679f8a88e90 (patch) | |
tree | 23c06d5678bc66a5cc6df3442352687591185798 /settings | |
parent | 5411d60b249cc12b429ed8083e7f34d1415d278e (diff) | |
download | nextcloud-server-0eebff152a177dd59ed8773df26f1679f8a88e90.tar.gz nextcloud-server-0eebff152a177dd59ed8773df26f1679f8a88e90.zip |
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'settings')
28 files changed, 83 insertions, 29 deletions
diff --git a/settings/Activity/Provider.php b/settings/Activity/Provider.php index 575b7e9b569..e71a33e0d4f 100644 --- a/settings/Activity/Provider.php +++ b/settings/Activity/Provider.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * + * @author Joas Schilling <coding@schilljs.com> + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/settings/Activity/SecurityFilter.php b/settings/Activity/SecurityFilter.php index 6bf36a9e488..5beb6c8c950 100644 --- a/settings/Activity/SecurityFilter.php +++ b/settings/Activity/SecurityFilter.php @@ -1,7 +1,8 @@ <?php - /** - * @author Christoph Wurst <christoph@winzerhof-wurst.at> + * + * + * @author Christoph Wurst <christoph@owncloud.com> * * @license GNU AGPL version 3 or any later version * diff --git a/settings/Activity/SecurityProvider.php b/settings/Activity/SecurityProvider.php index 7b27fde363f..f0789842e82 100644 --- a/settings/Activity/SecurityProvider.php +++ b/settings/Activity/SecurityProvider.php @@ -1,22 +1,24 @@ <?php - /** - * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at> * - * Two-factor backup codes + * @author Christoph Wurst <christoph@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> + * + * @license GNU AGPL version 3 or any later version * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it 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. * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/settings/Activity/SecuritySetting.php b/settings/Activity/SecuritySetting.php index fe1b0dd8f57..6a969f3eac4 100644 --- a/settings/Activity/SecuritySetting.php +++ b/settings/Activity/SecuritySetting.php @@ -1,22 +1,23 @@ <?php - /** - * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at> * - * Two-factor backup codes + * @author Christoph Wurst <christoph@owncloud.com> + * + * @license GNU AGPL version 3 or any later version * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. + * This program is free software: you can redistribute it and/or modify + * it 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. * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/settings/Activity/Setting.php b/settings/Activity/Setting.php index ec72f270b9f..07638632661 100644 --- a/settings/Activity/Setting.php +++ b/settings/Activity/Setting.php @@ -2,6 +2,8 @@ /** * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * + * @author Joas Schilling <coding@schilljs.com> + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/settings/Application.php b/settings/Application.php index f79453e3d01..5b2b606353f 100644 --- a/settings/Application.php +++ b/settings/Application.php @@ -2,15 +2,13 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Björn Schießle <bjoern@schiessle.org> * @author Christoph Wurst <christoph@owncloud.com> - * @author Georg Ehrke <georg@owncloud.com> * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <robin@icewind.nl> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> * * @license AGPL-3.0 * diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php index 90f9e1fc678..8dc89830167 100644 --- a/settings/BackgroundJobs/VerifyUserData.php +++ b/settings/BackgroundJobs/VerifyUserData.php @@ -2,6 +2,10 @@ /** * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org> * + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Patrik Kernstock <info@pkern.at> + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/settings/Controller/AdminSettingsController.php b/settings/Controller/AdminSettingsController.php index 33d9cb2c2a3..0114ee73d96 100644 --- a/settings/Controller/AdminSettingsController.php +++ b/settings/Controller/AdminSettingsController.php @@ -4,6 +4,7 @@ * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Lukas Reschke <lukas@statuscode.ch> + * @author Robin Appelman <robin@icewind.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index da59461e5fa..26858eabcf3 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -4,9 +4,13 @@ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch> * * @author Christoph Wurst <christoph@owncloud.com> + * @author Felix A. Epp <work@felixepp.de> + * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author Joas Schilling <coding@schilljs.com> + * @author Julius Härtl <jus@bitgrid.net> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @license AGPL-3.0 diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php index 7b68fc4c289..2f3d78b4d83 100644 --- a/settings/Controller/AuthSettingsController.php +++ b/settings/Controller/AuthSettingsController.php @@ -3,6 +3,10 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Christoph Wurst <christoph@owncloud.com> + * @author Fabrizio Steiner <fabrizio.steiner@gmail.com> + * @author Joas Schilling <coding@schilljs.com> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de> * @author Robin Appelman <robin@icewind.nl> * * @license AGPL-3.0 diff --git a/settings/Controller/CertificateController.php b/settings/Controller/CertificateController.php index c5f7e89f3fc..852f24bc28f 100644 --- a/settings/Controller/CertificateController.php +++ b/settings/Controller/CertificateController.php @@ -5,6 +5,7 @@ * @author Björn Schießle <bjoern@schiessle.org> * @author Lukas Reschke <lukas@statuscode.ch> * @author Robin Appelman <robin@icewind.nl> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Vincent Petry <pvince81@owncloud.com> * * @license AGPL-3.0 diff --git a/settings/Controller/ChangePasswordController.php b/settings/Controller/ChangePasswordController.php index a758180e858..31ff8904ce3 100644 --- a/settings/Controller/ChangePasswordController.php +++ b/settings/Controller/ChangePasswordController.php @@ -1,6 +1,11 @@ <?php /** * + * + * @author Joas Schilling <coding@schilljs.com> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Matthew Setter <matthew@matthewsetter.com> + * @author Morris Jobke <hey@morrisjobke.de> * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license GNU AGPL version 3 or any later version diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 151e546e558..ccaaaeaf601 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -2,7 +2,11 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Derek <derek.kelly27@gmail.com> * @author Joas Schilling <coding@schilljs.com> + * @author Ko- <k.stoffelen@cs.ru.nl> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <robin@mccorkell.me.uk> diff --git a/settings/Controller/CommonSettingsTrait.php b/settings/Controller/CommonSettingsTrait.php index ac316aa7f48..82d675531a8 100644 --- a/settings/Controller/CommonSettingsTrait.php +++ b/settings/Controller/CommonSettingsTrait.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de> * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Robin Appelman <robin@icewind.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php index 4ec6177f28f..93a51a558bf 100644 --- a/settings/Controller/EncryptionController.php +++ b/settings/Controller/EncryptionController.php @@ -3,7 +3,10 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle <bjoern@schiessle.org> + * @author Joas Schilling <coding@schilljs.com> + * @author Ko- <k.stoffelen@cs.ru.nl> * @author Lukas Reschke <lukas@statuscode.ch> + * @author Morris Jobke <hey@morrisjobke.de> * * @license AGPL-3.0 * diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index e87d201a83b..c829f4db911 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -3,11 +3,10 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Georg Ehrke <georg@owncloud.com> - * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Thomas Pulzer <t.pulzer@kniel.de> * * @license AGPL-3.0 * diff --git a/settings/Controller/PersonalSettingsController.php b/settings/Controller/PersonalSettingsController.php index 7e2d62961b7..ad4eb69c32d 100644 --- a/settings/Controller/PersonalSettingsController.php +++ b/settings/Controller/PersonalSettingsController.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de> * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Robin Appelman <robin@icewind.nl> * * @license GNU AGPL version 3 or any later version * diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php index d0d57437799..bda86dff841 100644 --- a/settings/Controller/SecuritySettingsController.php +++ b/settings/Controller/SecuritySettingsController.php @@ -4,6 +4,7 @@ * * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license AGPL-3.0 * diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index a78c1b9466b..d583dc8690d 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -3,6 +3,9 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Bjoern Schiessle <bjoern@schiessle.org> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Christoph Wurst <christoph@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> @@ -10,6 +13,9 @@ * @author Robin Appelman <robin@icewind.nl> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Thomas Pulzer <t.pulzer@kniel.de> + * @author Tobia De Koninck <tobia@ledfan.be> + * @author Tobias Kaminsky <tobias@kaminsky.me> * @author Vincent Petry <pvince81@owncloud.com> * * @license AGPL-3.0 diff --git a/settings/Hooks.php b/settings/Hooks.php index 59bd7bb905d..097d708a36a 100644 --- a/settings/Hooks.php +++ b/settings/Hooks.php @@ -2,6 +2,10 @@ /** * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> * + * @author Joas Schilling <coding@schilljs.com> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Morris Jobke <hey@morrisjobke.de> + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/settings/Mailer/NewUserMailHelper.php b/settings/Mailer/NewUserMailHelper.php index 935b3f0e075..db0339c7367 100644 --- a/settings/Mailer/NewUserMailHelper.php +++ b/settings/Mailer/NewUserMailHelper.php @@ -2,6 +2,11 @@ /** * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch> * + * @author Joas Schilling <coding@schilljs.com> + * @author Leon Klingele <leon@struktur.de> + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Morris Jobke <hey@morrisjobke.de> + * * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index 4c4fa0be666..3d2d7f95a5e 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -4,7 +4,6 @@ * * @author Bart Visscher <bartv@thisnet.nl> * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Joas Schilling <coding@schilljs.com> * @author Kamil Domanski <kdomanski@kdemail.net> * @author Lukas Reschke <lukas@statuscode.ch> * @author Robin Appelman <robin@icewind.nl> diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 0906102ec20..a71ece11eea 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -8,6 +8,7 @@ * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> * @author Georg Ehrke <georg@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <robin@icewind.nl> diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php index c9cc078ed09..c9b119622ee 100644 --- a/settings/ajax/togglesubadmins.php +++ b/settings/ajax/togglesubadmins.php @@ -4,7 +4,9 @@ * * @author Bart Visscher <bartv@thisnet.nl> * @author Georg Ehrke <georg@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license AGPL-3.0 * diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index 79109600a39..63f865a2f24 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -5,6 +5,7 @@ * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Robin Appelman <robin@icewind.nl> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @license AGPL-3.0 * diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index b398e41033b..46ca0f50879 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -7,6 +7,7 @@ * @author Georg Ehrke <georg@owncloud.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Robin Appelman <robin@icewind.nl> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @license AGPL-3.0 diff --git a/settings/routes.php b/settings/routes.php index 12da950ed2f..9b7b253bd04 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -2,9 +2,10 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Bart Visscher <bartv@thisnet.nl> + * @author Bjoern Schiessle <bjoern@schiessle.org> * @author Björn Schießle <bjoern@schiessle.org> - * @author Christopher Schäpers <kondou@ts.unde.re> * @author Christoph Wurst <christoph@owncloud.com> * @author Frank Karlitschek <frank@karlitschek.de> * @author Georg Ehrke <georg@owncloud.com> @@ -14,6 +15,7 @@ * @author Robin Appelman <robin@icewind.nl> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Thomas Pulzer <t.pulzer@kniel.de> * @author Vincent Petry <pvince81@owncloud.com> * * @license AGPL-3.0 diff --git a/settings/users.php b/settings/users.php index 2d949cb618c..466d8438b01 100644 --- a/settings/users.php +++ b/settings/users.php @@ -4,7 +4,6 @@ * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Bart Visscher <bartv@thisnet.nl> - * @author Björn Schießle <bjoern@schiessle.org> * @author Clark Tomlinson <fallen013@gmail.com> * @author Daniel Molkentin <daniel@molkentin.de> * @author Georg Ehrke <georg@owncloud.com> @@ -14,10 +13,10 @@ * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <robin@icewind.nl> - * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Stephan Peijnik <speijnik@anexia-it.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Thomas Pulzer <t.pulzer@kniel.de> * * @license AGPL-3.0 * |