James 332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/public/js/airtime/schedule/add-show.js		2012-04-05 16:03:15 -04:00
..
buttons	CC-3463 : Usability of timeline	2012-03-23 16:42:08 +01:00
common	CC-3394: Add play button to timeline table.	2012-03-15 17:56:51 -04:00
dashboard	CC-3482: Live Stream: UI Design for Source Stream panel on dashboard	2012-04-03 11:58:48 -04:00
library	CC-3508 : Double Scrollbar in Show Builder menu	2012-04-03 15:19:38 +02:00
login	CC-2814: Login error messages need to be highlighted	2011-09-14 17:50:00 -04:00
nowplaying	CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.	2012-03-29 15:34:58 +02:00
playouthistory	CC-733 : broadcast logs	2012-03-13 16:41:06 +01:00
preferences	CC-3469: Stream settings: Connection URLs are not generated correctly	2012-03-19 16:08:23 -04:00
schedule	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-04-05 16:03:15 -04:00
showbuilder	CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"	2012-04-03 16:11:53 +02:00
status	CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined	2012-02-13 12:24:55 -05:00
user	CC-1977: Allow multiple files to be selected and acted upon in the library and playlist	2012-01-13 14:17:39 -05:00
utilities	CC-733 : broadcast logs	2012-03-12 11:47:25 +01:00