Skip to content

Commit

Permalink
Merge branch 'master' into formcontrols
Browse files Browse the repository at this point in the history
  • Loading branch information
jzaefferer committed Jul 10, 2011
2 parents 3a3bebc + 0245b72 commit b8d15a2
Show file tree
Hide file tree
Showing 639 changed files with 29,461 additions and 13,894 deletions.
2 changes: 1 addition & 1 deletion MIT-LICENSE.txt
@@ -1,4 +1,4 @@
Copyright (c) 2010 Paul Bakaus, http://jqueryui.com/
Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/

This software consists of voluntary contributions made by many
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
Expand Down
17 changes: 17 additions & 0 deletions README.md
Expand Up @@ -7,3 +7,20 @@ If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get s

If you are interested in helping developing jQuery UI, you are in the right place.
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).

For committers
---
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).

Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:

git remote add [username] [his-fork.git] -f

If you want just one commit and edit the commit message:

git cherry-pick -e [sha-of-commit]

If it should go to the stable brach, cherry-pick it to stable:

git checkout 1-8-stable
git cherry-pick -x [sha-of-commit]
272 changes: 175 additions & 97 deletions build/build.xml

Large diffs are not rendered by default.

Binary file removed build/build/google-compiler-20091218.jar
Binary file not shown.
Binary file added build/build/google-compiler-20110320.jar
Binary file not shown.
Binary file added build/build/yuicompressor-2.4.2.jar
Binary file not shown.
79 changes: 79 additions & 0 deletions build/release/changelog-shell
@@ -0,0 +1,79 @@

This file contains a shell for the changelog, followed by a list of every commit for this release.

Choose the appropriate line for the Summary section.

Move all commit notes to the appropriate section.
- Each line should be in the following format:
[Fixed|Added]: The ticket description. ([Ticket link], [Commit link])
- If the commit is not related to a bug or feature, e.g., whitepsace cleanup, remove it.
- If there is no ticket number, search Trac for the relevant ticket.
- If there is no ticket, create one (if needed), or leave just the commit link.

Double check that "XXXX" does not appear anywhere in the changelog.

Post this changelog at: CHANGELOG_URL



DELETE EVERYTHING ABOVE THE FOLLOWING LINE
------------------------------------------

= Summary =
This is the final release of jQuery UI 1.8.
-- OR --
This is the second maintenance release for [[UI/Changelog/1.8|jQuery UI 1.8]].

= Build =

= Core & Utilities =

=== UI Core ===

=== Mouse ===

=== Widget Factory ===

=== Position ===

= Interactions =

=== Draggable ===

=== Droppable ===

=== Resizable ===

=== Selectable ===

=== Sortable ===

= Widgets =

=== Accordion ===

=== Autocomplete ===

=== Button ===

=== Datepicker ===

=== Dialog ===

=== Progressbar ===

=== Slider ===

=== Tabs ===

= Effects =

=== Individual effects ===

= CSS Framework =

= Demos =

= Website =

=== Download Builder ===

0 comments on commit b8d15a2

Please sign in to comment.