Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas ...

Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po

2014-04-25 00:43:22 -04:00

..

airtime

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

2014-04-23 15:58:39 -04:00

formatters

…

tests

…

Auth.php

…

Block.php

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

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

Cache.php

Nerf the APC cache on SaaS

2014-01-29 17:19:24 -05: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

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

2013-05-09 15:53:12 -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-5303: Interface freezes sometimes when using smart blocks

2013-08-13 16:41:32 -04:00

Preference.php

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

2014-04-25 00:43:22 -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 2.5.x-saas

2013-12-17 17:20:38 -05:00

Scheduler.php

Broke unit test for adding content to single show

2014-03-05 14:50:35 -05:00

ServiceRegister.php

…

Show.php

CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange

2013-12-17 17:09:59 -05: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

Remove logging statement

2014-04-17 17:02:14 -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

Remove logging statements

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

User.php

Merge branch 'ryerson-history' into 2.5.x-saas

2013-09-02 15:52:43 -04:00

Webstream.php

CC-5672: Webstream warnings on SaaS

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