Permalink
Browse files

Merge branch 'v1.2.6'

Conflicts:
	src/dateinput/dateinput.js
  • Loading branch information...
2 parents dd43a0f + 17ef6a2 commit 766262d733b22ed221762b1dda8c9e14223ad668 @jarrettv jarrettv committed Oct 14, 2011
Showing with 19,134 additions and 483 deletions.
  1. +4 −0 .gitignore
  2. +12 −0 CHANGELOG.md
  3. +9 −1 README.md
  4. +16 −0 lib/jquery-1.5.min.js
  5. +8,981 −0 lib/jquery-1.6.2.js
  6. +18 −0 lib/jquery-1.6.2.min.js
  7. +93 −57 src/dateinput/dateinput.js
  8. +1 −1 src/overlay/overlay.js
  9. +9 −10 src/rangeinput/rangeinput.js
  10. +27 −12 src/scrollable/scrollable.autoscroll.js
  11. +50 −17 src/scrollable/scrollable.js
  12. +27 −32 src/scrollable/scrollable.navigator.js
  13. +57 −21 src/tabs/tabs.js
  14. +22 −9 src/tabs/tabs.slideshow.js
  15. +129 −129 src/toolbox/toolbox.flashembed.js
  16. +3 −3 src/toolbox/toolbox.history.js
  17. +7 −3 src/tooltip/tooltip.dynamic.js
  18. +26 −11 src/tooltip/tooltip.js
  19. +8 −2 src/validator/validator.js
  20. +20 −2 test/dateinput/customized.htm
  21. +4 −2 test/dateinput/minimal.htm
  22. +67 −0 test/dateinput/open.htm
  23. +1 −1 test/dateinput/setmin.htm
  24. +14 −0 test/dateinput/skin1.css
  25. +4 −2 test/dateinput/tabs.htm
  26. +3 −0 test/form/dateinput.css
  27. +16 −0 test/js/jquery-1.5.min.js
  28. +8,981 −0 test/js/jquery-1.6.2.js
  29. +18 −0 test/js/jquery-1.6.2.min.js
  30. +35 −0 test/overlay/external.htm
  31. +1 −1 test/overlay/index.htm
  32. +21 −0 test/overlay/no-trigger.htm
  33. +1 −0 test/overlay/page.htm
  34. +1 −0 test/overlay/style.css
  35. +1 −0 test/rangeinput/css/multiple.css
  36. +2 −0 test/rangeinput/css/skin1.css
  37. +1 −0 test/rangeinput/css/small.css
  38. +1 −1 test/rangeinput/multiple.htm
  39. +4 −1 test/rangeinput/scrollbar.htm
  40. +1 −1 test/rangeinput/vertical.htm
  41. +2 −1 test/scrollable/autoscroll.html
  42. +5 −8 test/scrollable/index.html
  43. +24 −11 test/scrollable/single.html
  44. +1 −0 test/scrollable/style.css
  45. +7 −5 test/tabs/accordion-horizontal.htm
  46. +1 −0 test/tabs/css/horizontal.css
  47. +1 −0 test/tabs/css/tabs.css
  48. +65 −0 test/tabs/history.htm
  49. +5 −1 test/tabs/index.html
  50. +122 −64 test/tabs/slideshow.htm
  51. +93 −0 test/toolbox/expose.html
  52. +1 −1 test/toolbox/flashembed.htm
  53. +1 −1 test/toolbox/mask/mask.htm
  54. +3 −2 test/tooltip/click.html
  55. +8 −5 test/tooltip/dynamic.html
  56. +6 −5 test/tooltip/index.html
  57. +2 −1 test/tooltip/many.html
  58. +50 −0 test/tooltip/vertical_form.html
  59. +3 −3 test/validator/dateinputs.htm
  60. +3 −45 test/validator/minimal.htm
  61. +1 −1 test/validator/no-form.htm
  62. +4 −4 test/validator/onsubmit.htm
  63. +2 −2 test/validator/radio.htm
  64. +23 −0 test/validator/submit_manually.htm
  65. +5 −4 test/validator/validator.htm
View
@@ -1,4 +1,8 @@
build
+site
+www
+builder
+jquerytools.github.com
# patch
*.rej
View
@@ -0,0 +1,12 @@
+# 1.2.6
+#### Sept 15, 2011
+
+ - Fixed animation queue issue when switching tabs in both autoscroll and slideshow plugins [#447](https://github.com/jquerytools/jquerytools/issues/447)
+ - Native browser validation is now disabled in validator to avoid compatibility issues [#334](https://github.com/jquerytools/jquerytools/issues/334)
+ - Dateinput now has `beforeChange` event and triggers `change` appropriately [#292](https://github.com/jquerytools/jquerytools/issues/292)
+ - Tooltip fade bugfix for IE [#363](https://github.com/jquerytools/jquerytools/issues/363)
+ - Rangeinput vertical position calculations are fixed [#463](https://github.com/jquerytools/jquerytools/issues/463)
+ - Horizontal accordion works again with smoother animation [#327](https://github.com/jquerytools/jquerytools/issues/327)
+ - Tabs with history plugin work once again [#261](https://github.com/jquerytools/jquerytools/issues/261)
+ - Added size parameter back to scrollable [#58](https://github.com/jquerytools/jquerytools/issues/58)
+ - Dateinput forward/back buttons no longer calculate the wrong date *in some cases* [#476](https://github.com/jquerytools/jquerytools/pull/476)
View
@@ -1,4 +1,12 @@
[jQuery Tools](http://flowplayer.org/tools/) - The Missing UI library for the Web
================================
-jQuery Tools is a collection of the most important user-interface components for modern websites. Used by large sites all over the world.
+jQuery Tools is a collection of the most important user-interface components for modern websites. Used by large sites all over the world.
+
+##Contributing
+
+Please issue pull requests to the [dev branch](https://github.com/jquerytools/jquerytools/tree/dev).
+
+This is where active development takes place, we then merge changes into master for releases. That will become v1.2.6.
+Most of the development goes to 2.0 which is currently a private repository.
+
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 766262d

Please sign in to comment.