Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas ...

Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout

2013-05-21 16:40:10 -04:00

..

install

CC-5071:

2013-05-08 15:25:30 -04:00

liquidsoap_bin @ 492242f4bb

put apt-get args in correct location

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

liquidsoap_scripts

add ability to use id's with mksafe operator

2013-05-21 16:31:32 -04:00

media

more legible comment

2013-04-25 22:38:06 -04:00

tests

CC-4905: Unit tests for Pypo

2013-01-31 17:45:57 -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

add parameter parsing to airtime-liquidsoap script.

2013-05-15 13:06:16 -04:00

airtime-liquidsoap-init-d

more informative message to user about new init.d script behaviour

2013-05-16 12:08:32 -04:00

airtime-playout

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

2013-05-21 16:40:10 -04:00

airtime-playout-init-d

ensure a proper environment everytime we restart liquidsoap

2013-05-06 12:11:19 -04:00

AUTHORS

fix worst offenders of > 80 character row length

2013-04-25 22:32:27 -04:00

eventtypes.py

CC-1469: Crossfading support (non-equal power)

2013-03-15 15:07:55 -04:00

LICENSE

…

listenerstat.py

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

2013-05-21 16:40:10 -04: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-5042:

2013-04-07 20:19:51 -04:00

monit-airtime-playout.cfg

fix pypo not auto restarting

2013-02-02 08:50:44 -05:00

monit-pre530-airtime-liquidsoap.cfg

CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg

2013-02-28 16:33:59 -05:00

notify_logging.cfg

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

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

pure.py

make up for lack of 'total_seconds()' lib function for pre 2.7 version of python

2013-05-16 12:25:21 -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 '2.3.x-saas' into 2.4.x-saas

2013-05-21 16:40:10 -04:00

pypofetch.py

make up for lack of 'total_seconds()' lib function for pre 2.7 version of python

2013-05-16 12:25:21 -04:00

pypofile.py

cleanup of unecessary code

2013-04-25 22:11:26 -04:00

pypoliqqueue.py

CC-5057: Pypopush error: no attribute 'push_item'

2013-04-22 16:48:52 -04:00

pypoliquidsoap.py

be more idiomatic

2013-05-15 17:18:42 -04:00

pypomessagehandler.py

cleanup of unecessary code

2013-04-25 22:11:26 -04:00

pyponotify.py

fix restart liquidsoap being sent as default no arguments for pypo-notify

2013-01-25 15:14:40 -05:00

pypopush.py

fix incorrect merge

2013-04-26 13:58:44 -04:00

recorder.py

CC-1469: Crossfading support (non-equal power)

2013-03-22 12:16:17 -04:00

telnetliquidsoap.py

implement method stub

2013-05-17 12:16:04 -04:00

testpypoliqqueue.py

CC-1469:

2013-03-14 16:50:55 -04:00