Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 1a660a7

Browse files
author
Gabriel Schulhof
committed
Merge branch 'master' into perf
2 parents 7bde263 + 1ddce18 commit 1a660a7

File tree

880 files changed

+33381
-73833
lines changed

Some content is hidden

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

880 files changed

+33381
-73833
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ cache/
77
combined/
88
combine/
99
compiled/
10+
dist/
1011
tmp/
1112
*.swp
1213
.gitignore

.jshintrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"boss": true,
3+
"curly": true,
4+
"eqeqeq": true,
5+
"eqnull": true,
6+
"expr": true,
7+
"immed": true,
8+
"noarg": true,
9+
"onevar": true,
10+
"quotmark": "double",
11+
"smarttabs": true,
12+
"trailing": true,
13+
"undef": true,
14+
"unused": true,
15+
16+
"node": true
17+
}

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: node_js
2+
node_js:
3+
- 0.8
4+
before_script:
5+
- npm install -g grunt-cli
6+
branches:
7+
only:
8+
- master
9+
- 1.3-stable
10+
env:
11+
- JQUERIES=1.8.3
12+
- JQUERIES=1.10.1
13+
- JQUERIES=2.0.2
14+
- JQUERIES=git
15+
notifications:
16+
irc:
17+
channels:
18+
- "chat.freenode.net#jqueryui-dev"

AUTHORS.txt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ Adria Jimenez <[email protected]>
186186
Pavel Savara <[email protected]>
187187
Alexander Casassovici <[email protected]>
188188
Nicholas Hall <[email protected]>
189-
Gabriel Schulhof <[email protected]>
190189
Adrian Pike <[email protected]>
191190
Dirk Heider <[email protected]>
192191
Darío Javier Cravero <[email protected]>
@@ -195,3 +194,23 @@ Corey Frang <[email protected]>
195194
Michael Ridland <[email protected]>
196195
Brian Edgerton <[email protected]>
197196
Marcin Szczepanski <[email protected]>
197+
Robin Helgelin <[email protected]>
198+
Elijah Manor <[email protected]>
199+
Eric Caron <[email protected]>
200+
Jeroen Van Warmerdam <[email protected]>
201+
Ryan McGeary <[email protected]>
202+
Jonah Schulte <[email protected]>
203+
Alexander Schmitz <[email protected]>
204+
Keith Pepin <[email protected]>
205+
Greg Franko <[email protected]>
206+
Jeffrey Lembeck <[email protected]>
207+
Collin Forrester <[email protected]>
208+
Timo Tijhof <[email protected]>
209+
Erwan MAS <[email protected]>
210+
Jordan Harband <[email protected]>
211+
Changsuk Ha <[email protected]>
212+
Oiva Eskola <[email protected]>
213+
Erik Yuzwa <[email protected]>
214+
Jonathan Hogervorst <[email protected]>
215+
Przemyslaw Ciezkowski <[email protected]>
216+
Max Lynch <[email protected]>

CONTRIBUTING.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
## Contribution Guides
2+
3+
In the spirit of open source software development, jQuery always encourages community code contribution. To help you get started and before you jump into writing code, be sure to read these important contribution guidelines thoroughly:
4+
5+
1. [Getting Involved](http://contribute.jquery.org/)
6+
2. [Code Style Guide](http://contribute.jquery.org/style-guide/)
7+
18
## Issues
29

310
If you encounter a bug in the framework you can report it on the issue tracker here on Github. Questions about how to use the framework or problems with your custom code can be posted on the [forum](https://forum.jquery.com/jquery-mobile).
4-
The jQuery Mobile [ThemeRoller](https://github.com/jquery/web-jquery-mobile-theme-roller) and [Download Builder](https://github.com/jquery/jquery-mobile-builder) have their own repo where you can report issues.
11+
The jQuery Mobile [API Documentation](https://github.com/jquery/api.jquerymobile.com), [ThemeRoller](https://github.com/jquery/web-jquery-mobile-theme-roller) and [Download Builder](https://github.com/jquery/jquery-mobile-builder) have their own repo where you can report issues.
512

613
Before opening a new issue please check if the same or a similar issue already has been reported. Tip: Besides the search tool of the issue tracker you can filter issues by label.
714

@@ -26,7 +33,7 @@ It is IMPORTANT that you always provide a test page when submitting an issue!
2633

2734
* What? - Keep the test page as simple as possible. Only include markup/code that is required to reproduce the issue.
2835

29-
* How? - Use our [JS Bin template](http://jsbin.com/onibuc/1/edit) which uses latest code on branch "master". Do not replace the links to the the framework CSS and JavaScript: always test with latest code!
36+
* How? - Use our [JS Bin template](http://jsbin.com/irenuk/1/edit) which uses latest code on branch "master". Do not replace the links to the the framework CSS and JavaScript: always test with latest code!
3037

3138
* You will notice if the issue has been fixed already
3239
* It enables us to edit your code if necessary

0 commit comments

Comments
 (0)