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

..

airtime-import

cc-3573: incorrect function used in airtime-import.py

2012-04-03 13:45:13 -04:00

airtime-check-system

Removed headers about GPL and allow these files to fall under the generic

2012-03-05 17:09:48 -05:00

airtime-check-system.php

Merge branch '2.0.x' into devel

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

airtime-log

Removed headers about GPL and allow these files to fall under the generic

2012-03-05 17:09:48 -05:00

airtime-log.php

Merge branch '2.0.x' into devel

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

airtime-nuke.sh

CC-3265: Move airtime-nuke.sh to utils. Done. Also added user message explaining what the script does and prevent non-root users from executing the script.

2012-02-11 19:27:20 +01:00

airtime-test-soundcard

CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils

2012-02-21 21:38:25 -05:00

airtime-test-soundcard.py

CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils

2012-02-21 21:38:25 -05:00

airtime-test-stream

CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils

2012-02-21 21:38:25 -05:00

airtime-test-stream.py

CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils

2012-02-21 21:38:25 -05:00

airtime-update-db-settings

Removed headers about GPL and allow these files to fall under the generic

2012-03-05 17:09:48 -05:00

airtime-update-db-settings.py

CC-3270: Update "airtime-update-db-settings.py" fails

2012-01-24 17:26:45 -05:00

phone_home_stat

CC-2577: Misleading comment in phone_home_stat..

2011-07-21 16:11:27 -04:00

phone_home_stat.php

CC-3573: Use posix_geteuid instead of "whoami" to detect who is running PHP script

2012-04-02 19:25:27 -04:00

rabbitmq-update-pid.sh

-getting rabbitmq pid should now work for all future Ubuntu versions

2012-03-18 02:21:30 -04:00

rivendell-converter.sh

CC-2760: Remove shebangs from files that don't need them, fix chmod of files

2011-09-06 19:06:13 -04:00

soundcloud-uploader

CC-2591: Allow upload of any audio clip to Soundcloud

2011-09-22 11:47:24 -04:00

soundcloud-uploader.php

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

2012-02-06 14:18:03 -05:00