diff options
author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:36:37 -0500 |
---|---|---|
committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:36:37 -0500 |
commit | 4d69e562a065a79461343444a842ada025f3643c (patch) | |
tree | 557995f07f3cc7d00376cc43a148dca2bcea3a3e /apps/user_ldap | |
parent | 12479a1eda63e45207290eeaa68498112c40a9bf (diff) | |
parent | 3067367ff35757e03d4db11e13e7d2bcd6b08610 (diff) | |
download | nextcloud-server-4d69e562a065a79461343444a842ada025f3643c.tar.gz nextcloud-server-4d69e562a065a79461343444a842ada025f3643c.zip |
Merge pull request #22757 from owncloud/apply-license
Update copyright information and author file
Diffstat (limited to 'apps/user_ldap')
-rw-r--r-- | apps/user_ldap/ajax/wizard.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/appinfo/app.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/group_ldap.php | 3 | ||||
-rw-r--r-- | apps/user_ldap/lib/access.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/configuration.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/connection.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/jobs.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/proxy.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/user/manager.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/user/user.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/wizard.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php | 2 |
15 files changed, 12 insertions, 9 deletions
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 666af85e56e..f3e5efffc24 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -4,6 +4,7 @@ * @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> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index dab47ee6e6f..f1ac2dbd26b 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -6,6 +6,7 @@ * @author Dominik Schmidt <dev@dominik-schmidt.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 05ab9ddfaae..c50ab0a8e1f 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -1,6 +1,8 @@ <?php /** + * @author Alex Weirig <alex.weirig@technolink.lu> * @author Alexander Bergolth <leo@strike.wu.ac.at> + * @author alexweirig <alex.weirig@technolink.lu> * @author Andreas Fischer <bantu@owncloud.com> * @author Arthur Schiwon <blizzz@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> @@ -12,7 +14,6 @@ * @author Robin McCorkell <robin@mccorkell.me.uk> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> - * @author Richard Bentley <rbentley@e2advance.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 8b83b7d917f..8409e6ce3d8 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -17,7 +17,6 @@ * @author Ralph Krimmel <rkrimme1@gwdg.de> * @author Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index f829160b62a..daec2bed13a 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -1,5 +1,6 @@ <?php /** + * @author Alex Weirig <alex.weirig@technolink.lu> * @author Alexander Bergolth <leo@strike.wu.ac.at> * @author Arthur Schiwon <blizzz@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> @@ -7,7 +8,6 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Richard Bentley <rbentley@e2advance.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index b1ed23f95fe..fc6df5fc602 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -8,7 +8,6 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index 47e28470188..ecf2e6daa0f 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -7,6 +7,7 @@ * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 082ba9a93d0..74e2af45269 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -7,7 +7,7 @@ * @author Lukas Reschke <lukas@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php index d76142c79ac..dc12ebd6e9d 100644 --- a/apps/user_ldap/lib/user/manager.php +++ b/apps/user_ldap/lib/user/manager.php @@ -4,6 +4,7 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 8b70c9e2374..43ff6014c9f 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -3,6 +3,7 @@ * @author Arthur Schiwon <blizzz@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 4a12d411ec1..5235011fb96 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -10,7 +10,6 @@ * @author Nicolas Grekas <nicolas.grekas@gmail.com> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <robin@mccorkell.me.uk> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php b/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php index f83b0efd0cc..587811eb13c 100644 --- a/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php +++ b/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @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/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php index 4db3ca48768..fd53838df19 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php @@ -2,6 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php index fcf85371d3a..f82afe9009d 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php +++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php @@ -1,7 +1,6 @@ <?php /** * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Morris Jobke <hey@morrisjobke.de> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php b/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php index 7f474aaa0e8..687b1da91e1 100644 --- a/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php +++ b/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php @@ -2,7 +2,7 @@ /** * @author Arthur Schiwon <blizzz@owncloud.com> * - * @copyright Copyright (c) 2015, ownCloud, Inc. + * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 * * This code is free software: you can redistribute it and/or modify |