sintonia/airtime_mvc/application/controllers
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05: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 CC-4895: Remove all json die() statements from code 2013-01-31 14:06: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 Merge branch '2.3.x' into devel 2013-02-02 21:07:34 -05:00
ListenerstatController.php CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -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-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -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-01-31 14:06:45 -05:00
PreferenceController.php Merge branch '2.3.x' into devel 2013-02-02 21:07:34 -05:00
ScheduleController.php Merge branch '2.3.x' into devel 2013-02-02 21:07:34 -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 'cc-4384-remove-table-calling-with-cc-config' into devel 2013-01-14 16:19:51 -05:00
UserController.php CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -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