Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/Block.php airtime_mvc/public/css/styles.css		2012-09-12 15:55:43 -04:00
..
audiopreview	CC-1665: Scheduled stream rebroadcasting and recording	2012-08-17 16:51:23 -04:00
buttons	CC-3463 : Usability of timeline	2012-03-23 16:42:08 +01:00
common	CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track	2012-09-12 15:43:50 -04:00
dashboard	Remove unused function	2012-08-30 16:30:49 -04:00
library	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-12 15:55:43 -04:00
login	CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page	2012-06-20 18:02:46 -04:00
nowplaying	CC-4307: Add "Never show again" to the pop-up registration prompt	2012-08-28 17:30:34 -04:00
playlist	CC-4355: Smart block criteria do not match library columns or metadata editor	2012-09-11 17:18:17 -04:00
playouthistory	CC-3980: Excel export button in Playout History does not really export	2012-06-20 17:42:49 -04:00
preferences	CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication	2012-08-28 16:17:37 -04:00
schedule	Merge branch '2.1.x' into devel	2012-08-08 00:09:13 -04:00
showbuilder	CC-1665: Scheduled stream rebroadcasting and recording	2012-07-26 14:49:32 -04:00
status	don't crash js if a backend service is not running	2012-08-20 17:09:59 -04:00
user	CC-3921: Add mobile phone number field to user record	2012-06-13 13:39:54 -04:00
utilities	CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today	2012-06-08 12:03:23 -04:00