diff --git a/.mailmap b/.mailmap index 7d6e6c7ee5db7cc35f59adf9c7d6a1570193be0b..3fdaa301b16379a81fd376869eb3b95a7829a7bc 100644 --- a/.mailmap +++ b/.mailmap @@ -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> diff --git a/AUTHORS b/AUTHORS index 476c664ab4ac0d6fdda75456bc94fd1db9a28f2a..388d8360dd56116416b0e1f57f0ea488dfb351e7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -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 cc6445cb7f2a2fdcb1740e4bd84b31402ca3b2c8..5e7f6e9b6974dd07006d6eafdeb517a8c454eabe 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 c9e210f8590a844ad5afc3a272a8d3e22f025aab..16acbbf53a3936c362f70cb9193fd4e842f4823e 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 9baf2a6e4293793ec55920bd7d2191c6509888a0..87b8d4bb3200516cd3447d7a2a9307fd6a6bf6cc 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 61eca088fb5bf0afac9fbe99086cd03d1b8b2bcf..d302da3d861f3d84e722fe5fef144cebcefdcc62 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 560546b24138133f59f9f8153a04afd84795b19d..ae40ff067015c6b3add9b27068c74c7c093705e4 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 c9307ce0de946d770ee916f210ffb1b7b3904f5b..5264747a004c0795b348677fcb720ddad808541b 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 e8fdf74f3362cb1425ab4a34ae549a070e43f6e9..d02f2256c342e20dba0d437788ee466bab1881f0 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 21bc4b3ca9adb49b923e69223cc88b1a965221ed..d26ca4c18106af1264dfb1ddc39f75bb446a7ff6 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 91bc345cad719e1224e4c9f8d482537b38f721bd..c0929aa36bed0c47751b8c8e0a2184a8c2a3b2dd 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 b6439ebf0b067d322a36b12050c0b26fca68bbd4..b25da3cc8076e7bbac9d8cb771c78d5a4a5958c1 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 48c72a48158d6a7b7801d53bf3172373e56e2c5d..c7e798519466bde0e5ac81f300f66284662f01f3 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 2656e34cddfa895ca74aee78e62288a1ec986db7..52be8a7e2263cebb32f294d17c063326e8651c68 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 b36956a2f9808aa0c0c51a611d67e9dc5f32eb13..b32c2f2657462beff5d16a71bbb88c0d98dd99a3 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.