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

Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php

2014-11-03 12:29:58 -05:00

..

airtime

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

2014-11-03 12:29:58 -05:00

formatters

…

tests

…

Auth.php

Resolved differences merging 2.5.x into saas

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

Block.php

Permissions fixes for Super Admin users

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

Cache.php

Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways.

2014-08-27 18:51:06 -04:00

Dashboard.php

…

Datatables.php

CC-5629 : Smart Block timestamps aren't saved in UTC time

2013-12-11 17:35:31 -05:00

Email.php

…

Library.php

…

LibraryEditable.php

…

ListenerStat.php

CC-5594 : Remove all date_default_timezone_get()

2013-12-04 15:06:07 -05:00

LiveLog.php

CC-5121: fix some SQL statements not being escaped/prepared

2013-05-09 15:53:12 -04:00

Locale.php

Merge branch '2.5.x' into saas

2014-09-12 16:31:58 -04:00

LoginAttempts.php

CC-5121: fix some SQL statements not being escaped/prepared

2013-05-09 16:05:04 -04:00

MusicDir.php

CC-5709: Airtime Analyzer

2014-03-24 17:14:04 -04:00

Playlist.php

Permissions fixes for Super Admin users

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

Preference.php

Undoing make API on by default for now. This needs to be done in the db

2014-09-19 15:41:55 -04:00

RabbitMq.php

Updated Show model to include show image path

2014-09-16 18:28:39 -04:00

Schedule.php

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

2014-11-03 12:29:58 -05:00

Scheduler.php

CC-5898: Future repeating shows may not get generated and/or filled with content

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

ServiceRegister.php

…

Show.php

Resolved differences merging 2.5.x into saas

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

ShowBuilder.php

CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.

2013-12-11 18:56:19 -05:00

ShowInstance.php

Added accessor function for Show image path

2014-09-17 19:49:22 -04:00

Soundcloud.php

CC-4384: Remove annoying usage of $CC_CONFIG

2013-01-14 16:16:14 -05:00

StoredFile.php

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

2014-11-03 12:29:58 -05:00

StreamSetting.php

CRLF fix

2013-05-10 17:44:50 -04:00

Subjects.php

CRLF fix

2013-05-10 17:44:50 -04:00

Systemstatus.php

Fix user deletion, remove spurious logging

2014-07-08 17:45:22 -04:00

User.php

Fix user deletion, remove spurious logging

2014-07-08 17:45:22 -04:00

Webstream.php

CC-5672: Webstream warnings on SaaS

2014-01-29 12:09:05 -05:00