diff options
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | apps/dav/command/migratecalendars.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/caldav/calendar.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/caldav/calendarhome.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/caldav/calendarroot.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/dav/sharing/xml/invite.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/migration/addressbookadapter.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/migration/calendaradapter.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/migration/migrateaddressbooks.php | 1 | ||||
| -rw-r--r-- | apps/dav/lib/migration/migratecalendars.php | 1 | ||||
| -rw-r--r-- | apps/dav/tests/unit/servertest.php | 1 | ||||
| -rw-r--r-- | apps/federation/appinfo/register_command.php | 1 | ||||
| -rw-r--r-- | lib/private/files/view.php | 2 | ||||
| -rw-r--r-- | lib/public/share/exceptions/genericshareexception.php | 1 |
15 files changed, 14 insertions, 3 deletions
@@ -174,8 +174,8 @@ Jean-Louis Dupond <jean-louis@dupond.be> Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu> Jens-Christian Fischer <jens-christian.fischer@switch.ch> Jernej Virag <jernej.virag@gmail.com> -Jesus Macias <jmacias@full-on-net.com> Jesus Macias Portela <jesus.macias.portela@gmail.com> +Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com> jknockaert <jasper@knockaert.nl> Joan <aseques@gmail.com> Joar Wandborg <git@wandborg.com> @@ -63,7 +63,6 @@ ownCloud is written by: - Jan-Christoph Borchardt <hey@jancborchardt.net> - Jean-Louis Dupond <jean-louis@dupond.be> - Jens-Christian Fischer <jens-christian.fischer@switch.ch> - - Jesus Macias <jmacias@full-on-net.com> - Jesús Macias <jmacias@solidgear.es> - Joachim Bauch <bauch@struktur.de> - Joas Schilling <nickvergessen@owncloud.com> diff --git a/apps/dav/command/migratecalendars.php b/apps/dav/command/migratecalendars.php index cc6445cb7f2..5e7f6e9b697 100644 --- a/apps/dav/command/migratecalendars.php +++ b/apps/dav/command/migratecalendars.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/caldav/calendar.php index c9e210f8590..16acbbf53a3 100644 --- a/apps/dav/lib/caldav/calendar.php +++ b/apps/dav/lib/caldav/calendar.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/caldav/calendarhome.php b/apps/dav/lib/caldav/calendarhome.php index 9baf2a6e429..87b8d4bb320 100644 --- a/apps/dav/lib/caldav/calendarhome.php +++ b/apps/dav/lib/caldav/calendarhome.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/caldav/calendarroot.php b/apps/dav/lib/caldav/calendarroot.php index 61eca088fb5..d302da3d861 100644 --- a/apps/dav/lib/caldav/calendarroot.php +++ b/apps/dav/lib/caldav/calendarroot.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/dav/sharing/xml/invite.php b/apps/dav/lib/dav/sharing/xml/invite.php index 560546b2413..ae40ff06701 100644 --- a/apps/dav/lib/dav/sharing/xml/invite.php +++ b/apps/dav/lib/dav/sharing/xml/invite.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/migration/addressbookadapter.php b/apps/dav/lib/migration/addressbookadapter.php index c9307ce0de9..5264747a004 100644 --- a/apps/dav/lib/migration/addressbookadapter.php +++ b/apps/dav/lib/migration/addressbookadapter.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/migration/calendaradapter.php b/apps/dav/lib/migration/calendaradapter.php index e8fdf74f336..d02f2256c34 100644 --- a/apps/dav/lib/migration/calendaradapter.php +++ b/apps/dav/lib/migration/calendaradapter.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/migration/migrateaddressbooks.php b/apps/dav/lib/migration/migrateaddressbooks.php index 21bc4b3ca9a..d26ca4c1810 100644 --- a/apps/dav/lib/migration/migrateaddressbooks.php +++ b/apps/dav/lib/migration/migrateaddressbooks.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/lib/migration/migratecalendars.php b/apps/dav/lib/migration/migratecalendars.php index 91bc345cad7..c0929aa36be 100644 --- a/apps/dav/lib/migration/migratecalendars.php +++ b/apps/dav/lib/migration/migratecalendars.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/dav/tests/unit/servertest.php b/apps/dav/tests/unit/servertest.php index b6439ebf0b0..b25da3cc807 100644 --- a/apps/dav/tests/unit/servertest.php +++ b/apps/dav/tests/unit/servertest.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/federation/appinfo/register_command.php b/apps/federation/appinfo/register_command.php index 48c72a48158..c7e79851946 100644 --- a/apps/federation/appinfo/register_command.php +++ b/apps/federation/appinfo/register_command.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 2656e34cddf..52be8a7e226 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -5,7 +5,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author cmeh <cmeh@users.noreply.github.com> * @author Florin Peter <github@florin-peter.de> - * @author Jesus Macias <jmacias@full-on-net.com> + * @author Jesús Macias <jmacias@solidgear.es> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Klaas Freitag <freitag@owncloud.com> diff --git a/lib/public/share/exceptions/genericshareexception.php b/lib/public/share/exceptions/genericshareexception.php index b36956a2f98..b32c2f26574 100644 --- a/lib/public/share/exceptions/genericshareexception.php +++ b/lib/public/share/exceptions/genericshareexception.php @@ -1,5 +1,6 @@ <?php /** + * @author Lukas Reschke <lukas@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. |