Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/models/Playlist.php python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py		2012-07-16 14:31:03 -04:00
..
audiopreview	CC-3968: Cannot preview file as * .MP3	2012-06-12 11:31:10 -04:00
buttons	CC-3463 : Usability of timeline	2012-03-23 16:42:08 +01:00
common	CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud	2012-06-07 11:26:35 -04:00
dashboard	CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts	2012-06-05 11:19:59 -04:00
library	CC-4076: Library: make doubleclick trigger adding files to playlist/timeline	2012-07-05 18:24:07 -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-3842: Next scheduled show gets registered as next scheduled song	2012-05-17 11:23:24 -04:00
playouthistory	CC-3980: Excel export button in Playout History does not really export	2012-06-20 17:42:49 -04:00
preferences	Merge branch '2.1.x' into devel	2012-06-15 15:04:18 -04:00
schedule	Merge branch '2.1.x' into devel	2012-07-16 14:31:03 -04:00
showbuilder	CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking	2012-07-10 13:08:36 -04:00
status	CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor	2012-04-23 17:18:34 -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