Commit Graph

25 Commits

Author SHA1 Message Date
Felix Nagel
dcb28a7c71 Merge branch 'master' into selectmenu 2013-01-10 19:13:54 +01:00
Scott González
83cbf97978 Update copyright year to 2013. 2013-01-10 08:52:20 -05:00
Felix Nagel
dd272e7568 Merge branch 'master' into selectmenu 2012-08-11 19:45:43 +02:00
Scott González
485ca7192a Simplify licensing. 2012-08-09 15:09:50 -04:00
Felix Nagel
5092d0296a Merge branch 'master' into selectmenu 2012-07-12 23:57:55 +02:00
Scott González
a4534bb993 Update copyright to jQuery Foundation. 2012-07-04 09:08:08 -04:00
Felix Nagel
41dfb09aeb Merge branch 'master' into selectmenu 2012-05-14 11:49:44 +02:00
Jo Liss
37dcc3e21d Protect all copyright notices against minification
For instance, this is useful for the jquery-ui-rails gem, which does not
use jQuery UI's own minification, but relies on Rails to minify the
files where necessary. Rails in turn uses UglifyJS for JS and YUI for
CSS, both of which respect the /*! ... */ convention.
2012-04-02 15:21:06 +02:00
Scott González
682a321d1e Merge branch 'master' into selectmenu 2012-03-14 13:42:48 -04:00
Scott González
932fe888c0 Updated copyright year. 2012-03-08 10:53:08 -05:00
Jörn Zaefferer
021243bc9b Merge branch 'master' into selectmenu 2012-01-11 20:00:04 +01:00
Jörn Zaefferer
85348eeebe Menubar/Popup: Remove both to streamline the 1.9 release. Will revert this delete on the menubar branch, while development on master can continue without them. 2012-01-04 16:42:16 +01:00
Felix Nagel
ecd8ea4a1c Selectmenu: basic implementation 2011-09-22 01:34:49 +02:00
Jörn Zaefferer
75408eb08a Menubar and Menu: Cleanup menu styles. Pull out menubar styles from demo into css file. 2011-06-10 19:07:54 +02:00
Scott González
6e0482a9cb Updated copyright year. 2011-01-17 09:13:18 -05:00
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
jzaefferer
f7d8a1ba57 Porting old spinner implementation to 1.8, dropping some baggage. 2010-10-22 06:16:12 +02:00
Scott González
d8caa61be6 All CSS: Added header comments. Fixes #5825 - Add header info to all CSS files. 2010-07-14 15:55:54 -04:00
adam j. sontag
05725e25ae Selectable: Add default CSS for ui-selectable-helper to CSS framework to allow user override. Fixes #5607 - Selectable has helper css hardcoded in JS 2010-05-13 22:35:40 +08:00
jzaefferer
f1c59b09f7 Extracted menu theme from autocomplete file into its own 2010-04-30 09:14: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
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
jzaefferer
7dbf7ecfc1 Copying files from old Googlecode dev branch for tooltip 2010-03-21 22:28:32 +01:00
Richard Worth
828bcdd2f0 fixed #5163 - themes: css files need to be renamed to be consistent with js file renames in 1.8a1 2010-02-16 01:38:23 +00:00