Martin Konecny f96b990275 Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php

2012-04-12 19:10:17 -04:00

..

install

Merge branch '2.0.x' into devel

2012-04-12 19:10:17 -04:00

liquidsoap_bin @ 492242f4bb

CC-3493: Create submodule git repository for Liquidsoap binaries

2012-03-29 11:31:50 -04:00

liquidsoap_scripts

CC-3566: Preferences->"Fade In" is not respected when Show starts

2012-04-11 13:44:24 -04:00

test

CC-3297: Depend on zendframework and php-pear as external packages

2012-02-06 14:18:03 -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

-fixed on-air light not working.

2011-10-11 13:36:07 +02:00

airtime-playout

CC-3366: Pypo: Use local files instead of downloading them

2012-03-01 18:00:46 -05:00

airtime-playout-init-d

CC-3490: liquidsoap_prepare_terminate.py is not using python virtual env

2012-03-26 15:42:00 -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

logging.cfg

CC-3411: pypo-notify should write to its own log

2012-03-13 16:53:10 -04:00

monit-airtime-liquidsoap.cfg

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

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

monit-airtime-playout.cfg

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

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

pypo-notify.py

-some cases where pypo-notify is still writing to pypo.log instead of notify.log

2012-03-17 14:16:54 -04:00

pypo.cfg

CC-3346: Recorder: Merge recorder with pypo

2012-02-24 14:11:35 -05:00

pypocli.py

-fix errors pointed out by pydev code completion

2012-03-17 14:16:11 -04:00

pypofetch.py

CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")

2012-04-11 19:22:47 -04:00

pypofile.py

-fix errors pointed out by pydev code completion

2012-03-17 14:16:11 -04:00

pypomessagehandler.py

CC-3475: Pypo does not handles the case of RabbitMQ being restarted

2012-04-11 16:12:06 -04:00

pypopush.py

Merge branch '2.0.x' into devel

2012-04-12 19:10:17 -04:00

recorder.py

-fix errors pointed out by pydev code completion

2012-03-17 14:16:11 -04:00