Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php

2012-02-14 14:47:07 -05:00

..

api_clients

Merge branch '2.0.x' into devel

2012-02-14 14:47:07 -05:00

icecast2

CC-2886: changing file name

2011-09-29 15:45:04 -04:00

media-monitor

Merge branch '2.0.x' into devel

2012-02-14 14:47:07 -05:00

monit

CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)

2011-12-23 15:53:30 -05:00

pypo

CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!

2012-02-14 09:37:20 -05:00

python-virtualenv

CC-3041: Module virtualenv was already imported

2011-11-25 18:02:56 -05:00

show-recorder

-We don't want any of our python services running at install time. Disable them early on.

2012-02-12 11:44:23 -05:00

create-pypo-user.py

CC-2758: Make airtime-install script Debian/Ubuntu compatible

2011-11-01 15:21:09 -04:00

remove-pypo-user.py

-create-pypo-user scripts missing an "import sys"

2011-06-16 17:30:16 -04:00