Skip to content

Commit 2103094

Browse files
robertbeuligmannjzaefferer
authored andcommitted
Merge branch 'master' into menubar
Conflicts: demos/index.html ui/jquery.ui.menu.js
2 parents d654be9 + 025266e commit 2103094

File tree

331 files changed

+34748
-8122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+34748
-8122
lines changed

.editorconfig

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
; This file is for unifying the coding style for different editors and IDEs.
2-
; More information at http://EditorConfig.org
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
33

44
root = true
55

6-
[grunt.js]
7-
indent_style = tab
8-
9-
[ui/**.js]
10-
indent_style = tab
11-
12-
[tests/unit/**.js]
6+
[*]
137
indent_style = tab
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true

AUTHORS.txt

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ A list of current team members is available at http://jqueryui.com/about
44
Paul Bakaus <paul.bakaus@googlemail.com>
55
Richard Worth <rdworth@gmail.com>
66
Yehuda Katz <wycats@gmail.com>
7-
Sean Catchpole <littlecooldude@gmail.com>
7+
Sean Catchpole <sean@sunsean.com>
88
John Resig <jeresig@gmail.com>
9-
Tane Piper <tane@tanepiper.com>
9+
Tane Piper <piper.tane@gmail.com>
1010
Dmitri Gaskin <dmitrig01@gmail.com>
1111
Klaus Hartl <klaus.hartl@googlemail.com>
1212
Stefan Petre <stefan.petre@gmail.com>
1313
Gilles van den Hoven <gilles@webunity.nl>
14-
Micheil Smith <micheil@brandedcode.com>
14+
Micheil Bryan Smith <micheil@brandedcode.com>
1515
Jörn Zaefferer <joern.zaefferer@gmail.com>
1616
Marc Grabanski <m@marcgrabanski.com>
1717
Keith Wood <kbwood.au@gmail.com>
@@ -81,9 +81,9 @@ Khaled AlHourani <me@khaledalhourani.com>
8181
Marian Rudzynski <mr@impaled.org>
8282
Jean-Francois Remy <jfremy@virtuoz.com>
8383
Doug Blood <dougblood@gmail.com>
84-
Filippo Cavallarin <poplix@papuasia.org>
84+
Filippo Cavallarin <filippo.cavallarin@codseq.it>
8585
Heiko Henning <h.henning@educa.ch>
86-
Aliaxandr Rahalevich <saksmlz@gmail.com>
86+
Aliaksandr Rahalevich <saksmlz@gmail.com>
8787
Mario Visic <mario@mariovisic.com>
8888
Xavi Ramirez <xavi.rmz@gmail.com>
8989
Max Schnur <max.schnur@gmail.com>
@@ -92,7 +92,7 @@ Corey Frang <gnarf@gnarf.net>
9292
Aaron Peterson <aaronp123@yahoo.com>
9393
Ivan Peters <ivan@ivanpeters.com>
9494
Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
95-
Marcos Sousa <marcos.sousa@corp.globo.com>
95+
Marcos Sousa <falecomigo@marcossousa.com>
9696
Michael DellaNoce <mdellanoce@mailtrust.com>
9797
George Marshall <echosx@gmail.com>
9898
Tobias Brunner <tobias@strongswan.org>
@@ -114,8 +114,8 @@ Hans Hillen <hans.hillen@gmail.com>
114114
Mark Johnson <virgofx@live.com>
115115
Trey Hunner <treyhunner@gmail.com>
116116
Shane Whittet <whittet@gmail.com>
117-
Edward Faulkner <ef@alum.mit.edu>
118-
Adam Baratz <adam.baratz@gmail.com>
117+
Edward A Faulkner <ef@alum.mit.edu>
118+
Adam Baratz <adam@adambaratz.com>
119119
Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
120120
Eike Send <eike.send@gmail.com>
121121
Kris Borchers <kris.borchers@gmail.com>
@@ -125,27 +125,27 @@ Carson McDonald <carson@ioncannon.net>
125125
Jason Davies <jason@jasondavies.com>
126126
Garrison Locke <gplocke@gmail.com>
127127
David Murdoch <musicisair@yahoo.com>
128-
Ben Boyle <benjamins.boyle@gmail.com>
128+
Benjamin Scott Boyle <benjamins.boyle@gmail.com>
129129
Jesse Baird <jebaird@gmail.com>
130130
Jonathan Vingiano <jvingiano@gmail.com>
131131
Dylan Just <dev@ephox.com>
132-
Tomy Kaira <tomykaira@gmail.com>
132+
Hiroshi Tomita <tomykaira@gmail.com>
133133
Glenn Goodrich <glenn.goodrich@gmail.com>
134-
Ashek Elahi <mail.ashek@gmail.com>
134+
Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
135135
Ryan Neufeld <ryan@neufeldmail.com>
136136
Marc Neuwirth <marc.neuwirth@gmail.com>
137137
Philip Graham <philip.robert.graham@gmail.com>
138138
Benjamin Sterling <benjamin.sterling@kenzomedia.com>
139-
Wesley Walser <wwalser@atlassian.com>
139+
Wesley Walser <waw325@gmail.com>
140140
Kouhei Sutou <kou@clear-code.com>
141-
Karl Kirch <karl.ctr.kirch@faa.gov>
141+
Karl Kirch <karlkrch@gmail.com>
142142
Chris Kelly <ckdake@ckdake.com>
143143
Jay Oster <jay@loyalize.com>
144-
Alex Polomoshnov <alex.polomoshnov@gmail.com>
144+
Alexander Polomoshnov <alex.polomoshnov@gmail.com>
145145
David Leal <dgleal@gmail.com>
146-
igor milla <igor.fsp.milla@gmail.com>
146+
Igor Milla <igor.fsp.milla@gmail.com>
147147
Dave Methvin <dave.methvin@gmail.com>
148-
Florian Gutmann <blackfeet@gmx.at>
148+
Florian Gutmann <f.gutmann@chronimo.com>
149149
Marwan Al Jubeh <marwan.aljubeh@gmail.com>
150150
Milan Broum <midlis@googlemail.com>
151151
Sebastian Sauer <info@dynpages.de>
@@ -157,7 +157,7 @@ David Soms <david.soms@gmail.com>
157157
David De Sloovere <david.desloovere@hotmail.com>
158158
Michael P. Jung <michael.jung@terreon.de>
159159
Shannon Pekary <spekary@gmail.com>
160-
Matthew Hutton <meh@corefiling.co.uk>
160+
Matthew Edward Hutton <meh@corefiling.co.uk>
161161
James Khoury <james@jameskhoury.com>
162162
Rob Loach <robloach@gmail.com>
163163
Alberto Monteiro <betimbrasil@gmail.com>
@@ -168,7 +168,7 @@ Genie <386@mail.com>
168168
Rick Waldron <waldron.rick@gmail.com>
169169
Ian Simpson <spoonlikesham@gmail.com>
170170
Lev Kitsis <spam4lev@gmail.com>
171-
TJ VanToll <tj.vantoll@gmail.com>
171+
Ted VanToll <tj.vantoll@gmail.com>
172172
Justin Domnitz <jdomnitz@gmail.com>
173173
Douglas Cerna <douglascerna@yahoo.com>
174174
Bert ter Heide <bertjh@hotmail.com>
@@ -189,8 +189,22 @@ Eneko Illarramendi <eneko@illarra.com>
189189
EungJun Yi <semtlenori@gmail.com>
190190
Courtland Allen <courtlandallen@gmail.com>
191191
Viktar Varvanovich <non4eg@gmail.com>
192-
Danny Trunk <dtrunk90@googlemail.com>
192+
Danny Trunk <dtrunk90@gmail.com>
193193
Pavel Stetina <pavel.stetina@nangu.tv>
194-
Mike Stay <metaweta@gmail.com>
194+
Michael Stay <metaweta@gmail.com>
195195
Steven Roussey <sroussey@gmail.com>
196-
Mike Hollis <hollis21@gmail.com>
196+
Michael Hollis <hollis21@gmail.com>
197+
Lee Rowlands <lee.rowlands@previousnext.com.au>
198+
Timmy Willison <timmywillisn@gmail.com>
199+
Karl Swedberg <kswedberg@gmail.com>
200+
Baoju Yuan <the_guy_1987@hotmail.com>
201+
Maciej Mroziński <mrozik87@gmail.com>
202+
Luis Dalmolin <luis.nh@gmail.com>
203+
Mark Aaron Shirley <maspwr@gmail.com>
204+
Martin Hoch <martin@fidion.de>
205+
Jiayi Yang <tr870829@gmail.com>
206+
Philipp Benjamin Köppchen <xgxtpbk@gws.ms>
207+
Sindre Sorhus <sindresorhus@gmail.com>
208+
Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
209+
Jared A. Scheel <jared@jaredscheel.com>
210+
Rafael Xavier de Souza <rxaviers@gmail.com>

0 commit comments

Comments
 (0)