4 Commits

Author	SHA1	Message	Date
Tim Almdal	329abfe539	Merge branch 'master' into talmdal_dev	2010-07-11 09:09:52 -07:00
Romain LE DISEZ	39962eaddc	Accept extension .m4v as video/mp4	2010-07-10 08:09:04 -07:00
Tim Almdal	dbf3199e46	Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers ... that create the data to go into a dialog to return the html as part of a json object.	2010-07-06 14:12:01 -07:00
Bharat Mediratta	d82863421d	Rename "simple_uploader" to "flash_uploader" to make room for an HTML ... uploader.	2010-06-20 21:10:22 -07:00