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

..

plugins

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

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

upgrade_sql/airtime_2.5.3

CC-5781: Upgrade script for new storage quota implementation

2014-04-10 07:12:31 -04:00

ApiController.php

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

2014-04-04 19:48:22 -04:00

AudiopreviewController.php

cleanup of function names

2013-04-19 20:24:05 -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

CC-5709: Airtime Analyzer

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

CC-5638: Shows become unlinked when moving the end time back

2013-12-13 13:06:14 -05:00

LoginController.php

CC-5709: Airtime Analyzer

2014-03-13 11:14:30 -04:00

PlaylistController.php

CC-5172 : errors from setting cues in waveform editor not handled properly

2013-05-23 13:01:38 -04: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

fixing up some datatables queries, propel usage.

2014-04-23 12:53:43 -04:00

PreferenceController.php

Merge branch '2.4.x' into 2.4.x-saas

2013-06-26 01:25:26 -04:00

ScheduleController.php

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

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

ShowbuilderController.php

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

2014-03-12 18:00:01 -04:00

SystemstatusController.php

CC-4993: airtime-check-system reports airtime-liquidsoap as down

2013-03-06 13:43:22 -05:00

UpgradeController.php

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

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

UserController.php

CC-5555 : Implement simple caching for preferences

2013-11-11 16:20:51 -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

CC-1960: Internationalize Airtime / Support translations

2012-11-20 11:33:37 -05:00