sintonia/airtime_mvc/application/controllers
Martin Konecny c398ce930b Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
..
plugins remove unecessary code 2013-01-25 12:32:37 -05:00
ApiController.php Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
AudiopreviewController.php CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on... 2013-01-25 12:44:20 -05:00
DashboardController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05: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-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
ListenerstatController.php Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -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-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -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 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
PreferenceController.php Merge branch '2.3.x' into 2.3.x-saas 2013-02-04 16:22:35 -05:00
ScheduleController.php Merge branch '2.3.x' into 2.3.x-saas 2013-02-04 16:22:35 -05: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 Merge branch 'devel' into 2.3.x-saas 2013-01-15 13:44:44 -05:00
UserController.php CC-4894: Need to filter output for potential XSS exploits 2013-01-29 15:17:29 -05:00
UsersettingsController.php removed benchmarking 2012-09-19 16:36:04 -04:00
WebstreamController.php CC-1960: Internationalize Airtime / Support translations 2012-11-20 11:33:37 -05:00