From 83c4f560f651ee5a4f73ae5e38df27ae5c0e7053 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 4 Sep 2020 18:25:45 +0200 Subject: [PATCH] Bug 26394: Update .mailmap Content-Type: text/plain; charset=utf-8 The .mailmap file used to generate the stats is different from the one we have in our repo. It's much more complete and should be integrated into Koha. Test plan: Confirm that the different mappings are correct Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy --- .mailmap | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 9a3a2dabc9..d70cb18467 100644 --- a/.mailmap +++ b/.mailmap @@ -1,8 +1,284 @@ +ahbanks ahbanks +hpassini hpassini +amillar amillar +btoumi btoumi +cauchoip cauchoip +doxulting doxulting +fisheye fisheye +fmmarzoa fmmarzoa +gmccullagh gmccullagh +hellen hellen +plugz plugz +Ambrose Li acli +Mike dragon28 +Pierreck Le Gall plg +Gynn Lomax truth_nz +Pat Eyler pate +Andrew Arensburger arensb +alaurin alaurin +Albert Oller Albert Oller +Albert Oller Albert Oller +Allen Reinmeyer Allen Reinmeyer +Allen Reinmeyer Allen Reinmeyer +Amit Gupta amit gupta +Amit Gupta Amit Gupta +Andrei V. Toutoukine Andrei V. Toutoukine +Andrew Elwell Andrew Elwell +Andrew Elwell Andrew Elwell +Andrew Moore Andrew Moore +Bernardo Gonzalez Kriegel Bernardo Gonzalez Kriegel +Biblibre biblibre +BibLibre BibLibre +Bob Lyon bob_lyon +Brendan A. Gallagher Brendan A. Gallagher +Brendan A. Gallagher Brendan A. Gallagher +Brendan A. Gallagher brendan +Brendan A. Gallagher brendan +Brendan A. Gallagher Brendan +Brendan A. Gallagher ByWater Solutions +Brendan A. Gallagher Brendan Gallagher +Brendan A. Gallagher Brendan Gallagher +Brian Harrington Brian Harrington +Brian Harrington Brian Harrington +Brice Sanchez Brice Sanchez +Bryce Sanchez Bryce Sanchez +Chris Catalfo Chris Catalfo +Chris Catalfo Chris Catalfo +Chris Cormack chris +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Chris Cormack Chris Cormack +Christopher Hall Chris Hall +Christopher Hall Christopher Hall +Christophe Croullebois christophe croullebois +Chris Nighswonger Chris +Chris Nighswonger Chris Nighswonger +Chris Nighswonger Chris Nighswonger +Chris Nighswonger Chris Nighswonger +Chris Nighswonger Chris Nighswonger +conan (aka Fernando L. Canizo) conan (aka Fernando Canizo) +conan (aka Fernando L. Canizo) conan (aka Fernando L. Canizo) +Danny Bouman Danny Bouman +Darrell Ulm Darrell Ulm +Darrell Ulm Darrell Ulm +Duncan Tyler Duncan Tyler +Duncan Tyler Duncan Tyler +Finlay Thompson finlayt +Frédéric Demians f.demians at tamil.fr <(frederic@tamil.fr)> +Frédéric Demians Frédéric DEMIANS +Frédéric Demians Frédéric DEMIANS +Frédéric Demians Frederic Demians +Frédéric Demians Frederic DEMIANS +Frédéric Demians Frédéric Demians +Frédéric Demians Frédéric DEMIANS +Frédérick Capovilla Frédérick Capovilla +Frédérick Capovilla Frédérick Capovilla +Frère Sébastien Marie Frère Sébastien Marie +Frère Sébastien Marie Frère Sébastien Marie +Fridolyn SOMERS Fridolyn SOMERS +Waylon Robertson genjimoto +Greg Barniskis Greg Barniskis +hcpl test hcpl test +Henri-Damien LAURENT hdl +Henri-Damien LAURENT Henri-Damien LAURENT +Henri-Damien LAURENT Henri-Damien LAURENT +Ian Walls Ian Walls +Ian Walls Ian Walls +Ian Walls Ian Walls +Mason James JAMES Mason +Janusz Kaczmarek Janusz Kaczmarek +Jared Camins-ESAKOV Jared CAMINS-ESAKOV +Jared Camins-Esakov Jared Camins-Esakov +Jared Camins-Esakov Jared Camins-Esakov +J. David Bavousett J. David Bavousett +J. David Bavousett J. David Bavousett +Jesse Weaver Jesse Weaver +Jesse Weaver Jesse Weaver +Joshua Ferraro jmf@arwen.metavore.com +Joe Atzberger Joe Atzberger +Joe Atzberger Joe Atzberger +Joe Atzberger (siptest Joe Atzberger (siptest +John Beppu John Beppu +John Beppu John Beppu +John Seymour John Seymour +John Soros John Soros +Jon Aker Jon Aker +Jonathan Druart Jonathan Druart +Jono Mingard Jono Mingard +Jorgia Kelsey Jorgia Kelsey +Joshua Ferraro joshferraro +Joshua Ferraro Joshua Ferraro +Joy Nelson Joy Nelson +Juan Romay Sieira Juan Romay Sieira +Julian Maurice Julian Maurice +Joshua Ferraro kados +Joshua Ferraro kados +Joshua Ferraro kados +Katrin Fischer Katrin Fischer +Katrin Fischer Katrin Fischer +Katrin Fischer Katrin Fischer +Katrin Fischer Katrin Fischer +Katrin Fischer Katrin Fischer +koha koha +Koha Koha +koha koha +koha koha +koha-preprod koha-preprod +Koha Production Koha Production +Koha User Koha User +Koustubha Kale Koustubha Kale +Kyle M Hall Kyle Hall +Kyle M Hall Kyle M Hall +Kyle M Hall Kyle M Hall +Larry Baerveldt Larry Baerveldt +Lars Wirzenius Lars Wirzenius +lavide lavide +Liz Rea Liz Rea +Liz Rea Liz Rea +Liz Rea Liz Rea +Liz Rea Liz +Lyon3 Team Lyon3 Team +Magnus Enger Magnus Enger +Marc Balmer Marc Balmer +Marc Chantreux Marc Chantreux +Marcel de Rooy Marcel de Rooy +Marcel de Rooy Marcel de Rooy +Marcel de Rooy marcel@libdevelop.rijksmuseum.nl +Mark Gavillet Mark Gavillet +Martin Renvoize Martin Renvoize +Martin Renvoize Martin Renvoize +Mason James mason.james@liblime.com +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Mason James Mason James +Matthew Hunt Matthew Hunt +Matthias Meusburger Matthias Meusburger +Maxime Pelletier Maxime Pelletier +Meenakshi.R Meenakshi.R +Michael Hafen Michael Hafen +Michael Hafen Michael Hafen +MJ Ray MJ Ray +Nahuel Angelinetti Nahuel Angelinetti +Nahuel Angelinetti Nahuel ANGELINETTI +Nate Curulla Nate Curulla +Nicole C. Engard NCE +Nicolas Morin Nicolas Morin +Nicole C. Engard Nicole C. Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nuño López Ansótegui Nuño López Ansótegui +NYUHSL NYUHSL +Owen Leonard oleonard +Olwen Williams olwen +Owen Leonard Owen Leonard +Owen Leonard Owen Leonard +Paul Poulain paul +Paul Poulain paul +Paul Poulain Paul POULAIN +Paul Poulain Paul Poulain +Paul Poulain Paul POULAIN +pawelzc pawelzc +Peter Lorimer Peter Lorimer +Philippe Jaillon Philippe Jaillon +Jesse Weaver Pianohacker +Piotr Wejman Piotr Wejman +Polytechnic University Koha Installation Polytechnic University Koha Installation +preprod34 preprod34 +PTFS Contractor PTFS Contractor +PTFS PTFS +QA Manager QA Manager +Rachel Hamilton-Williams rachelkatipo +Chris Cormack rangi +Reed Wade Reed Wade +Ricardo Dias Marques Ricardo Dias Marques +ri_chard ri_chard +Rick Welykochy Rick Welykochy +Robin Sheat Robin Sheat +root root +root root +root root +root root +root root +root root +root root +root root +Russel Garlick Russel Garlick +Russel Garlick Russel Garlick +Russel Garlick Russel Garlick +Russel Garlick Russel Garlick +D Ruth Bavousett ruth@bywatersolutions.com +Ryan Higgins Ryan Higgins +Ryan HIggins Ryan HIggins +Ryan Higgins Ryan Higgins +Ryan Higgins Ryan Higgins +Ryan Higgins rych +saas saas +Salvador Zaragoza Rubio Salvador Zaragoza Rubio +savitra.sirohi savitra.sirohi +Savitra Sirohi Savitra Sirohi +Schuster Schuster +Sébastien Hinderer Sébastien Hinderer +sergerenaux sergerenaux +Serhij Dubyk {Сергій Дубик} Serhij Dubyk {Сергій Дубик} +shaunevans shaunevans +Stephen Hedges shedges +Simon Blake simon +MJ Ray slef +Sophie Meynieux Sophie Meynieux +Southeastern University Southeastern University +Srdjan Janković Srdjan Jankovic +Srdjan Janković Srdjan Janković +Stan Brinkerhoff Stan Brinkerhoff +Stan Brinkerhoff stan +Stan Brinkerhoff stan +Stéphane Delaune Stéphane Delaune +Stephen Edwards Stephen Edwards +Steven Callender Steven Callender +Mason James sushi +szrj1m szrj1m +Tumer Garip tgarip1957 +Thatcher Rea Thatcher Rea +Thomas Dukleth thd +Thomas Dukleth thd +Thomas Dukleth Thomas Dukleth +Paul Poulain tipaul +Antoine Farnault toins +Tomás Cohen Arazi Tomas Cohen Arazi +Tomás Cohen Arazi Tomás Cohen Arazi +Steve Tonnesen tonnesen +Ulrich Kleiber Ulrich Kleiber +Vincent Danjean Vincent Danjean +Ward van Wanrooij Ward van Wanrooij +Will Stokes Will Stokes +Wolfgang Heymans Wolfgang Heymans +wolfpac444 wolfpac444 +Zach Sim Zach Sim +Zeno0 Tajoli Zeno0 Tajoli +Zeno Tajoli Zeno Tajoli +Zeno Tajoli Zeno Tajoli +zifox zifox + # This file maintains name/email mappings for git-shortlog use # For more information on the use of this file see: man git-shortlog # Mail to name mapping: email at the right is mapped to name at the left -James Mason +Mason James Henri-Damien Laurent Alex Arnaud Benjamin Rokseth @@ -50,6 +326,30 @@ Petter Goksøyr Åsen Robin Sheat Srdjan Jankovic Tomás Cohen Arazi + + + + + + + + +Alex Horsman +Aleisha Amohia + + + + +johnboy johnboy +Sam Sanders Sam Sanders +spartaness spartaness +Morag Hills +Rochelle Healy +Thomas Wright +Genevieve Plantin genevieve +Barton Chittenden Barton + +Tomás Cohen Arazi Tomás Cohen Arazi Tomás Cohen Arazi Bernardo González Kriegel @@ -61,12 +361,18 @@ Zeno Tajoli Silvia Simonetti Paola Rossi +Blou + # Name to name mapping: the name in the right column will be mapped to the name in the left Chris Nighswonger Chris R. Nighswonger Jared Camins-Esakov Jared CAMINS-ESAKOV Fridolin Somers Fridolyn SOMERS + + + + # Mail to mail mapping: the email addy in the right column will be mapped to the email addy in the left -- 2.11.0