summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS12
-rw-r--r--lib/private/App/AppManager.php2
-rw-r--r--lib/private/Files/Storage/DAV.php2
-rw-r--r--lib/private/Group/Manager.php2
-rw-r--r--lib/private/Installer.php2
-rw-r--r--lib/private/Setup.php2
-rw-r--r--lib/public/AppFramework/Controller.php2
-rw-r--r--lib/public/AppFramework/OCSController.php2
9 files changed, 14 insertions, 13 deletions
diff --git a/.mailmap b/.mailmap
index 0bbc20fb216..a498afb7a73 100644
--- a/.mailmap
+++ b/.mailmap
@@ -100,6 +100,7 @@ derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
+Donquixote <marjunebatac@gmail.com> Donquixote <marjunebatac@gmailcom>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index a18d661731e..70f8416f3fe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,7 @@ Nextcloud is written by:
- Aaron Wood <aaronjwood@gmail.com>
- Achim Königs <garfonso@tratschtante.de>
- Adam Williamson <awilliam@redhat.com>
- - Administrator <Administrator@WINDOWS-2012>
+ - Administrator "Administrator@WINDOWS-2012"
- Aldo "xoen" Giambelluca <xoen@xoen.org>
- Alex Weirig <alex.weirig@technolink.lu>
- Alexander Bergolth <leo@strike.wu.ac.at>
@@ -41,7 +41,7 @@ Nextcloud is written by:
- Christian Jürges <christian@eqipe.ch>
- Christian Kampka <christian@kampka.net>
- Christian Weiske <cweiske@cweiske.de>
- - Christoph Schaefer <christophł@wolkesicher.de>
+ - Christoph Schaefer "christophł@wolkesicher.de"
- Christoph Wickert <cwickert@suse.de>
- Christoph Wurst <christoph@owncloud.com>
- Christopher Bartz <bartz@dkrz.de>
@@ -60,7 +60,7 @@ Nextcloud is written by:
- David Toledo <dtoledo@solidgear.es>
- Derek <derek.kelly27@gmail.com>
- Dominik Schmidt <dev@dominik-schmidt.de>
- - Donquixote <marjunebatac@gmailcom>
+ - Donquixote <marjunebatac@gmail.com>
- Fabian Henze <flyser42@gmx.de>
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
- Felix A. Epp <work@felixepp.de>
@@ -279,8 +279,8 @@ Nextcloud is written by:
- oparoz <owncloud@interfasys.ch>
- phisch <git@philippschaffrath.de>
- rakekniven <mark.ziegler@rakekniven.de>
+ - root "root@oc.(none)"
- root <root@localhost.localdomain>
- - root <root@oc.(none)>
- scambra <sergio@entrecables.com>
- scolebrook <scolebrook@mac.com>
- shkdee <louis.traynard@m4x.org>
@@ -289,8 +289,8 @@ Nextcloud is written by:
- tbelau666 <thomas.belau@gmx.de>
- tux-rampage <tux-rampage@users.noreply.github.com>
- v1r0x <vinzenz.rosenkranz@gmail.com>
- - vkuimov <vkuimov@nextcloud>
- - voxsim <Simon Vocella>
+ - vkuimov "vkuimov@nextcloud"
+ - voxsim "Simon Vocella"
With help from many libraries and frameworks including:
Open Collaboration Services
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 5632b48bc21..6be892b7f49 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -4,7 +4,7 @@
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Schaefer <christophł@wolkesicher.de>
+ * @author Christoph Schaefer "christophł@wolkesicher.de"
* @author Christoph Wurst <christoph@owncloud.com>
* @author Joas Schilling <coding@schilljs.com>
* @author Julius Haertl <jus@bitgrid.net>
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 311725be255..cd42b2d7073 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -13,7 +13,7 @@
* @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
- * @author vkuimov <vkuimov@nextcloud>
+ * @author vkuimov "vkuimov@nextcloud"
*
* @license AGPL-3.0
*
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
index 48214471e8a..2d40b447996 100644
--- a/lib/private/Group/Manager.php
+++ b/lib/private/Group/Manager.php
@@ -18,7 +18,7 @@
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
* @author Vinicius Cubas Brand <vinicius@eita.org.br>
- * @author voxsim <Simon Vocella>
+ * @author voxsim "Simon Vocella"
*
* @license AGPL-3.0
*
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index e0c6844cbd0..be029c2bfd7 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -13,7 +13,7 @@
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
- * @author root <root@oc.(none)>
+ * @author root "root@oc.(none)"
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
*
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 8e718b02320..e1863a5814c 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
- * @author Administrator <Administrator@WINDOWS-2012>
+ * @author Administrator "Administrator@WINDOWS-2012"
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
* @author Bernhard Posselt <dev@bernhard-posselt.com>
diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php
index 49bd80b9cbe..64be033d1d9 100644
--- a/lib/public/AppFramework/Controller.php
+++ b/lib/public/AppFramework/Controller.php
@@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Donquixote <marjunebatac@gmailcom>
+ * @author Donquixote <marjunebatac@gmail.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php
index de784642b32..29f26bf7e71 100644
--- a/lib/public/AppFramework/OCSController.php
+++ b/lib/public/AppFramework/OCSController.php
@@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Donquixote <marjunebatac@gmailcom>
+ * @author Donquixote <marjunebatac@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Stefan Weil <sw@weilnetz.de>