sintonia/airtime_mvc/application/controllers
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
..
plugins Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
upgrade_sql 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes 2015-01-15 12:42:36 -05:00
ApiController.php Merge branch '2.5.x' into 2.5.x-installer 2015-01-16 17:27:52 -05:00
AudiopreviewController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
DashboardController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ErrorController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
IndexController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LibraryController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ListenerstatController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LocaleController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
LoginController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PlaylistController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PlayouthistoryController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PlayouthistorytemplateController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PluploadController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
PreferenceController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ScheduleController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
ShowbuilderController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
SystemstatusController.php Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
UpgradeController.php Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
UserController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
UsersettingsController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
WebstreamController.php Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00