drigato 0c0c65f69b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas ...

Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php

2014-04-28 14:46:03 -04:00

..

airtime_analyzer

Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer

2014-04-28 14:45:05 -04:00

api_clients

SAAS-404: Separate the Airtime API version from the Airtime version

2014-02-14 16:22:15 -05:00

icecast2

remove \r line endings

2012-10-30 13:23:09 -04:00

media-monitor

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

2013-06-26 01:25:26 -04:00

media-monitor2

CC-5679: Media Monitor: Uploading folder with tracks will erase organize folder itself

2014-01-31 13:20:10 -05:00

monit

monit alerts in saas

2013-04-04 16:30:39 -04:00

pypo

Merge branch '2.5.x' into 2.5.x-saas

2014-03-21 09:46:30 -04:00

python-virtualenv

CC-5328 Fix virtualenv version check for newer distros

2013-09-25 13:03:35 +01: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