aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS.txt15
-rw-r--r--Gruntfile.js57
-rw-r--r--package.json2
4 files changed, 70 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap
index 59afcbc1b..ce694aa17 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,6 +37,7 @@ Filippo Cavallarin <filippo.cavallarin@codseq.it> <poplix@papuasia.org>
Florian Gutmann <f.gutmann@chronimo.com> <blackfeet@gmx.at>
Genie <386@mail.com>
Guntupalli Karunakar <karunakarg@yahoo.com>
+Harri Kilpiö <harri.kilpio@gmail.com>
Heiko Henning <heiko@thehennings.ch> <h.henning@educa.ch>
Hiroshi Tomita <tomykaira@gmail.com>
Ian Simpson <spoonlikesham@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1521874ce..47fbf79b9 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -28,7 +28,7 @@ Chi Cheng <cloudream@gmail.com>
Ca-Phun Ung <pazu2k@gmail.com>
Ariel Flesler <aflesler@gmail.com>
Maggie Wachs <maggie@filamentgroup.com>
-Scott Jehl <scott@scottjehl.com>
+Scott Jehl <scottjehl@gmail.com>
Todd Parker <todd@filamentgroup.com>
Andrew Powell <andrew@shellscape.org>
Brant Burnett <btburnett3@gmail.com>
@@ -52,7 +52,7 @@ Eyal Kobrigo <kobrigo@hotmail.com>
Tiago Freire <tiago.freire@gmail.com>
Diego Tres <diegotres@gmail.com>
Holger Rüprich <holger@rueprich.de>
-Ziling Zhao <zizhao@cisco.com>
+Ziling Zhao <zilingzhao@gmail.com>
Mike Alsup <malsup@gmail.com>
Robson Braga Araujo <robsonbraga@gmail.com>
Pierre-Henri Ausseil <ph.ausseil@gmail.com>
@@ -80,7 +80,7 @@ Kyle Wilkinson <kai@wikyd.org>
Khaled AlHourani <me@khaledalhourani.com>
Marian Rudzynski <mr@impaled.org>
Jean-Francois Remy <jeff@melix.org>
-Doug Blood
+Doug Blood <dougblood@gmail.com>
Filippo Cavallarin <filippo.cavallarin@codseq.it>
Heiko Henning <heiko@thehennings.ch>
Aliaksandr Rahalevich <saksmlz@gmail.com>
@@ -140,7 +140,8 @@ Wesley Walser <waw325@gmail.com>
Kouhei Sutou <kou@clear-code.com>
Karl Kirch <karlkrch@gmail.com>
Chris Kelly <ckdake@ckdake.com>
-Jay Oster <jay@loyalize.com>
+Jason Oster <jay@kodewerx.org>
+Felix Nagel <info@felixnagel.com>
Alexander Polomoshnov <alex.polomoshnov@gmail.com>
David Leal <dgleal@gmail.com>
Igor Milla <igor.fsp.milla@gmail.com>
@@ -150,12 +151,14 @@ Marwan Al Jubeh <marwan.aljubeh@gmail.com>
Milan Broum <midlis@googlemail.com>
Sebastian Sauer <info@dynpages.de>
Gaëtan Muller <m.gaetan89@gmail.com>
+Michel Weimerskirch <michel@weimerskirch.net>
William Griffiths <william@ycymro.com>
Stojce Slavkovski <stojce@gmail.com>
David Soms <david.soms@gmail.com>
David De Sloovere <david.desloovere@outlook.com>
Michael P. Jung <michael.jung@terreon.de>
Shannon Pekary <spekary@gmail.com>
+Dan Wellman <danwellman@hotmail.com>
Matthew Edward Hutton <meh@corefiling.co.uk>
James Khoury <james@jameskhoury.com>
Rob Loach <robloach@gmail.com>
@@ -208,6 +211,7 @@ Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
Jared A. Scheel <jared@jaredscheel.com>
Rafael Xavier de Souza <rxaviers@gmail.com>
John Chen <zhang.z.chen@intel.com>
+Robert Beuligmann <robertbeuligmann@gmail.com>
Dale Kocian <dale.kocian@gmail.com>
Mike Sherov <mike.sherov@gmail.com>
Andrew Couch <andy@couchand.com>
@@ -282,3 +286,6 @@ Will Holley <willholley@gmail.com>
Uri Gilad <antishok@gmail.com>
Richard Gibson <richard.gibson@gmail.com>
Simen Bekkhus <sbekkhus91@gmail.com>
+Chen Eshchar <eshcharc@gmail.com>
+Bruno Pérel <brunoperel@gmail.com>
+Mohammed Alshehri <m@dralshehri.com>
diff --git a/Gruntfile.js b/Gruntfile.js
index 72236561f..241831102 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -305,9 +305,66 @@ grunt.initConfig({
"jquery-2.0.3/MIT-LICENSE.txt": "jquery-2.0.3/MIT-LICENSE.txt"
}
}
+ },
+
+ authors: {
+ prior: [
+ "Paul Bakaus <paul.bakaus@gmail.com>",
+ "Richard Worth <rdworth@gmail.com>",
+ "Yehuda Katz <wycats@gmail.com>",
+ "Sean Catchpole <sean@sunsean.com>",
+ "John Resig <jeresig@gmail.com>",
+ "Tane Piper <piper.tane@gmail.com>",
+ "Dmitri Gaskin <dmitrig01@gmail.com>",
+ "Klaus Hartl <klaus.hartl@gmail.com>",
+ "Stefan Petre <stefan.petre@gmail.com>",
+ "Gilles van den Hoven <gilles@webunity.nl>",
+ "Micheil Bryan Smith <micheil@brandedcode.com>",
+ "Jörn Zaefferer <joern.zaefferer@gmail.com>",
+ "Marc Grabanski <m@marcgrabanski.com>",
+ "Keith Wood <kbwood@iinet.com.au>",
+ "Brandon Aaron <brandon.aaron@gmail.com>",
+ "Scott González <scott.gonzalez@gmail.com>",
+ "Eduardo Lundgren <eduardolundgren@gmail.com>",
+ "Aaron Eisenberger <aaronchi@gmail.com>",
+ "Joan Piedra <theneojp@gmail.com>",
+ "Bruno Basto <b.basto@gmail.com>",
+ "Remy Sharp <remy@leftlogic.com>",
+ "Bohdan Ganicky <bohdan.ganicky@gmail.com>"
+ ]
}
});
+grunt.registerTask( "update-authors", function() {
+ var getAuthors = require( "grunt-git-authors" ),
+ done = this.async();
+
+ getAuthors({
+ priorAuthors: grunt.config( "authors.prior" )
+ }, function( error, authors ) {
+ if ( error ) {
+ grunt.log.error( error );
+ return done( false );
+ }
+
+ authors = authors.map(function( author ) {
+ if ( author.match( /^Jacek Jędrzejewski </ ) ) {
+ return "Jacek Jędrzejewski (http://jacek.jedrzejewski.name)";
+ } else if ( author.match( /^Pawel Maruszczyk </ ) ) {
+ return "Pawel Maruszczyk (http://hrabstwo.net)";
+ } else {
+ return author;
+ }
+ });
+
+ grunt.file.write( "AUTHORS.txt",
+ "Authors ordered by first contribution\n" +
+ "A list of current team members is available at http://jqueryui.com/about\n\n" +
+ authors.join( "\n" ) + "\n" );
+ done();
+ });
+});
+
grunt.registerTask( "default", [ "lint", "test" ]);
grunt.registerTask( "lint", [ "asciilint", "jshint", "jscs", "csslint", "htmllint" ]);
grunt.registerTask( "test", [ "qunit" ]);
diff --git a/package.json b/package.json
index e9fdd1421..75f869ce5 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
"grunt-contrib-qunit": "0.4.0",
"grunt-contrib-uglify": "0.1.1",
"grunt-esformatter": "0.2.0",
- "grunt-git-authors": "1.2.0",
+ "grunt-git-authors": "2.0.0",
"grunt-html": "1.0.0",
"grunt-jscs": "0.6.2",
"load-grunt-tasks": "0.3.0",