sintonia/airtime_mvc/application/controllers
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
..
plugins CC-3346: Recorder: Merge recorder with pypo 2012-02-24 14:11:35 -05:00
ApiController.php CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 2012-03-14 14:43:10 -04:00
AudiopreviewController.php CC-3394: Add play button to timeline table. 2012-03-15 17:56:51 -04:00
AuthController.php CC-3110 : Password reset 2011-12-27 14:33:22 -08:00
DashboardController.php CC-3452: Live Stream: DJs assigned to the show and Program Managers should 2012-03-15 14:29:31 -04:00
ErrorController.php CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
IndexController.php CC-3174 : showbuilder 2012-03-15 14:14:02 +01:00
LibraryController.php CC-3174 : showbuilder 2012-03-15 16:11:29 +01:00
LoginController.php CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +01:00
NowplayingController.php CC-3174 : showbuilder 2012-02-27 12:42:04 +01:00
PlaylistController.php CC-3394: Add play button to timeline table. 2012-03-15 17:56:51 -04:00
PlayouthistoryController.php CC-733 : broadcast logs 2012-03-12 11:47:25 +01:00
PluploadController.php CC-3426: apache log errors from plupload 2012-03-14 11:14:22 -04:00
PreferenceController.php CC-3405: Display to users how to connect a live stream to Airtime 2012-03-14 14:43:10 -04:00
ScheduleController.php CC-3427: Live Stream: Ability to switch off Scheduled Play 2012-03-14 14:43:10 -04:00
SearchController.php CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
ShowbuilderController.php CC-3174 : showbuilder 2012-03-15 16:11:29 +01:00
SystemstatusController.php CC-3346: Recorder: Merge recorder with pypo 2012-02-24 14:11:35 -05:00
UserController.php CC-3284: Don't make browser users clear their cache when Airtime is upgraded 2012-02-08 16:21:57 -05:00
UsersettingsController.php CC-3174 : showbuilder 2012-02-23 12:13:00 +01:00