From 31c5c2a59277fa2f597836097601da50ee1430ea Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 6 Nov 2017 20:15:27 +0100 Subject: [PATCH] Change @georgehrke's email Signed-off-by: Morris Jobke --- .mailmap | 13 +++++++------ AUTHORS | 2 +- apps/dav/appinfo/v1/caldav.php | 2 +- apps/dav/lib/AppInfo/Application.php | 2 +- apps/dav/lib/Avatars/RootCollection.php | 1 + apps/dav/lib/CalDAV/BirthdayService.php | 2 +- apps/dav/lib/CalDAV/CalDavBackend.php | 2 +- apps/dav/lib/CalDAV/Calendar.php | 2 +- apps/dav/lib/CalDAV/CalendarHome.php | 2 +- apps/dav/lib/CalDAV/CalendarObject.php | 2 +- apps/dav/lib/CalDAV/PublicCalendar.php | 2 +- apps/dav/lib/CalDAV/PublicCalendarObject.php | 2 +- apps/dav/lib/CalDAV/PublicCalendarRoot.php | 2 +- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 2 +- apps/dav/lib/CalDAV/Search/SearchPlugin.php | 2 +- .../dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/LimitFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php | 2 +- .../lib/CalDAV/Search/Xml/Filter/ParamFilter.php | 2 +- .../dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php | 2 +- .../CalDAV/Search/Xml/Filter/SearchTermFilter.php | 2 +- .../Search/Xml/Request/CalendarSearchReport.php | 2 +- apps/dav/lib/CardDAV/AddressBookImpl.php | 2 +- apps/dav/lib/CardDAV/CardDavBackend.php | 2 +- apps/dav/lib/CardDAV/ContactsManager.php | 2 +- apps/dav/lib/CardDAV/ImageExportPlugin.php | 2 +- apps/dav/lib/CardDAV/PhotoCache.php | 1 + apps/dav/lib/DAV/CustomPropertiesBackend.php | 2 +- apps/dav/lib/DAV/Sharing/Plugin.php | 2 +- apps/dav/lib/Migration/BuildCalendarSearchIndex.php | 2 +- .../BuildCalendarSearchIndexBackgroundJob.php | 2 +- .../lib/Migration/Version1004Date20170919104507.php | 1 + .../lib/Migration/Version1004Date20170926103422.php | 1 + apps/dav/lib/Server.php | 2 +- apps/dav/lib/Settings/CalDAVSettings.php | 2 +- apps/dav/tests/unit/Avatars/AvatarHomeTest.php | 2 +- .../dav/tests/unit/CalDAV/AbstractCalDavBackend.php | 2 +- apps/dav/tests/unit/CalDAV/CalDavBackendTest.php | 2 +- apps/dav/tests/unit/CalDAV/CalendarTest.php | 2 +- .../tests/unit/CalDAV/PublicCalendarRootTest.php | 2 +- apps/dav/tests/unit/CalDAV/PublicCalendarTest.php | 2 +- .../tests/unit/CalDAV/Publishing/PublisherTest.php | 1 + .../tests/unit/CalDAV/Schedule/IMipPluginTest.php | 2 +- .../Search/Request/CalendarSearchReportTest.php | 2 +- .../tests/unit/CalDAV/Search/SearchPluginTest.php | 2 +- apps/dav/tests/unit/CardDAV/AddressBookImplTest.php | 2 +- apps/dav/tests/unit/CardDAV/CardDavBackendTest.php | 2 +- apps/dav/tests/unit/CardDAV/ContactsManagerTest.php | 2 +- .../tests/unit/CardDAV/ImageExportPluginTest.php | 2 +- .../tests/unit/DAV/CustomPropertiesBackendTest.php | 2 +- apps/dav/tests/unit/Settings/CalDAVSettingsTest.php | 2 +- apps/files/recentlist.php | 1 + .../lib/Controller/ShareController.php | 2 +- .../lib/Controller/ShareInfoController.php | 1 + .../lib/Middleware/OCSShareAPIMiddleware.php | 1 + .../lib/Middleware/ShareInfoMiddleware.php | 1 + .../tests/Controller/ShareControllerTest.php | 2 +- .../tests/Controller/ShareInfoControllerTest.php | 1 + .../tests/Middleware/OCSShareAPIMiddlewareTest.php | 1 + .../tests/Middleware/ShareInfoMiddlewareTest.php | 1 + apps/files_trashbin/lib/Trashbin.php | 2 +- apps/files_versions/tests/VersioningTest.php | 2 +- .../Middleware/Exceptions/NotSubAdminException.php | 1 + .../lib/Middleware/ProvisioningApiMiddleware.php | 1 + apps/user_ldap/tests/HelperTest.php | 1 + .../features/bootstrap/FilesDropContext.php | 1 + core/Controller/ContactsMenuController.php | 2 +- core/Migrations/Version13000Date20170919121250.php | 1 + core/Migrations/Version13000Date20170926101637.php | 1 + core/routes.php | 2 +- index.php | 2 +- lib/autoloader.php | 2 +- lib/private/AppFramework/Http/Dispatcher.php | 2 +- lib/private/Contacts/ContactsMenu/ContactsStore.php | 2 +- lib/private/Contacts/ContactsMenu/Manager.php | 2 +- lib/private/Files/Mount/MountPoint.php | 2 +- lib/private/Files/ObjectStore/S3ConnectionTrait.php | 1 + lib/private/Installer.php | 2 +- lib/private/L10N/L10N.php | 2 +- lib/private/Log/File.php | 2 +- lib/private/Preview/Image.php | 2 +- lib/private/Preview/MP3.php | 2 +- lib/private/Preview/Movie.php | 2 +- lib/private/Preview/Provider.php | 2 +- lib/private/Preview/SVG.php | 2 +- lib/private/Preview/TXT.php | 2 +- lib/private/Repair.php | 2 +- lib/private/SubAdmin.php | 2 +- lib/private/User/Database.php | 2 +- lib/private/legacy/app.php | 2 +- lib/private/legacy/image.php | 2 +- lib/private/legacy/json.php | 2 +- lib/private/legacy/user.php | 2 +- lib/private/legacy/util.php | 2 +- lib/public/App.php | 2 +- .../AppFramework/Http/DataDownloadResponse.php | 2 +- lib/public/Config.php | 2 +- lib/public/Files.php | 2 +- lib/public/Template.php | 2 +- lib/public/User.php | 2 +- lib/public/Util.php | 2 +- settings/Controller/LogSettingsController.php | 2 +- settings/ajax/disableapp.php | 2 +- settings/ajax/setquota.php | 2 +- settings/ajax/togglesubadmins.php | 2 +- settings/ajax/uninstallapp.php | 2 +- settings/ajax/updateapp.php | 2 +- settings/routes.php | 2 +- settings/users.php | 2 +- 109 files changed, 115 insertions(+), 95 deletions(-) diff --git a/.mailmap b/.mailmap index cab196a3b5..0bbc20fb21 100644 --- a/.mailmap +++ b/.mailmap @@ -140,12 +140,13 @@ ganomi Gaël Beaudoin geez0x1 gekmihesg -Georg Ehrke Georg Ehrke -Georg Ehrke Georg Ehrke -Georg Ehrke Georg Ehrke -Georg Ehrke Georg Ehrke -Georg Ehrke Georg Ehrke -Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke +Georg Ehrke Georg Ehrke Golnaz Nilieh Grundik Guillaume AMAT diff --git a/AUTHORS b/AUTHORS index 09ec9487fa..a18d661731 100644 --- a/AUTHORS +++ b/AUTHORS @@ -74,7 +74,7 @@ Nextcloud is written by: - François Kubler - Frédéric Fortier - Gadzy - - Georg Ehrke + - Georg Ehrke - Hemanth Kumar Veeranki - Hendrik Leppelsack - Ilja Neumann diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php index e90ce5c3f9..e96c3f2806 100644 --- a/apps/dav/appinfo/v1/caldav.php +++ b/apps/dav/appinfo/v1/caldav.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index 9a221d6703..ae08e50d60 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Bjoern Schiessle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Roeland Jago Douma * @author Thomas Müller diff --git a/apps/dav/lib/Avatars/RootCollection.php b/apps/dav/lib/Avatars/RootCollection.php index 55eb35d5e2..4fc12b5d3e 100644 --- a/apps/dav/lib/Avatars/RootCollection.php +++ b/apps/dav/lib/Avatars/RootCollection.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * @author Thomas Müller * diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 7d4a1dc9f3..aa902bacc5 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2016, Georg Ehrke * * @author Achim Königs - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Robin Appelman * @author Roeland Jago Douma diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 7017322272..8d22a8bb34 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author nhirokinet diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index 6742c21d9f..ac3bcec617 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Roeland Jago Douma diff --git a/apps/dav/lib/CalDAV/CalendarHome.php b/apps/dav/lib/CalDAV/CalendarHome.php index 5a8368fede..3429c24705 100644 --- a/apps/dav/lib/CalDAV/CalendarHome.php +++ b/apps/dav/lib/CalDAV/CalendarHome.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Thomas Müller diff --git a/apps/dav/lib/CalDAV/CalendarObject.php b/apps/dav/lib/CalDAV/CalendarObject.php index b8b02db572..949886bf32 100644 --- a/apps/dav/lib/CalDAV/CalendarObject.php +++ b/apps/dav/lib/CalDAV/CalendarObject.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/dav/lib/CalDAV/PublicCalendar.php b/apps/dav/lib/CalDAV/PublicCalendar.php index e89ca4b691..f65ac9797b 100644 --- a/apps/dav/lib/CalDAV/PublicCalendar.php +++ b/apps/dav/lib/CalDAV/PublicCalendar.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/PublicCalendarObject.php b/apps/dav/lib/CalDAV/PublicCalendarObject.php index 0121d38418..aaeea64b23 100644 --- a/apps/dav/lib/CalDAV/PublicCalendarObject.php +++ b/apps/dav/lib/CalDAV/PublicCalendarObject.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/PublicCalendarRoot.php b/apps/dav/lib/CalDAV/PublicCalendarRoot.php index 1d0945fcdb..55f969e216 100644 --- a/apps/dav/lib/CalDAV/PublicCalendarRoot.php +++ b/apps/dav/lib/CalDAV/PublicCalendarRoot.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Thomas Citharel * @author Thomas Müller diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 0702450eb8..edb52c3ad8 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Leon Klingele * @author Thomas Müller diff --git a/apps/dav/lib/CalDAV/Search/SearchPlugin.php b/apps/dav/lib/CalDAV/Search/SearchPlugin.php index 92d88a387c..37000aa2eb 100644 --- a/apps/dav/lib/CalDAV/Search/SearchPlugin.php +++ b/apps/dav/lib/CalDAV/Search/SearchPlugin.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * * @license GNU AGPL version 3 or any later version diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php index 373eabda2d..5cc8f799f9 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php index 68850ab476..5fc3831543 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/LimitFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php index a0f4db8be8..7aac59809a 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/OffsetFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php index a1ad91fe55..bfcb960d40 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php index 565800cd79..cfb2211fb5 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php b/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php index 856c63f2a7..ddd3681822 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php b/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php index c47ee83ea6..e7c229c7b0 100644 --- a/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php +++ b/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php index c60378a07c..5034b16ed2 100644 --- a/apps/dav/lib/CardDAV/AddressBookImpl.php +++ b/apps/dav/lib/CardDAV/AddressBookImpl.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Thomas Müller * diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index f01f3e753f..be92f16f77 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -5,7 +5,7 @@ * @author Arthur Schiwon * @author Bjoern Schiessle * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author John Molakvoæ (skjnldsv) * @author Lukas Reschke diff --git a/apps/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php index 878e84ee59..ad02d4ba42 100644 --- a/apps/dav/lib/CardDAV/ContactsManager.php +++ b/apps/dav/lib/CardDAV/ContactsManager.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Robin Appelman * @author Thomas Müller diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php index 4227e24dfb..069239326b 100644 --- a/apps/dav/lib/CardDAV/ImageExportPlugin.php +++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Roeland Jago Douma * * @license AGPL-3.0 diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php index fa22aabf55..0029af7bff 100644 --- a/apps/dav/lib/CardDAV/PhotoCache.php +++ b/apps/dav/lib/CardDAV/PhotoCache.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php index fac5c3090e..a5ad3e22ac 100644 --- a/apps/dav/lib/DAV/CustomPropertiesBackend.php +++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Robin Appelman * @author Thomas Müller * diff --git a/apps/dav/lib/DAV/Sharing/Plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php index 035923f1d6..2ac65f9447 100644 --- a/apps/dav/lib/DAV/Sharing/Plugin.php +++ b/apps/dav/lib/DAV/Sharing/Plugin.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/dav/lib/Migration/BuildCalendarSearchIndex.php b/apps/dav/lib/Migration/BuildCalendarSearchIndex.php index f2f69e9fec..da4b4f4fe8 100644 --- a/apps/dav/lib/Migration/BuildCalendarSearchIndex.php +++ b/apps/dav/lib/Migration/BuildCalendarSearchIndex.php @@ -2,7 +2,7 @@ /** * @copyright 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php b/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php index a35f91a792..a4fa2c63e0 100644 --- a/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php +++ b/apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php @@ -2,7 +2,7 @@ /** * @copyright 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/Migration/Version1004Date20170919104507.php b/apps/dav/lib/Migration/Version1004Date20170919104507.php index 75ed07130f..d4c7026aea 100644 --- a/apps/dav/lib/Migration/Version1004Date20170919104507.php +++ b/apps/dav/lib/Migration/Version1004Date20170919104507.php @@ -3,6 +3,7 @@ * * * @author Joas Schilling + * @author Morris Jobke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/Migration/Version1004Date20170926103422.php b/apps/dav/lib/Migration/Version1004Date20170926103422.php index 16c945fe1a..d50cbae396 100644 --- a/apps/dav/lib/Migration/Version1004Date20170926103422.php +++ b/apps/dav/lib/Migration/Version1004Date20170926103422.php @@ -3,6 +3,7 @@ * * * @author Joas Schilling + * @author Morris Jobke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 270494c4e8..14f6f4e49e 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -5,7 +5,7 @@ * @author Arthur Schiwon * @author Bjoern Schiessle * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Leon Klingele * @author Lukas Reschke diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php index fcdb65e80b..1c85d19432 100644 --- a/apps/dav/lib/Settings/CalDAVSettings.php +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -2,7 +2,7 @@ /** * @copyright 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php index 102ede0c19..aa5c4bf304 100644 --- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017, ownCloud GmbH * - * @author Georg Ehrke + * @author Georg Ehrke * @author Thomas Müller * * @license AGPL-3.0 diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php index ee9c23be6b..71b1de09ed 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 22a9e22ebd..a60b586e23 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Robin Appelman * @author Thomas Citharel diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index 6e8a58e7ae..99ad640c44 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Roeland Jago Douma diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index 2ce5df3c82..82f4161c20 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php @@ -2,7 +2,7 @@ /** * * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php index b6d65f7497..9783d1a626 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * * @license GNU AGPL version 3 or any later version diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php index 5b71fdcac8..b2ba8ba119 100644 --- a/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php +++ b/apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Thomas Citharel * * @license GNU AGPL version 3 or any later version diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index 59dfa1c5e6..ee52cab281 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller diff --git a/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php b/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php index 1a12670ce0..35d86fbf34 100644 --- a/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php +++ b/apps/dav/tests/unit/CalDAV/Search/Request/CalendarSearchReportTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php index d76b384adc..12eb74259f 100644 --- a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017 Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index 172b341bd7..89253ce9dc 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Roeland Jago Douma * @author Thomas Müller diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index 3e1059da8b..63e090873b 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -5,7 +5,7 @@ * @author Arthur Schiwon * @author Bjoern Schiessle * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author John Molakvoæ (skjnldsv) * @author Morris Jobke diff --git a/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php index 606eedfb63..768b867234 100644 --- a/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php +++ b/apps/dav/tests/unit/CardDAV/ContactsManagerTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Thomas Müller diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php index 0c0e714c1c..1f7ad40425 100644 --- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php +++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Roeland Jago Douma * diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php index 70e08d4474..780324abaa 100644 --- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php index 198c4d16af..8ee5810748 100644 --- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php +++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php @@ -2,7 +2,7 @@ /** * @copyright 2017, Georg Ehrke * - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php index 195b6f41b4..91a9bce06b 100644 --- a/apps/files/recentlist.php +++ b/apps/files/recentlist.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Robin Appelman * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index decea505f0..c51bc1a75d 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -5,7 +5,7 @@ * @author Arthur Schiwon * @author Bjoern Schiessle * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Maxence Lange diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php index bdd1f35420..28bfcd12c2 100644 --- a/apps/files_sharing/lib/Controller/ShareInfoController.php +++ b/apps/files_sharing/lib/Controller/ShareInfoController.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php b/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php index 19ae7ceb76..faf9ef4756 100644 --- a/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php +++ b/apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php @@ -3,6 +3,7 @@ * * * @author Lukas Reschke + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php index 13eed0c62d..74a5db4f30 100644 --- a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php +++ b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index 6f0b3f9c2d..6062ff8906 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -4,7 +4,7 @@ * * @author Bjoern Schiessle * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php index fe8b4fd377..882e858217 100644 --- a/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareInfoControllerTest.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php index c9108ad0cc..c260a65725 100644 --- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php index 1498c5fc12..cbac5c7bef 100644 --- a/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php +++ b/apps/files_sharing/tests/Middleware/ShareInfoMiddlewareTest.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 44c1f482de..d61881ce3b 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -7,7 +7,7 @@ * @author Bjoern Schiessle * @author Björn Schießle * @author Florin Peter - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Juan Pablo Villafáñez * @author Jörn Friedrich Dreyer diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index 812a068f07..b35eb9a62c 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -4,7 +4,7 @@ * * @author Arthur Schiwon * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke diff --git a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php index a8d67870d1..11ffb8b090 100644 --- a/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php +++ b/apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php index 9fa9acde5c..4c7f7a654c 100644 --- a/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php +++ b/apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php @@ -3,6 +3,7 @@ * * * @author Lukas Reschke + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php index 995b8ebd7e..31d17cbaed 100644 --- a/apps/user_ldap/tests/HelperTest.php +++ b/apps/user_ldap/tests/HelperTest.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php index 4715366c86..62d06ddf75 100644 --- a/build/integration/features/bootstrap/FilesDropContext.php +++ b/build/integration/features/bootstrap/FilesDropContext.php @@ -2,6 +2,7 @@ /** * * + * @author Morris Jobke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/core/Controller/ContactsMenuController.php b/core/Controller/ContactsMenuController.php index 32984e5d9b..db6383cb2a 100644 --- a/core/Controller/ContactsMenuController.php +++ b/core/Controller/ContactsMenuController.php @@ -3,7 +3,7 @@ * @copyright 2017 Christoph Wurst * * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * @author Roeland Jago Douma * * @license GNU AGPL version 3 or any later version diff --git a/core/Migrations/Version13000Date20170919121250.php b/core/Migrations/Version13000Date20170919121250.php index d27d1df646..0857d6d5ce 100644 --- a/core/Migrations/Version13000Date20170919121250.php +++ b/core/Migrations/Version13000Date20170919121250.php @@ -3,6 +3,7 @@ * * * @author Joas Schilling + * @author Morris Jobke * * @license GNU AGPL version 3 or any later version * diff --git a/core/Migrations/Version13000Date20170926101637.php b/core/Migrations/Version13000Date20170926101637.php index 7c4e0d4899..f51828e7a3 100644 --- a/core/Migrations/Version13000Date20170926101637.php +++ b/core/Migrations/Version13000Date20170926101637.php @@ -3,6 +3,7 @@ * * * @author Joas Schilling + * @author Morris Jobke * * @license GNU AGPL version 3 or any later version * diff --git a/core/routes.php b/core/routes.php index 93dc126d21..1cb44e47d9 100644 --- a/core/routes.php +++ b/core/routes.php @@ -6,7 +6,7 @@ * @author Bernhard Posselt * @author Christoph Wurst * @author Christopher Schäpers - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author John Molakvoæ (skjnldsv) * @author Lukas Reschke diff --git a/index.php b/index.php index 135a0d014e..a3e1ff5719 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke diff --git a/lib/autoloader.php b/lib/autoloader.php index 08188ef8e5..efab84b44f 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Andreas Fischer - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Markus Goetz diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index 39775265e5..ecf8462ebb 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Bernhard Posselt - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke * @author Roeland Jago Douma diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index 8d0b809924..108ff0d498 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -4,7 +4,7 @@ * @copyright 2017 Lukas Reschke * * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Tobia De Koninck * diff --git a/lib/private/Contacts/ContactsMenu/Manager.php b/lib/private/Contacts/ContactsMenu/Manager.php index 7c662d3f66..676ba60289 100644 --- a/lib/private/Contacts/ContactsMenu/Manager.php +++ b/lib/private/Contacts/ContactsMenu/Manager.php @@ -3,7 +3,7 @@ * @copyright 2017 Christoph Wurst * * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * * @license GNU AGPL version 3 or any later version * diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index e7a37e382f..bff1f2e3f0 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Björn Schießle - * @author Georg Ehrke + * @author Georg Ehrke * @author Jörn Friedrich Dreyer * @author Morris Jobke * @author Robin Appelman diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 142ead786e..6556e7b169 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -2,6 +2,7 @@ /** * @copyright Copyright (c) 2016 Robin Appelman * + * @author Morris Jobke * @author Robin Appelman * * @license GNU AGPL version 3 or any later version diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 794aa73958..e0c6844cbd 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -7,7 +7,7 @@ * @author Brice Maron * @author Christoph Wurst * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Kamil Domanski * @author Lukas Reschke diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index 113028c7e1..e9e720a376 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Roeland Jago Douma * diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 076006a0f4..b6a208ad68 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -5,7 +5,7 @@ * @author Andreas Fischer * @author Bart Visscher * @author duritong - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Juan Pablo Villafáñez * @author Lukas Reschke diff --git a/lib/private/Preview/Image.php b/lib/private/Preview/Image.php index 7fdf1bbd50..86ce3bcd07 100644 --- a/lib/private/Preview/Image.php +++ b/lib/private/Preview/Image.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author josh4trunks * @author Olivier Paroz diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php index 415f7e008f..11a512286e 100644 --- a/lib/private/Preview/MP3.php +++ b/lib/private/Preview/MP3.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Olivier Paroz diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index d6a589dfae..3576a889e5 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Olivier Paroz diff --git a/lib/private/Preview/Provider.php b/lib/private/Preview/Provider.php index 5c9234fcf7..d0dd259891 100644 --- a/lib/private/Preview/Provider.php +++ b/lib/private/Preview/Provider.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Olivier Paroz diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php index a180ec3dd1..0695c251c8 100644 --- a/lib/private/Preview/SVG.php +++ b/lib/private/Preview/SVG.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Olivier Paroz * @author Roeland Jago Douma diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php index 8448991be2..6fd7a5516e 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Morris Jobke * @author Nmz diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 75b0bf53a5..8562465aad 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Bjoern Schiessle - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index a26cbc088f..d92c8d0160 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -4,7 +4,7 @@ * * @author Arthur Schiwon * @author Bart Visscher - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 5cbff28255..a835ca3384 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -9,7 +9,7 @@ * @author Bjoern Schiessle * @author Björn Schießle * @author fabian - * @author Georg Ehrke + * @author Georg Ehrke * @author Jakob Sack * @author Joas Schilling * @author Jörn Friedrich Dreyer diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index d980df5995..d2b0f96d59 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -12,7 +12,7 @@ * @author Christopher Schäpers * @author Felix Moeller * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Jakob Sack * @author Joas Schilling * @author Julius Haertl diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php index fe85787057..fe9f054f5d 100644 --- a/lib/private/legacy/image.php +++ b/lib/private/legacy/image.php @@ -8,7 +8,7 @@ * @author Björn Schießle * @author Byron Marohn * @author Christopher Schäpers - * @author Georg Ehrke + * @author Georg Ehrke * @author j-ed * @author Joas Schilling * @author Johannes Willnecker diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php index 1ff88daac9..7b3a1b6d9c 100644 --- a/lib/private/legacy/json.php +++ b/lib/private/legacy/json.php @@ -6,7 +6,7 @@ * @author Bernhard Posselt * @author Christoph Wurst * @author Felix Moeller - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke * @author Robin Appelman diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 6da0373476..52ed1369c4 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -9,7 +9,7 @@ * @author Bartek Przybylski * @author Björn Schießle * @author Christoph Wurst - * @author Georg Ehrke + * @author Georg Ehrke * @author Jakob Sack * @author Jörn Friedrich Dreyer * @author Lukas Reschke diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 76969c3ef3..2610ec3a7b 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -17,7 +17,7 @@ * @author Felix Epp * @author Florin Peter * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author helix84 * @author Ilja Neumann * @author Individual IT Services diff --git a/lib/public/App.php b/lib/public/App.php index 250d33bf01..3afd36f2c9 100644 --- a/lib/public/App.php +++ b/lib/public/App.php @@ -4,7 +4,7 @@ * * @author Bart Visscher * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke diff --git a/lib/public/AppFramework/Http/DataDownloadResponse.php b/lib/public/AppFramework/Http/DataDownloadResponse.php index 1107c9941e..e9fcba8148 100644 --- a/lib/public/AppFramework/Http/DataDownloadResponse.php +++ b/lib/public/AppFramework/Http/DataDownloadResponse.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Morris Jobke * * @license AGPL-3.0 diff --git a/lib/public/Config.php b/lib/public/Config.php index b8f25b9302..136b7578f4 100644 --- a/lib/public/Config.php +++ b/lib/public/Config.php @@ -4,7 +4,7 @@ * * @author Bart Visscher * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Jörn Friedrich Dreyer * @author Lukas Reschke * @author Morris Jobke diff --git a/lib/public/Files.php b/lib/public/Files.php index 8b6d34b35a..d66e0f1b64 100644 --- a/lib/public/Files.php +++ b/lib/public/Files.php @@ -5,7 +5,7 @@ * @author Bart Visscher * @author Björn Schießle * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Morris Jobke diff --git a/lib/public/Template.php b/lib/public/Template.php index e264e9c79d..b7f86889ed 100644 --- a/lib/public/Template.php +++ b/lib/public/Template.php @@ -4,7 +4,7 @@ * * @author Bart Visscher * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke diff --git a/lib/public/User.php b/lib/public/User.php index bbfaa6d546..40be50dd19 100644 --- a/lib/public/User.php +++ b/lib/public/User.php @@ -5,7 +5,7 @@ * @author Bart Visscher * @author Björn Schießle * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Jörn Friedrich Dreyer * @author Lukas Reschke diff --git a/lib/public/Util.php b/lib/public/Util.php index d1d1d387d6..5127beaf50 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -6,7 +6,7 @@ * @author Bart Visscher * @author Björn Schießle * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Individual IT Services * @author Jens-Christian Fischer * @author Joas Schilling diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php index c829f4db91..ae9e7f4072 100644 --- a/settings/Controller/LogSettingsController.php +++ b/settings/Controller/LogSettingsController.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke * @author Thomas Müller diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php index 9b76236a15..a2f9fa4269 100644 --- a/settings/ajax/disableapp.php +++ b/settings/ajax/disableapp.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Kamil Domanski * @author Lukas Reschke * diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index a71ece11ee..481f0853f9 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -7,7 +7,7 @@ * @author Björn Schießle * @author Christopher Schäpers * @author Felix Moeller - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Morris Jobke diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php index c9b119622e..4fee0530dd 100644 --- a/settings/ajax/togglesubadmins.php +++ b/settings/ajax/togglesubadmins.php @@ -3,7 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Bart Visscher - * @author Georg Ehrke + * @author Georg Ehrke * @author Joas Schilling * @author Lukas Reschke * @author Roeland Jago Douma diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index 63f865a2f2..b4a2468bd2 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (c) 2016, ownCloud, Inc. * - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Robin Appelman * @author Roeland Jago Douma diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 46ca0f5087..7b615cb56b 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -4,7 +4,7 @@ * * @author Christopher Schäpers * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Robin Appelman * @author Roeland Jago Douma diff --git a/settings/routes.php b/settings/routes.php index 9b7b253bd0..ecf68791a2 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -8,7 +8,7 @@ * @author Björn Schießle * @author Christoph Wurst * @author Frank Karlitschek - * @author Georg Ehrke + * @author Georg Ehrke * @author Lukas Reschke * @author Morris Jobke * @author Raghu Nayyar diff --git a/settings/users.php b/settings/users.php index 466d8438b0..20b9e21d58 100644 --- a/settings/users.php +++ b/settings/users.php @@ -6,7 +6,7 @@ * @author Bart Visscher * @author Clark Tomlinson * @author Daniel Molkentin - * @author Georg Ehrke + * @author Georg Ehrke * @author Jakob Sack * @author Joas Schilling * @author Jörn Friedrich Dreyer