diff --git a/.mailmap b/.mailmap index f1a7753360..feabaee746 100644 --- a/.mailmap +++ b/.mailmap @@ -37,10 +37,13 @@ Gael Varoquaux GaelVaroquaux Gregory R. Lee Ian Nimmo-Smith Ian Nimmo-Smith Jaakko Leppäkangas jaeilepp +Jacob Roberts +Jacob Roberts Jakub Kaczmarzyk Jakub Kaczmarzyk Jasper J.F. van den Bosch Jasper Jean-Baptiste Poline jbpoline +Jérôme Dockès Jon Haitz Legarreta Jon Haitz Legarreta Gorroño Jonathan Daniel Jonathan Daniel <36337649+jond01@users.noreply.github.com> diff --git a/.zenodo.json b/.zenodo.json index 572f05d12e..a2c6ccee70 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -93,10 +93,10 @@ "orcid": "0000-0002-0807-6005" }, { - "name": "Duek, Or" + "name": "Daniel, Jonathan" }, { - "name": "Daniel, Jonathan" + "name": "Duek, Or" }, { "affiliation": "The University of Washington eScience Institute", @@ -127,6 +127,9 @@ "name": "Riddell, Cameron", "orcid": "0000-0001-8950-0375" }, + { + "name": "S\u00f3lon, Anibal" + }, { "name": "Burns, Christopher" }, @@ -140,9 +143,6 @@ "name": "Gramfort, Alexandre", "orcid": "0000-0001-9791-4404" }, - { - "name": "S\u00f3lon, Anibal" - }, { "name": "Lepp\u00e4kangas, Jaakko" }, @@ -160,6 +160,14 @@ { "name": "Subramaniam, Krish" }, + { + "affiliation": "CEA", + "name": "Papadopoulos Orfanos, Dimitri", + "orcid": "0000-0002-1242-8990" + }, + { + "name": "Van, Andrew" + }, { "affiliation": "Google", "name": "Gorgolewski, Krzysztof J.", @@ -208,6 +216,9 @@ "name": "P\u00e9rez-Garc\u00eda, Fernando", "orcid": "0000-0001-9090-3024" }, + { + "name": "Dock\u00e8s, J\u00e9r\u00f4me" + }, { "name": "Oosterhof, Nikolaas N." }, @@ -228,11 +239,6 @@ { "name": "St-Jean, Samuel" }, - { - "affiliation": "CEA", - "name": "Papadopoulos Orfanos, Dimitri", - "orcid": "0000-0002-1242-8990" - }, { "name": "Panfilov, Egor", "orcid": "0000-0002-2500-6375" @@ -253,12 +259,20 @@ { "name": "Hahn, Kevin S." }, + { + "affiliation": "Charite Universitatsmedizin Berlin, Germany", + "name": "Waller, Lea", + "orcid": "0000-0002-3239-6957" + }, { "name": "Hinds, Oliver P." }, { "name": "Fauber, Bennet" }, + { + "name": "Roberts, Jacob" + }, { "affiliation": "McGill University", "name": "Poline, Jean-Baptiste", @@ -282,6 +296,9 @@ { "name": "Moreno, Miguel Estevan" }, + { + "name": "Hrn\u010diar, Tom\u00e1\u0161" + }, { "name": "Haenel, Valentin" }, @@ -291,9 +308,6 @@ { "name": "Baratz, Zvi" }, - { - "name": "Van, Andrew" - }, { "affiliation": "Hospital for Sick Children", "name": "Darwin, Benjamin C" @@ -329,11 +343,6 @@ "affiliation": "National Technical University of Athens, Greece", "name": "Raktivan, Konstantinos" }, - { - "affiliation": "Charite Universitatsmedizin Berlin, Germany", - "name": "Waller, Lea", - "orcid": "0000-0002-3239-6957" - }, { "name": "Cal\u00e1bkov\u00e1, Mark\u00e9ta" }, @@ -354,9 +363,6 @@ { "name": "Roos, Thomas" }, - { - "name": "Hrn\u010diar, Tom\u00e1\u0161" - }, { "affiliation": "National Institute of Mental Health and Neuro-Sciences, India", "name": "Reddam, Venkateswara Reddy", diff --git a/doc/source/index.rst b/doc/source/index.rst index 4e1821cae8..8eb8a9c7d5 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -117,6 +117,8 @@ contributed code and discussion (in rough order of appearance): * Lea Waller * Tomáš Hrnčiar * Andrew Van +* Jérôme Dockès +* Jacob Roberts License reprise ===============