From 2dc71fa207a3b9cc0a1b1229432807f83735a5c6 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 25 Mar 2015 17:53:25 -0700 Subject: [PATCH] Update AUTHORS.txt, $wgExtensionCredits and .mailmap based on git shortlog Change-Id: I84d4686e863fa1acbc1733b2bfc34e2981132be5 --- .mailmap | 65 +++++++++++++++++++++++++++++++++++++++++++++--- AUTHORS.txt | 36 ++++++++++++++++++++++----- VisualEditor.php | 3 ++- extension.json | 5 ++-- 4 files changed, 96 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index a09ac47767..b446bf30c3 100644 --- a/.mailmap +++ b/.mailmap @@ -1,17 +1,74 @@ +Aaron Schulz +Aaron Schulz Alex Monk Alex Monk +Alexander Emsenhuber +Alexander Emsenhuber +Amir E. Aharoni +Antoine Musso +Antoine Musso +Audrey Tang +Audrey Tang Bartosz Dziewoński -Christian Williams +Bartosz Dziewoński +Brion Vibber +Brion Vibber +C. Scott Ananian +C. Scott Ananian +Chris McMahon +Christian Williams +Christian Williams +Christian Williams David Chan Ed Sanders -Inez Korczynski +Erik Moeller +Erik Moeller +Gabriel Wicke +Gabriel Wicke +Gabriel Wicke +Helder +Helder +Inez Korczyński +Inez Korczyński James D. Forrester +Jeff Hall +Jeff Hall +Jiabao +Jon Robson +Juliusz Gonera +Juliusz Gonera Marielle Volz +Mark A. Hershberger +Mark A. Hershberger Moriel Schottlender +Moriel Schottlender +Peter Coti +Raimond Spekking +Raimond Spekking Roan Kattouw +Roan Kattouw Roan Kattouw -Rob Moen +Rob Moen +Rob Moen +Rob Moen +Rummana Yasmeen +Ryan Kaldari +Ryan Kaldari +Sam Reed +Sam Reed +Siebrand Mazeland +Siebrand Mazeland +Siebrand Mazeland +Siebrand Mazeland +Subramanya Sastry Sucheta Ghoshal +Thalia Chan Timo Tijhof +Timo Tijhof +Timo Tijhof Trevor Parscal - +Trevor Parscal +Trevor Parscal +Vikas S Yaligar +Željko Filipin +Željko Filipin diff --git a/AUTHORS.txt b/AUTHORS.txt index 36333f71bb..f979f4d888 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -2,12 +2,11 @@ Principal Authors (major contributors, alphabetically) Alex Monk Bartosz Dziewoński -Christian Williams +Christian Williams David Chan Ed Sanders Inez Korczyński -James Forrester -Marielle Volz +James D. Forrester Moriel Schottlender Roan Kattouw Rob Moen @@ -28,34 +27,59 @@ Audrey Tang Brad Jorsch Brion Vibber C. Scott Ananian +Carl Fürstenberg Chris McMahon Dan Duvall Derk-Jan Hartman +Elena Tonkovidova +Erick Guan Erik Moeller Federico Leva Gabriel Wicke +Helder +Jamison Lofthouse Jeff Hall +Jiabao +John Du Hart Jon Robson Juliusz Gonera Kaity Hammerstein Kunal Mehta -Matthew Flaschen +Kyle Florence +Marielle Volz Mark A. Hershberger Mark Holmquist +Marko Obrovac +Matthew Flaschen +Matthias Mullie +Neil Kandalgaonkar Niklas Laxström Ori Livneh +Pavel Selitskas +Peter Coti Quim Gil Raimond Spekking +Rummana Yasmeen Ryan Kaldari Sam Reed Sam Smith +Seb35 Siebrand Mazeland +Steven Zhang Subramanya Sastry +Thalia Chan +This, that and the other +Tim Starling +Tongbo Sui Vikas S Yaligar +Yuki Shira Željko Filipin addshore -Helder -Jiabao +lokal-profil +mayankmadan +palerdot +rachel99 +shirayuki Libraries used (alphabetically) diff --git a/VisualEditor.php b/VisualEditor.php index 39c77b19b9..4f8669f037 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -23,13 +23,14 @@ $wgExtensionCredits['other'][] = array( 'David Chan', 'Ed Sanders', 'Inez Korczyński', - 'James Forrester', + 'James D. Forrester', 'Moriel Schottlender', 'Roan Kattouw', 'Rob Moen', 'Sucheta Ghoshal', 'Timo Tijhof', 'Trevor Parscal', + '...', ), 'version' => '0.1.0', 'url' => 'https://www.mediawiki.org/wiki/Extension:VisualEditor', diff --git a/extension.json b/extension.json index 79ab02ffd1..f3fbf03fd9 100644 --- a/extension.json +++ b/extension.json @@ -8,13 +8,14 @@ "David Chan", "Ed Sanders", "Inez Korczyński", - "James Forrester", + "James D. Forrester", "Moriel Schottlender", "Roan Kattouw", "Rob Moen", "Sucheta Ghoshal", "Timo Tijhof", - "Trevor Parscal" + "Trevor Parscal", + "..." ], "url": "https://www.mediawiki.org/wiki/Extension:VisualEditor", "descriptionmsg": "visualeditor-desc",