sintonia/airtime_mvc/application/controllers
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
..
plugins CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 2013-01-25 11:21:34 -05:00
ApiController.php use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
AudiopreviewController.php cleanup of function names 2013-04-19 20:24:05 -04:00
DashboardController.php clear unused function 2013-04-24 15:17:06 -04:00
ErrorController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00
IndexController.php CC-4090: Make code style PSR compliant 2012-07-15 21:17:13 -04:00
LibraryController.php cleanup of function names 2013-04-19 20:24:05 -04:00
ListenerstatController.php CC-4895: Remove all json die() statements from code 2013-02-07 15:41:47 -05:00
LocaleController.php CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 2013-01-25 11:21:34 -05:00
LoginController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PlaylistController.php CC-3885: Deleted open playlist is not closed until a new item is added to it 2013-02-13 15:44:52 -05:00
PlayouthistoryController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PluploadController.php CC-4895: Remove all json die() statements from code 2013-02-07 15:41:47 -05:00
PreferenceController.php CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
ScheduleController.php Merge branch 'cc-4961-show-linking' 2013-04-29 15:35:16 -04:00
ShowbuilderController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
SystemstatusController.php CC-4993: airtime-check-system reports airtime-liquidsoap as down 2013-03-06 13:43:22 -05:00
UserController.php Merge branch '2.3.x' into devel 2013-03-26 16:34:11 -04:00
UsersettingsController.php CC-4954: Please make Library page remember the status per user 2013-02-19 10:58:48 -05:00
WebstreamController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00