Commit Graph

12 Commits

Author SHA1 Message Date
jzaefferer
0479ab6af6 Merge remote branch 'origin/tooltip'
Conflicts:
	demos/autocomplete/combobox.html
	demos/index.html
	tests/unit/index.html
2010-12-22 18:58:57 +01:00
jzaefferer
3552947c19 Merge remote branch 'origin/menu'
Conflicts:
	demos/autocomplete/categories.html
	demos/autocomplete/combobox.html
	demos/autocomplete/custom-data.html
	demos/autocomplete/default.html
	demos/autocomplete/folding.html
	demos/autocomplete/multiple-remote.html
	demos/autocomplete/multiple.html
	demos/autocomplete/remote-jsonp.html
	demos/autocomplete/remote-with-cache.html
	demos/autocomplete/remote.html
	demos/autocomplete/xml.html
	demos/button/splitbutton.html
	demos/index.html
	tests/visual/menu/nested.html
	themes/base/jquery.ui.autocomplete.css
	ui/jquery.ui.autocomplete.js
2010-12-22 18:31:27 +01:00
Scott González
fce1f97f76 Upgraded jQuery to 1.4.4. 2010-11-12 09:19:26 -05:00
Scott González
19f9c3a559 Upgraded jQuery to 1.4.3. 2010-10-21 22:29:28 -04:00
jzaefferer
17f8079bc2 Menu: Extracted menu code from autocomplete, updated all dependencies 2010-04-21 21:01:08 +02:00
jzaefferer
6204e1a3c4 The accidental merge of tooltip into master was reverted in master, that revert got merged back into tooltip; now reverting that revert to get the tooltip stuff back, should then make it easy to merge into master once tooltip is done 2010-04-08 23:21:47 +02:00
jzaefferer
ab1f806293 crlf mess, round XIIIMD 2010-04-01 10:00:13 +02:00
jzaefferer
00fdd8bcd9 Revert accidental "Merge branch 'tooltip' of github.com:jquery/jquery-ui"
This reverts commit df31e22b95, reversing
changes made to ab8d155217.

Need to revert this revert later on when actually merging the tooltip branch into master.
2010-04-01 09:33:25 +02:00
unknown
b173418cd3 Added tooltip to widgets_in_dialog compound test 2010-03-31 20:18:12 +02:00
jzaefferer
8f680fb347 Widgets in Dialog compound visual test: Added more widgets and linked Slider with Progressbar 2010-03-20 21:51:12 +01:00
jzaefferer
f4fd024cde Compound visual dialog tests: Add some content to the page for better testing 2010-03-20 21:21:02 +01:00
Jörn Zaefferer
e4f8f54607 added new compound test, still incomplete 2010-03-20 14:39:20 +00:00