Daniel 5b953443c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/public/js/airtime/showbuilder/builder.js		2012-03-15 18:12:15 -04:00
..
airtime-recorder	…
api	…
audiopreview	CC-3394: Add play button to timeline table.	2012-03-15 17:56:51 -04:00
auth	CC-3110 : Password reset	2011-12-21 16:01:29 -08:00
dashboard	CC-3238: When ICEcast is not on local host, Jplayer is not playing anything	2012-01-11 16:27:14 -05:00
error	…
form	CC-3405: Display to users how to connect a live stream to Airtime	2012-03-14 14:43:10 -04:00
index	…
library	CC-3201 : file import more visible	2012-03-15 11:36:32 +01:00
login	SAAS-155: Add possibility to show additional information on	2012-01-17 14:47:26 -05:00
nowplaying	…
partialviews	CC-3452: Live Stream: DJs assigned to the show and Program Managers should	2012-03-15 14:29:31 -04:00
playlist	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-03-15 18:12:15 -04:00
playouthistory	CC-733 : broadcast logs	2012-03-12 11:47:25 +01:00
plupload	…
preference	CC-3224: "On-the-fly" stream rebroadcasting	2012-03-14 14:41:00 -04:00
recorder	…
schedule	CC-3224: "On-the-fly" stream rebroadcasting	2012-03-14 14:41:00 -04:00
search	…
showbuilder	CC-3403 : Replace Now Playing with the new Timeline screen	2012-03-12 14:23:03 +01:00
systemstatus	…
user	…
menu.phtml	…