sintonia/airtime_mvc/application/controllers
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
..
plugins remove unecessary code 2013-01-25 12:32:37 -05:00
ApiController.php Merge branch '2.3.x-saas' into 2.4.x-saas 2013-05-21 16:40:10 -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 CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
ListenerstatController.php CC-4895: Remove all json die() statements from code 2013-02-07 15:41:47 -05:00
LocaleController.php Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
LoginController.php CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32:21 -04:00
PlaylistController.php CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04: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 Merge branch '2.3.x-saas' into 2.4.x-saas 2013-05-21 16:40:10 -04:00
ScheduleController.php Merge branch '2.3.x-saas' into 2.4.x-saas 2013-05-21 16:40:10 -04:00
ShowbuilderController.php IM-629 2013-05-14 19:18:30 -04: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