Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Show.php		2012-08-06 17:10:46 -04:00
..
plugins	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
ApiController.php	Merge branch '2.1.x' into devel	2012-08-06 17:10:46 -04:00
AudiopreviewController.php	CC-84: Smart Playlists	2012-08-02 16:36:12 -04:00
DashboardController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
ErrorController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
IndexController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
LibraryController.php	CC-84: Smart Playlists	2012-08-02 16:50:35 -04:00
LoginController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
PlaylistController.php	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-08-02 16:37:12 -04:00
PlayouthistoryController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
PluploadController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
PreferenceController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
ScheduleController.php	re-add getCurrentShowAction	2012-07-26 14:36:21 -04:00
ShowbuilderController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
SystemstatusController.php	CC-4090: Make code style PSR compliant	2012-07-10 18:53:06 -04:00
UserController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
UsersettingsController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
WebstreamController.php	CC-1665: Scheduled stream rebroadcasting and recording	2012-08-03 18:06:47 -04:00