Albert Santoni d438587ddc Merge branch '2.5.x' into saas ...

Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php

2014-08-25 18:09:51 -04:00

..

airtime

Removed unused function.

2014-08-21 16:40:01 -04:00

formatters

…

tests

…

Auth.php

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

2014-07-15 16:41:29 -04:00

Block.php

Permissions fixes for Super Admin users

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

Cache.php

Disable APC cache clearing on SaaS

2014-07-02 12:49:37 -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

Error checking if a locale isn't installed

2014-07-28 11:35:19 -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

Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas

2014-06-23 10:59:07 -04:00

RabbitMq.php

Added dev env to RabbitMQ stuff for Analyzer (fixed)

2014-04-22 12:28:20 -04:00

Schedule.php

Merge branch '2.5.x' into saas

2014-08-25 18:09:51 -04: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

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

2014-08-15 15:41:55 -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

…

StoredFile.php

Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas

2014-06-23 10:59:07 -04: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