denise 7d8079f770 Merge branch '2.2.x' into devel ...

Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js

2012-10-19 12:50:36 -04:00

..

api_clients

CC-2184: Hardcoded CSS path should be relative path instead

2012-10-19 11:09:34 -04:00

icecast2

CC-2886: changing file name

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

media-monitor

cc-4227

2012-08-20 16:15:14 -04:00

media-monitor2

cc-4556: fixed

2012-10-16 18:35:56 -04:00

monit

CC-3520: Change default password of monit

2012-04-01 00:20:47 -04:00

pypo

CC-4565: Pypopush: Error happens when trying to insert a song right behind a Webstream as well as that Webstream is just finished

2012-10-16 11:59:37 -04:00

python-virtualenv

cc-4237: removed fat depenendancies

2012-08-17 12:57:42 -04:00

std_err_override

CC-3691: Pypo needs to write stderr + stdout to the log file

2012-04-20 19:12:36 -04:00

create-pypo-user.py

CC-3572: pypo user should have shell set to /bin/false

2012-03-31 22:11:12 -04:00

remove-pypo-user.py

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

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