Simon Welsh c14d58f585 Merge branch '3.1' ... Conflicts: .travis.yml model/ManyManyList.php model/fieldtypes/DBField.php		2014-07-16 21:24:02 +10:00
..
firebug-lite
greybox
jasmine
jasmine-ajax
jasmine-dom
jasmine-jquery
jasmine-jstd-adapter
javascript-loadimage
javascript-templates
jquery
jquery-cookie	BUGFIX: Fix thirdparty library jquery-cookie referencing $ outside a closure, which wont work in noConflict mode	2012-06-15 01:16:49 +02:00
jquery-effen
jquery-entwine	Re-added entwine src/ in order to use inspector in dev mode	2013-08-30 10:12:50 +02:00
jquery-fileupload
jquery-form
jquery-live-extension
jquery-livequery
jquery-metadata
jquery-query
jquery-selector
jquery-ui	Add zh-CN and zh-TW locale files for jQuery UI datepicker.	2013-02-25 16:54:27 +10:00
jquery-ui-themes/smoothness	Upgraded jQuery UI from 1.9.1 to 1.9.2 (fixes #8062)	2012-12-04 16:05:48 +01:00
jquery-validate	Removed demo folder	2014-04-29 12:51:47 +12:00
jsmin
json-js
jstree	FIX Memory leaks in jstree drag & drop	2013-08-20 16:07:54 +12:00
php-peg
simpletest
spyc
tabstrip	Upgrade jQuery UI to 1.9	2012-11-06 19:45:56 +01:00
tinymce	Upgrading TinyMCE dependency from 3.5.8 to 3.5.11	2014-07-05 15:06:26 +12:00
tinymce_ssbuttons	OEmbed resize on correct attrs (fixes #1950)	2013-05-25 01:26:34 +02:00
tinymce_ssmacron	Create nl.js	2013-02-18 02:20:50 -08:00
tinymce-spellchecker
Zend	Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+	2014-05-24 11:35:19 +10:00
zend_translate_railsyaml
_manifest_exclude