Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas ...

Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py

2013-01-15 13:44:44 -05:00

..

install

CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start

2013-01-08 12:31:14 -05:00

liquidsoap_bin @ 492242f4bb

put apt-get args in correct location

2012-08-03 14:24:39 -04:00

liquidsoap_scripts

SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule

2013-01-10 10:29:57 -05:00

media

moved files to pypo dir

2012-11-14 14:43:33 -05:00

__init__.py

-add support for PyDev code analysis (need to make pypo directory a package)

2012-03-17 13:56:41 -04:00

airtime-liquidsoap

CC-1665: Scheduled stream rebroadcasting and recording

2012-08-17 16:32:26 -04:00

airtime-liquidsoap-init-d

CC-4313Make sure any service can re-create its log file if the file is removed

2012-08-29 11:04:56 -04:00

airtime-playout

easier maintenance of pypo containers on SaaS

2012-10-26 00:03:34 -04:00

airtime-playout-init-d

CC-4114: use liquidsoap shutdown() command to restart liquidsoap

2012-08-18 22:02:15 -04:00

AUTHORS

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

LICENSE

CC-2016: Rearrange python scripts for reusability

2011-03-24 00:00:46 -04:00

listenerstat.py

Merge branch 'devel' into 2.3.x-saas

2013-01-15 13:44:44 -05:00

logging.cfg

CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo

2012-06-28 17:09:41 -04:00

monit-airtime-liquidsoap.cfg

CC-4114: use liquidsoap shutdown() command to restart liquidsoap

2012-08-20 16:54:01 -04:00

monit-airtime-playout.cfg

CC-2888: Create a monit file for each airtime component

2011-09-26 14:40:26 -04:00

notify_logging.cfg

CC-4032: pyponotify.py fails because not all files in

2012-06-28 17:17:36 -04:00

pypo.cfg

CC-3664: setting of pypo.cfg -> cache_for does not take effect

2012-04-17 10:23:15 -04:00

pypocli.py

Merge branch 'devel' into 2.3.x-saas

2013-01-15 13:44:44 -05:00

pypofetch.py

CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start

2013-01-08 15:52:11 -05:00

pypofile.py

CC-4058: Timeline -> Cannot add song twice if last cursor is selected

2012-07-03 17:06:35 -04:00

pypomessagehandler.py

CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine

2012-09-14 19:01:21 -04:00

pyponotify.py

CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule

2012-11-23 16:00:10 -05:00

pypopush.py

CC-4754: Replay gain modifier

2012-12-28 13:58:55 -05:00

recorder.py

cc-4241: Tweaked metadata handling again

2012-09-05 10:59:56 -04:00