drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql

2015-01-23 11:32:45 -05:00

..

plugins

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

2015-01-23 11:32:45 -05:00

upgrade_sql

Upgrade sql was missing the storage_backend column

2014-12-18 18:55:37 -05:00

ApiController.php

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

2015-01-23 11:32:45 -05:00

AudiopreviewController.php

Replaced spaces with dashes in resource_id generation

2014-10-17 17:16:53 -04:00

BillingController.php

Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist

2014-12-01 16:10:03 -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

Logging

2015-01-12 15:58:50 -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

Merged 2.5.x into saas

2014-11-05 17:36:58 -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

Resolved differences merging 2.5.x into saas

2014-10-27 16:25:42 -04:00

PreferenceController.php

Resolved differences merging 2.5.x into saas

2014-10-27 16:25:42 -04:00

ProvisioningController.php

SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix

2015-01-16 11:09:13 -05:00

ScheduleController.php

Resolved differences merging 2.5.x into saas

2014-10-27 16:25:42 -04:00

ShowbuilderController.php

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

2015-01-23 11:32:45 -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

Fixed upgrades

2014-11-04 13:33:20 -05:00

UserController.php

Merged 2.5.x into saas

2014-11-05 17:36:58 -05:00

UsersettingsController.php

CC-4954: Please make Library page remember the status per user

2013-02-19 10:58:48 -05:00

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