diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-07-21 23:27:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 23:27:15 +0200 |
commit | 8c7d7d7746e76b77ad86cee3aae5dbd4d1bcd896 (patch) | |
tree | 3a54e25a9bb5057b9828d140433734c515a96a55 /settings/Controller | |
parent | 6da54a69872d18fb661b45f436f8e17633cc8547 (diff) | |
parent | 0215b004da6af887b3e3efa28c425d41a1c76b9b (diff) | |
download | nextcloud-server-8c7d7d7746e76b77ad86cee3aae5dbd4d1bcd896.tar.gz nextcloud-server-8c7d7d7746e76b77ad86cee3aae5dbd4d1bcd896.zip |
Merge pull request #507 from nextcloud/run-le-script
Update emails and license headers with latest changes
Diffstat (limited to 'settings/Controller')
-rw-r--r-- | settings/Controller/AppSettingsController.php | 5 | ||||
-rw-r--r-- | settings/Controller/AuthSettingsController.php | 4 | ||||
-rw-r--r-- | settings/Controller/CertificateController.php | 5 | ||||
-rw-r--r-- | settings/Controller/CheckSetupController.php | 7 | ||||
-rw-r--r-- | settings/Controller/EncryptionController.php | 3 | ||||
-rw-r--r-- | settings/Controller/GroupsController.php | 5 | ||||
-rw-r--r-- | settings/Controller/LogSettingsController.php | 8 | ||||
-rw-r--r-- | settings/Controller/MailSettingsController.php | 5 | ||||
-rw-r--r-- | settings/Controller/SecuritySettingsController.php | 3 | ||||
-rw-r--r-- | settings/Controller/UsersController.php | 9 |
10 files changed, 33 insertions, 21 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index c7722267f19..2efd3b8a847 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -1,12 +1,13 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Christoph Wurst <christoph@owncloud.com> - * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php index 47ab1fc03fd..5e6ad7859a7 100644 --- a/settings/Controller/AuthSettingsController.php +++ b/settings/Controller/AuthSettingsController.php @@ -1,8 +1,10 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Christoph Wurst <christoph@owncloud.com> + * @author Robin Appelman <robin@icewind.nl> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/CertificateController.php b/settings/Controller/CertificateController.php index cd75ce91eed..4a527036a7f 100644 --- a/settings/Controller/CertificateController.php +++ b/settings/Controller/CertificateController.php @@ -1,11 +1,12 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Björn Schießle <bjoern@schiessle.org> * @author Lukas Reschke <lukas@statuscode.ch> - * @author Robin Appelman <icewind@owncloud.com> + * @author Robin Appelman <robin@icewind.nl> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index b801654f352..bfb83e91936 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -1,12 +1,13 @@ <?php /** - * @author Joas Schilling <nickvergessen@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php index 86ca897b9ce..b2757b0965f 100644 --- a/settings/Controller/EncryptionController.php +++ b/settings/Controller/EncryptionController.php @@ -1,9 +1,10 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Björn Schießle <bjoern@schiessle.org> * @author Lukas Reschke <lukas@statuscode.ch> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/GroupsController.php b/settings/Controller/GroupsController.php index 73385e3eddf..feed45b118e 100644 --- a/settings/Controller/GroupsController.php +++ b/settings/Controller/GroupsController.php @@ -1,10 +1,11 @@ <?php /** - * @author Joas Schilling <nickvergessen@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index 6c9fe76c247..ce4913c2478 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -1,12 +1,14 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Georg Ehrke <georg@owncloud.com> - * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> + * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php index cd3c6e2224a..6ff12dec40c 100644 --- a/settings/Controller/MailSettingsController.php +++ b/settings/Controller/MailSettingsController.php @@ -1,10 +1,11 @@ <?php /** - * @author Joas Schilling <nickvergessen@owncloud.com> + * @copyright Copyright (c) 2016, ownCloud, Inc. + * + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php index fb5a39a1010..44e07f25a0b 100644 --- a/settings/Controller/SecuritySettingsController.php +++ b/settings/Controller/SecuritySettingsController.php @@ -1,9 +1,10 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 1bd6d9d18cd..d4831214da2 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -1,16 +1,17 @@ <?php /** + * @copyright Copyright (c) 2016, ownCloud, Inc. + * * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Clark Tomlinson <fallen013@gmail.com> - * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Joas Schilling <coding@schilljs.com> * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> - * @author Robin Appelman <icewind@owncloud.com> - * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Robin Appelman <robin@icewind.nl> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> * - * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify |