summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-06-25 11:43:55 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-06-25 14:13:49 +0200
commitf63915d0c8b28ed507f0db6e11ef50e9a0bd39f4 (patch)
tree411739523aed92226927f7aa5d90e69656af693e /settings
parentcdb0e62e9b7a537f79f8674bc641fb88ec30c2be (diff)
downloadnextcloud-server-f63915d0c8b28ed507f0db6e11ef50e9a0bd39f4.tar.gz
nextcloud-server-f63915d0c8b28ed507f0db6e11ef50e9a0bd39f4.zip
update license headers and authors
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php2
-rw-r--r--settings/ajax/enableapp.php1
-rw-r--r--settings/ajax/navigationdetect.php1
-rw-r--r--settings/ajax/togglegroups.php1
-rw-r--r--settings/ajax/togglesubadmins.php1
-rw-r--r--settings/ajax/updateapp.php1
-rw-r--r--settings/application.php3
-rw-r--r--settings/changepassword/controller.php2
-rw-r--r--settings/controller/checksetupcontroller.php2
-rw-r--r--settings/controller/groupscontroller.php1
-rw-r--r--settings/controller/logsettingscontroller.php1
-rw-r--r--settings/controller/userscontroller.php1
-rw-r--r--settings/personal.php1
-rw-r--r--settings/routes.php2
-rw-r--r--settings/users.php1
15 files changed, 13 insertions, 8 deletions
diff --git a/settings/admin.php b/settings/admin.php
index ee252ceb141..533b6152492 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -2,11 +2,13 @@
/**
* @author Arthur Schiwon <blizzz@owncloud.com>
* @author Bart Visscher <bartv@thisnet.nl>
+ * @author Björn Schießle <schiessle@owncloud.com>
* @author Frank Karlitschek <frank@owncloud.org>
* @author Georg Ehrke <georg@owncloud.com>
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index b63bce76d92..69b186bb9f3 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -4,7 +4,6 @@
* @author Christopher Schäpers <kondou@ts.unde.re>
* @author Kamil Domanski <kdomanski@kdemail.net>
* @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 16c7e20955f..d7c1cbc5a12 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -2,7 +2,6 @@
/**
* @author Bart Visscher <bartv@thisnet.nl>
* @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f85505b632c..87b60e485bf 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -5,7 +5,6 @@
* @author Georg Ehrke <georg@owncloud.com>
* @author Jakob Sack <mail@jakobsack.de>
* @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 632768ac368..767baa9f3ee 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -3,7 +3,6 @@
* @author Bart Visscher <bartv@thisnet.nl>
* @author Georg Ehrke <georg@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 4541b80056e..5fc88290c91 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -4,7 +4,6 @@
* @author Frank Karlitschek <frank@owncloud.org>
* @author Georg Ehrke <georg@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
diff --git a/settings/application.php b/settings/application.php
index 920d172c93d..03203b48564 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -1,8 +1,11 @@
<?php
/**
+ * @author Björn Schießle <schiessle@owncloud.com>
* @author Georg Ehrke <georg@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 69b7ca710a9..12499ada15d 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -2,10 +2,10 @@
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Clark Tomlinson <fallen013@gmail.com>
* @author cmeh <cmeh@users.noreply.github.com>
* @author Florin Peter <github@florin-peter.de>
* @author Jakob Sack <mail@jakobsack.de>
- * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
* @author Sam Tuke <mail@samtuke.com>
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 3ced5af5a5f..0b4c72acab7 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -1,6 +1,8 @@
<?php
/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/settings/controller/groupscontroller.php b/settings/controller/groupscontroller.php
index 6cb0cd3e008..218a9c0d51c 100644
--- a/settings/controller/groupscontroller.php
+++ b/settings/controller/groupscontroller.php
@@ -1,5 +1,6 @@
<?php
/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
diff --git a/settings/controller/logsettingscontroller.php b/settings/controller/logsettingscontroller.php
index f3de1fbb7c6..cae0d419e2b 100644
--- a/settings/controller/logsettingscontroller.php
+++ b/settings/controller/logsettingscontroller.php
@@ -2,6 +2,7 @@
/**
* @author Georg Ehrke <georg@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index d0b5267e3c8..d9b6ba7f721 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -1,5 +1,6 @@
<?php
/**
+ * @author Clark Tomlinson <fallen013@gmail.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
diff --git a/settings/personal.php b/settings/personal.php
index 7bf1110c03e..f4409e633cf 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -8,6 +8,7 @@
* @author Georg Ehrke <georg@owncloud.com>
* @author Jakob Sack <mail@jakobsack.de>
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Lukas Reschke <lukas@owncloud.com>
* @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
diff --git a/settings/routes.php b/settings/routes.php
index 52b320cbdb5..10c3117c183 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -9,9 +9,7 @@
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Raghu Nayyar <me@iraghu.com>
- * @author Robin Appelman <icewind@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/settings/users.php b/settings/users.php
index c438e5fbfd0..3d7f39aa367 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -7,6 +7,7 @@
* @author Daniel Molkentin <daniel@molkentin.de>
* @author Georg Ehrke <georg@owncloud.com>
* @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>