Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py

2012-03-12 17:52:17 -04:00

..

airtime-import

CC-2813: airtime-import: check for root permission

2011-09-13 14:31:14 -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

CC-3346: Recorder: Merge recorder with pypo

2012-02-24 14:11:35 -05: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

CC-3307: airtime-full-install fails on Ubuntu 11.10

2012-02-08 11:42:21 -05: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-3297: Depend on zendframework and php-pear as external packages

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

rabbitmq-update-pid.sh

CC-2978: Install fails on Ubuntu 11.10

2011-11-10 14:42:46 -05: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