Albert Santoni c829b6bf95 Fix bad merge

2014-11-18 18:17:19 -05:00

..

airtime

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

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

formatters

…

tests

…

Auth.php

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-10-22 17:13:42 -04:00

Block.php

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

2013-12-11 17:35:31 -05: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

Corrected japanese locale from ja to ja_JP

2014-09-12 16:29:47 -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

CC-5343: Missing files can be scheduled via playlists

2014-05-30 17:11:12 -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

CC-5709: Airtime Analyzer

2014-03-17 10:19:39 -04:00

Schedule.php

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-10-30 12:15:41 -04:00

Scheduler.php

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

2014-08-15 11:07:26 -04:00

ServiceRegister.php

…

Show.php

Marked old functions for API calls as deprecated

2014-10-27 15:52:58 -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

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

2013-12-13 16:12:26 -05:00

Soundcloud.php

CC-4384: Remove annoying usage of $CC_CONFIG

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

StoredFile.php

Fix bad merge

2014-11-18 18:17:19 -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

CC-5786: Quota Enforcement in the File Upload API

2014-04-14 12:21:59 -04:00

User.php

creating a separate controller for playouthistory templates.

2013-08-28 18:25:46 -04:00

Webstream.php

CC-5672: Webstream warnings on SaaS

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