Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/public/js/jplayer
History
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
 		2012-03-12 17:52:17 -04:00
..
happyworm/jPlayer CC-3382: Include jPlayer sources in release tarball for GPL compliance 2012-03-05 16:17:00 -05:00
skin 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
Jplayer.as CC-3382: Include jPlayer sources in release tarball for GPL compliance 2012-03-05 16:17:00 -05:00
Jplayer.fla CC-3382: Include jPlayer sources in release tarball for GPL compliance 2012-03-05 16:17:00 -05:00
Jplayer.swf CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -04:00
jplayer.playlist.min.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
jquery.jplayer.min.js CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -04:00
preview_jplayer.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