diff --git a/.mailmap b/.mailmap index cab196a3b50..0bbc20fb216 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 09ec9487fa9..a18d661731e 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 e90ce5c3f9d..e96c3f28064 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 9a221d6703f..ae08e50d607 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 55eb35d5e20..4fc12b5d3ed 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 7d4a1dc9f3f..aa902bacc53 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 7017322272a..8d22a8bb346 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 6742c21d9f0..ac3bcec6173 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 5a8368fede6..3429c24705d 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 b8b02db572b..949886bf32a 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 e89ca4b6918..f65ac9797b8 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 0121d384184..aaeea64b237 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 1d0945fcdbe..55f969e2167 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 0702450eb81..edb52c3ad89 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 92d88a387cf..37000aa2eb8 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 373eabda2d7..5cc8f799f90 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 68850ab476d..5fc38315438 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 a0f4db8be82..7aac59809a2 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 a1ad91fe55c..bfcb960d402 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 565800cd791..cfb2211fb59 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 856c63f2a70..ddd36818223 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 c47ee83ea67..e7c229c7b03 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 c60378a07ca..5034b16ed2f 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 f01f3e753f7..be92f16f772 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 878e84ee594..ad02d4ba427 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 4227e24dfb9..069239326ba 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 fa22aabf55f..0029af7bff7 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 fac5c3090ed..a5ad3e22acc 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 035923f1d6e..2ac65f94478 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 f2f69e9fecd..da4b4f4fe84 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 a35f91a792d..a4fa2c63e02 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 75ed07130fa..d4c7026aea8 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 16c945fe1ac..d50cbae396b 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 270494c4e8d..14f6f4e49eb 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 fcdb65e80b1..1c85d19432c 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 102ede0c194..aa5c4bf3049 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 ee9c23be6bb..71b1de09ed2 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 22a9e22ebde..a60b586e233 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 6e8a58e7ae6..99ad640c447 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 2ce5df3c829..82f4161c206 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 b6d65f7497c..9783d1a6267 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 5b71fdcac85..b2ba8ba119a 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 59dfa1c5e69..ee52cab2814 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 1a12670ce08..35d86fbf34b 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 d76b384adcc..12eb74259fc 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 172b341bd79..89253ce9dc9 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 3e1059da8be..63e090873bb 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 606eedfb63a..768b867234c 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 0c0e714c1c4..1f7ad404251 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 70e08d4474d..780324abaa6 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 198c4d16af8..8ee58107487 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 195b6f41b4f..91a9bce06b5 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 decea505f0b..c51bc1a75dd 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 bdd1f354208..28bfcd12c24 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 19ae7ceb766..faf9ef4756d 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 13eed0c62d9..74a5db4f308 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 6f0b3f9c2da..6062ff89065 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 fe8b4fd3776..882e858217e 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 c9108ad0cc2..c260a65725d 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 1498c5fc127..cbac5c7bef5 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 44c1f482de6..d61881ce3b1 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 812a068f070..b35eb9a62c0 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 a8d67870d10..11ffb8b0903 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 9fa9acde5c3..4c7f7a654c8 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 995b8ebd7e4..31d17cbaede 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 4715366c867..62d06ddf750 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 32984e5d9bc..db6383cb2ac 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 d27d1df6462..0857d6d5ceb 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 7c4e0d48997..f51828e7a33 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 93dc126d210..1cb44e47d9d 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 135a0d014ef..a3e1ff57192 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 08188ef8e59..efab84b44f9 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 39775265e55..ecf8462ebb6 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 8d0b809924f..108ff0d4989 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 7c662d3f66f..676ba602894 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 e7a37e382ff..bff1f2e3f0c 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 142ead786ee..6556e7b169a 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 794aa739588..e0c6844cbd0 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 113028c7e14..e9e720a3766 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 076006a0f49..b6a208ad68a 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 7fdf1bbd500..86ce3bcd071 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 415f7e008f9..11a512286ec 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 d6a589dfaea..3576a889e56 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 5c9234fcf78..d0dd259891f 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 a180ec3dd13..0695c251c8b 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 8448991be23..6fd7a5516e0 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 75b0bf53a53..8562465aad3 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 a26cbc088f1..d92c8d01605 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 5cbff28255e..a835ca3384e 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 d980df59956..d2b0f96d593 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 fe857870574..fe9f054f5d4 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 1ff88daac96..7b3a1b6d9cd 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 6da03734767..52ed1369c47 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 76969c3ef3e..2610ec3a7b6 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 250d33bf01f..3afd36f2c96 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 1107c9941e1..e9fcba8148d 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 b8f25b93026..136b7578f40 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 8b6d34b35a2..d66e0f1b645 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 e264e9c79d8..b7f86889edb 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 bbfaa6d5466..40be50dd19c 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 d1d1d387d6d..5127beaf505 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 c829f4db911..ae9e7f4072f 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 9b76236a15b..a2f9fa42693 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 a71ece11eea..481f0853f96 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 c9b119622ee..4fee0530dd1 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 63f865a2f24..b4a2468bd2a 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 46ca0f50879..7b615cb56bb 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 9b7b253bd04..ecf68791a27 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 466d8438b01..20b9e21d58e 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