nextcloud · ChristophWurst · Dec 20, 2019 · Dec 19, 2019
diff --git a/.mailmap b/.mailmap
@@ -185,6 +185,7 @@ Jesús Macias <[email protected]> Jesus Macias <[email protected]>
 jknockaert <[email protected]>
 Joan <[email protected]>
 Joar Wandborg <[email protected]>
+Joas Schilling <[email protected]> Joas Schilling <[email protected]>
 Joas Schilling <[email protected]> Joas Schilling <[email protected]>
 Joas Schilling <[email protected]> Joas Schilling <[email protected]>
 joel hansson <[email protected]>
@@ -317,6 +318,7 @@ Robin McCorkell <[email protected]> Robin McCorkell <[email protected]
 Rodrigo Hjort <[email protected]>
 Roeland Jago Douma <[email protected]> Roeland Jago Douma <[email protected]>
 Roeland Jago Douma <[email protected]> Roeland Douma <[email protected]>
+Roeland Jago Douma <[email protected]> Roeland Jago Douma <[email protected]>
 Roger Szabo <[email protected]> root <[email protected]>
 rok <[email protected]>
 Roland Hager <[email protected]>
@@ -336,6 +338,7 @@ Sander <[email protected]>
 Sandro Knauß <[email protected]> Sandro <hefee@taurin.(none)>
 Sascha Schmidt <[email protected]>
 Sascha Schneider <[email protected]>
+Sascha Wiswedel <[email protected]> Sascha Wiswedel <[email protected]>
 scambra <[email protected]>
 scolebrook <[email protected]>
 Scott Arciszewski <[email protected]>
@@ -354,6 +357,7 @@ Simon Birnbach <[email protected]>
 Simon Könnecke <[email protected]>
 Simon Whittaker <[email protected]>
 Sjors van der Pluijm <[email protected]> Sjors van der Pluijm <[email protected]>
+John Molakvoæ (skjnldsv) <[email protected]> John Molakvoæ <[email protected]>
 st3so <[email protected]>
 Stefan <[email protected]>
 Stefan Göckeritz <[email protected]>

diff --git a/AUTHORS b/AUTHORS
@@ -115,7 +115,6 @@ Nextcloud is written by:
  - Jesús Macias <[email protected]>
  - Joachim Bauch <[email protected]>
  - Joachim Sokolowski <[email protected]>
- - Joas Schilling <[email protected]>
  - Joas Schilling <[email protected]>
  - Joel S <[email protected]>
  - Johan Björk <[email protected]>
@@ -143,6 +142,7 @@ Nextcloud is written by:
  - Klaas Freitag <[email protected]>
  - Knut Ahlers <[email protected]>
  - Ko- <[email protected]>
+ - Konrad Bucheli <[email protected]>
  - Kristof Provost <[email protected]>
  - Kyle Fazzari <[email protected]>
  - Lars <[email protected]>
@@ -183,6 +183,8 @@ Nextcloud is written by:
  - Maxence Lange <[email protected]>
  - Maxence Lange <[email protected]>
  - Maxence Lange <[email protected]>
+ - MichaIng <[email protected]>
+ - MichaIng <[email protected]>
  - Michael Gapczynski <[email protected]>
  - Michael Göhler <[email protected]>
  - Michael Jobst <[email protected]>
@@ -191,6 +193,7 @@ Nextcloud is written by:
  - Michael Roth <[email protected]>
  - Michael Weimann <[email protected]>
  - Michael Zamot <[email protected]>
+ - Michał Węgrzynek <[email protected]>
  - Miguel Prokop <[email protected]>
  - Mitar <[email protected]>
  - Morris Jobke <[email protected]>
@@ -240,7 +243,6 @@ Nextcloud is written by:
  - Robin McCorkell <[email protected]>
  - Robin Müller <[email protected]>
  - Roeland Jago Douma <[email protected]>
- - Roeland Jago Douma <[email protected]>
  - Roger Szabo <[email protected]>
  - Roland Tapken <[email protected]>
  - Romain Rivière <[email protected]>
@@ -259,7 +261,6 @@ Nextcloud is written by:
  - Sandro Lutz <[email protected]>
  - Sascha Sambale <[email protected]>
  - Sascha Wiswedel <[email protected]>
