sintonia/airtime_mvc/application/controllers
Albert Santoni 3a1141d4c8 Merge branch 'saas' into saas-media-refactor
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
..
plugins Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 2015-02-24 11:18:49 -05:00
upgrade_sql SAAS-596: Store file size and hash in database 2015-02-19 16:27:50 -05:00
ApiController.php Merge branch 'saas' into saas-media-refactor 2015-02-25 13:02:11 -05:00
AudiopreviewController.php Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor 2015-02-24 11:16:44 -05:00
BillingController.php Decouple Billing and S3 cloud storage stuff from Zend 2015-01-26 13:10:10 -05:00
DashboardController.php CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window. 2013-12-16 17:14:00 -05:00
ErrorController.php fix errors reported by Facebook's scheck 2013-05-28 17:45:09 -04:00
IndexController.php CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
LibraryController.php Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer 2015-02-20 11:14:11 -05:00
ListenerstatController.php cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
LocaleController.php Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
LoginController.php Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 2015-02-24 11:18:49 -05:00
PlaylistController.php Changed tabs to spaces 2014-11-07 12:05:29 -05:00
PlayouthistoryController.php cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
PlayouthistorytemplateController.php filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00
PluploadController.php Use more secure random number generation for CSRF auth tokens 2015-02-24 11:13:39 -05:00
PreferenceController.php Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
ProvisioningController.php Cleanup and comments 2015-02-17 12:13:37 -05:00
ScheduleController.php SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful 2015-02-04 15:09:27 -05:00
ShowbuilderController.php Fixed bad merge 2015-02-02 18:04:08 -05:00
SystemstatusController.php CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
UpgradeController.php SAAS-596: Store file size and hash in database 2015-02-19 16:27:50 -05:00
UserController.php Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
UsersettingsController.php
WebstreamController.php SAAS-519: webstreams not being deleted 2014-12-15 12:49:13 -05:00
WhmcsLoginController.php Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist 2014-12-01 16:10:03 -05:00