Skip to content

Commit 17ef6a2

Browse files
bradrobertsonbradrobertson
committed
merge conflicts
2 parents 124022c + b799e36 commit 17ef6a2

Some content is hidden

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

65 files changed

+19120
-482
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
build
2+
site
3+
www
4+
builder
5+
jquerytools.github.com
26

37
# patch
48
*.rej

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# 1.2.6
2+
#### Sept 15, 2011
3+
4+
- Fixed animation queue issue when switching tabs in both autoscroll and slideshow plugins [#447](https://github.com/jquerytools/jquerytools/issues/447)
5+
- Native browser validation is now disabled in validator to avoid compatibility issues [#334](https://github.com/jquerytools/jquerytools/issues/334)
6+
- Dateinput now has `beforeChange` event and triggers `change` appropriately [#292](https://github.com/jquerytools/jquerytools/issues/292)
7+
- Tooltip fade bugfix for IE [#363](https://github.com/jquerytools/jquerytools/issues/363)
8+
- Rangeinput vertical position calculations are fixed [#463](https://github.com/jquerytools/jquerytools/issues/463)
9+
- Horizontal accordion works again with smoother animation [#327](https://github.com/jquerytools/jquerytools/issues/327)
10+
- Tabs with history plugin work once again [#261](https://github.com/jquerytools/jquerytools/issues/261)
11+
- Added size parameter back to scrollable [#58](https://github.com/jquerytools/jquerytools/issues/58)
12+
- Dateinput forward/back buttons no longer calculate the wrong date *in some cases* [#476](https://github.com/jquerytools/jquerytools/pull/476)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jQuery Tools is a collection of the most important user-interface components for
66
##Contributing
77

88
Please issue pull requests to the [dev branch](https://github.com/jquerytools/jquerytools/tree/dev).
9+
910
This is where active development takes place, we then merge changes into master for releases. That will become v1.2.6.
1011
Most of the development goes to 2.0 which is currently a private repository.
1112

12-

‎lib/jquery-1.5.min.js‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)