- - Sascha Wiswedel <[email protected]>
  - Scott Shambarger <[email protected]>
  - Sean Comeau <[email protected]>
  - Sebastian Döll <[email protected]>

diff --git a/apps/admin_audit/lib/Actions/Sharing.php b/apps/admin_audit/lib/Actions/Sharing.php
@@ -9,7 +9,6 @@
  * @author Joas Schilling <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Sascha Wiswedel <[email protected]>
- * @author Sascha Wiswedel <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/comments/lib/Search/Result.php b/apps/comments/lib/Search/Result.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2018 Joas Schilling <[email protected]>
  *
  * @author Joas Schilling <[email protected]>
+ * @author Michał Węgrzynek <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php
@@ -5,6 +5,7 @@
  * @author Bjoern Schiessle <[email protected]>
  * @author Björn Schießle <[email protected]>
  * @author Joas Schilling <[email protected]>
+ * @author Julius Härtl <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>

diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php
@@ -4,6 +4,7 @@
  *
  * @author Bjoern Schiessle <[email protected]>
  * @author Christoph Wurst <[email protected]>
+ * @author Julius Härtl <[email protected]>
  * @author Ko- <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Robin Appelman <[email protected]>

diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
@@ -2,10 +2,10 @@
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
- * @author Bjoern Schiessle <[email protected]>
  * @author Björn Schießle <[email protected]>
  * @author Joas Schilling <[email protected]>
  * @author Lukas Reschke <[email protected]>
+ * @author Maxence Lange <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>
  * @author Roeland Jago Douma <[email protected]>

diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -5,6 +5,7 @@
  * @author Arthur Schiwon <[email protected]>
  * @author Brandon Kirsch <[email protected]>
  * @author Joas Schilling <[email protected]>
+ * @author Julius Härtl <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>

diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author Joas Schilling <[email protected]>
+ * @author Julius Härtl <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>

diff --git a/apps/federatedfilesharing/appinfo/app.php b/apps/federatedfilesharing/appinfo/app.php
@@ -2,9 +2,8 @@
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
- * @author Bjoern Schiessle <[email protected]>
  * @author Björn Schießle <[email protected]>
- * @author Joas Schilling <coding@schilljs.com>
+ * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @author Robin Appelman <[email protected]>
  *
  * @license AGPL-3.0

diff --git a/apps/federatedfilesharing/lib/AppInfo/Application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php
@@ -4,6 +4,8 @@
  *
  * @author Bjoern Schiessle <[email protected]>
  * @author Björn Schießle <[email protected]>
+ * @author John Molakvoæ (skjnldsv) <[email protected]>
+ * @author Maxence Lange <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>
  * @author Roeland Jago Douma <[email protected]>

diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -7,6 +7,7 @@
  * @author Björn Schießle <[email protected]>
  * @author Joas Schilling <[email protected]>
  * @author Lukas Reschke <[email protected]>
+ * @author Maxence Lange <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Robin Appelman <[email protected]>
  * @author Roeland Jago Douma <[email protected]>

diff --git a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2018 Bjoern Schiessle <[email protected]>
  *
  * @author Bjoern Schiessle <[email protected]>
+ * @author Maxence Lange <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version

diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author Christoph Wurst <[email protected]>
+ * @author Daniel Kesselberg <[email protected]>
  * @author Joas Schilling <[email protected]>
  * @author John Molakvoæ (skjnldsv) <[email protected]>
  * @author Julius Härtl <[email protected]>

diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php
@@ -2,6 +2,7 @@
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
+ * @author Christoph Wurst <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Robin Appelman <[email protected]>
  *

diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php
@@ -4,6 +4,7 @@
  *
  * @author Bart Visscher <[email protected]>
  * @author Blaok <[email protected]>
+ * @author Christoph Wurst <[email protected]>
  * @author Daniel Kesselberg <[email protected]>
  * @author Joel S <[email protected]>
  * @author Jörn Friedrich Dreyer <[email protected]>

