Skip to content

Commit

Permalink
Merge pull request #11 from fmichonneau/add-citation
Browse files Browse the repository at this point in the history
add citation info
  • Loading branch information
tracykteal authored May 1, 2017
2 parents aad08b2 + 18e938c commit 1c3233a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 1 deletion.
24 changes: 24 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Abigail Cabunoc <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>
Erin Becker <erinstellabecker@gmail.com> ErinBecker <erinstellabecker@gmail.com>
Francois Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
Nick Young <nbay92@gmail.com> <nick.young@auckland.ac.nz>
Raniere Silva <raniere@rgaiacs.com> <raniere@ime.unicamp.br>
Raniere Silva <raniere@rgaiacs.com> <ra092767@ime.unicamp.br>
Rémi Emonet <remi.emonet@reverse--com.heeere> <twitwi@users.noreply.github.com>
Tracy Teal <tracyt@idyll.org> <tkteal@gmail.com>
Tracy Teal <tracyt@idyll.org> <admin@datacarpentry.org>
Laurent Gatto <lg390@cam.ac.uk> Laurent <lg390@cam.ac.uk>
Ben Marwick <benmarwick@gmail.com> <benmarwick@hotmail.com>
Kari L. Jordan <kariljordan@carpentries.org> <kariljordan@me.com>
Francisco Rodriguez-Sanchez <f.rodriguez.sanc@gmail.com>
Christie Bahlai <cbahlai@msu.edu>
Martin Dreyer <amfdrey@gmail.com>
Amy Nurnberger <Nurnberger.Amy@gmail.com>
Jaclyn Saunders <jaclynsaunders@gmail.com>
Karen Cranston <karen.cranston@gmail.com>
Timothée Poisot <tim@poisotlab.io> <timothee.poisot@umontreal.ca>
Christina Koch <christinakconnect@gmail.com>
Geoffrey Boushey <Geoffrey.Boushey@ucsf.edu>
Maneesha Sane <ahseenam@gmail.com>
Saira Kazmi <sairarizkaz@gmail.com>
6 changes: 6 additions & 0 deletions .update-copyright.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[project]
vcs: Git

[files]
authors: yes
files: no
1 change: 1 addition & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"contributors":[{"type":"Editor","name":"Karen Cranston"},{"type":"Editor","name":"Hilmar Lapp"},{"type":"Editor","name":"Tracy Teal"},{"type":"Editor","name":"Ethan White"}],"creators":[{"name":"Greg Wilson"},{"name":"Raniere Silva"},{"name":"Francois Michonneau"},{"name":"Abigail Cabunoc"},{"name":"Tracy Teal"},{"name":"Erin Becker"},{"name":"Rémi Emonet"},{"name":"Piotr Banaszkiewicz"},{"name":"Ethan White"},{"name":"James Allen"},{"name":"Jon Pipitone"},{"name":"Karen Cranston"},{"name":"Maxim Belkin"},{"name":"Michael Hansen"},{"name":"Nick Young"},{"name":"evanwill"},{"name":"Adam Obeng"},{"name":"Bill Mills"},{"name":"Gabriel A. Devenyi"},{"name":"Ian Carroll"},{"name":"Jeffrey W. Hollister"},{"name":"Jonah Duckles"},{"name":"Timothée Poisot"},{"name":"W. Trevor King"}]}
26 changes: 25 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
FIXME: list authors' names and email addresses.
ecology-workshop was written by:
Abigail Cabunoc <abigail.cabunoc@gmail.com>
Adam Obeng <github@binaryeagle.com>
Bill Mills <mills.wj@gmail.com>
Erin Becker <erinstellabecker@gmail.com>
Ethan White <ethan@weecology.org>
Francois Michonneau <francois.michonneau@gmail.com>
Gabriel A. Devenyi <gdevenyi@gmail.com>
Greg Wilson <gvwilson@software-carpentry.org>
Ian Carroll <icarroll@sesync.org>
James Allen <jamesallen0108@gmail.com>
Jeffrey W. Hollister <jeff.w.hollister@gmail.com>
Jon Pipitone <jon.pipitone@utoronto.ca>
Jonah Duckles <jonah@duckles.org>
Karen Cranston <karen.cranston@gmail.com>
Maxim Belkin <maxim-belkin@users.noreply.github.com>
Michael Hansen <hansen.mike@gmail.com>
Nick Young <nbay92@gmail.com>
Piotr Banaszkiewicz <piotr@banaszkiewicz.org>
Raniere Silva <raniere@rgaiacs.com>
Rémi Emonet <remi.emonet@reverse--com.heeere>
Timothée Poisot <tim@poisotlab.io>
Tracy Teal <tracyt@idyll.org>
W. Trevor King <wking@tremily.us>
evanwill <evanpeterw@gmail.com>

0 comments on commit 1c3233a

Please sign in to comment.