drigato cf9eabbc74 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/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py

2014-12-03 13:35:32 -05:00

..

plugins

Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer

2014-08-28 12:01:42 -04:00

upgrade_sql

Added NOT NULL to cloud_file foreign key field

2014-11-10 10:55:15 -05:00

ApiController.php

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

2014-12-03 13:35:32 -05:00

AudiopreviewController.php

Replaced spaces with dashes in resource_id generation

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

BillingController.php

Blacklist free products from upgrade page

2014-09-23 16:01:28 -04: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-cloud-storage-saas

2014-11-11 16:30:50 -05:00

ListenerstatController.php

CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)

2014-03-11 13:24:22 -04: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

CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)

2014-03-11 13:24:22 -04: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-496: Create a provisioning controller with a terminate endpoint

2014-11-25 16:04:08 -05:00

ScheduleController.php

Resolved differences merging 2.5.x into saas

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

ShowbuilderController.php

Logging::warning bugfix and updated translations

2014-07-25 15:05:35 -04: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

Permissions fixes for Super Admin users

2014-06-20 17:43:20 -04:00

WhmcsLoginController.php

Fix WHMCS login for multiple users again

2014-07-03 13:05:44 -04:00