sintonia/airtime_mvc/public/js/airtime/library
Daniel d713f830cd CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
..
events CC-3174 : showbuilder 2012-02-29 15:47:11 +01:00
library.js CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 2012-03-12 10:23:50 -04:00
main_library.js CC-3174 : showbuilder 2012-03-05 18:14:10 +01:00
plupload.js CC-3192: Problem with web uploads for Airtime 2.0.0 beta2 2011-12-14 15:58:26 -05:00
spl.js CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist. 2012-03-09 18:47:08 -05:00