diff --git a/apps/files/lib/Command/ScanAppData.php b/apps/files/lib/Command/ScanAppData.php
@@ -2,6 +2,7 @@
 /**
  *
  *
+ * @author Christoph Wurst <[email protected]>
  * @author Daniel Kesselberg <[email protected]>
  * @author Joel S <[email protected]>
  * @author Morris Jobke <[email protected]>

diff --git a/apps/files/lib/Db/TransferOwnershipMapper.php b/apps/files/lib/Db/TransferOwnershipMapper.php
@@ -5,6 +5,7 @@
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
+ * @author Joas Schilling <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version

diff --git a/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php b/apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php
@@ -5,6 +5,7 @@
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
+ * @author Robin Appelman <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version

diff --git a/apps/files/lib/Migration/Version11301Date20191205150729.php b/apps/files/lib/Migration/Version11301Date20191205150729.php
@@ -1,8 +1,11 @@
 <?php
+
 declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
+ * @author Joas Schilling <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version

diff --git a/apps/files/lib/Notification/Notifier.php b/apps/files/lib/Notification/Notifier.php
@@ -7,6 +7,7 @@
  *
  * @author Joas Schilling <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
+ * @author Sascha Wiswedel <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/files/lib/Service/DirectEditingService.php b/apps/files/lib/Service/DirectEditingService.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
  *
  * @author Julius Härtl <[email protected]>
+ * @author Tobias Kaminsky <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
@@ -6,6 +6,7 @@
  * @copyright 2019 Christoph Wurst <[email protected]>
  *
  * @author Christoph Wurst <[email protected]>
+ * @author Sascha Wiswedel <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php
@@ -4,6 +4,7 @@
  *
  * @author Arthur Schiwon <[email protected]>
  * @author Morris Jobke <[email protected]>
+ * @author Robin Appelman <[email protected]>
  * @author Robin McCorkell <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
  *

diff --git a/apps/files_sharing/lib/Controller/SettingsController.php b/apps/files_sharing/lib/Controller/SettingsController.php
@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
@@ -18,7 +20,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 

diff --git a/apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php b/apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php
@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
@@ -18,7 +20,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 

diff --git a/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php b/apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php
@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
@@ -18,7 +20,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 

diff --git a/apps/files_sharing/lib/Settings/Personal.php b/apps/files_sharing/lib/Settings/Personal.php
@@ -1,5 +1,7 @@
 <?php
+
 declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]>
  *
@@ -18,7 +20,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 

diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
  * @author John Molakvoæ (skjnldsv) <[email protected]>
+ * @author Robin Appelman <[email protected]>
  * @author Vincent Petry <[email protected]>
  *
  * @license AGPL-3.0

diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
@@ -7,6 +7,7 @@
  * @author Cthulhux <[email protected]>
  * @author Daniel Kesselberg <[email protected]>
  * @author Derek <[email protected]>
+ * @author Georg Ehrke <[email protected]>
  * @author Joas Schilling <[email protected]>
  * @author Ko- <[email protected]>
  * @author Lukas Reschke <[email protected]>

diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php
@@ -8,6 +8,7 @@
  * @author Lukas Reschke <[email protected]>
  * @author Morris Jobke <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
+ * @author Sascha Wiswedel <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -8,7 +8,8 @@
  * @author Joas Schilling <[email protected]>
  * @author John Molakvoæ (skjnldsv) <[email protected]>
  * @author Morris Jobke <[email protected]>
- * @author Roeland Jago Douma <[email protected]>
+ * @author Robin Appelman <[email protected]>
+ * @author Roeland Jago Douma <[email protected]>
  * @author Thomas Citharel <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version

diff --git a/apps/theming/lib/Settings/Section.php b/apps/theming/lib/Settings/Section.php
@@ -2,7 +2,7 @@
 /**
  * @copyright Copyright (c) 2016 Arthur Schiwon <[email protected]>
  *
- * @author Roeland Jago Douma <[email protected]>
+ * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/theming/tests/ServicesTest.php b/apps/theming/tests/ServicesTest.php
@@ -4,7 +4,6 @@
  *
  * @author Joas Schilling <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
- * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php
@@ -3,7 +3,6 @@
  * @copyright Copyright (c) 2016 Lukas Reschke <[email protected]>
  *
  * @author Roeland Jago Douma <[email protected]>
- * @author Roeland Jago Douma <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *