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

..

airtime-import

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

2011-09-13 14:31:14 -04:00

airtime-check-system

CC-2697: airtime-user script is not working

2011-08-19 17:05:41 -04:00

airtime-check-system-old.php

-CC-2750: Ability to query health status for pypo, liquidsoap,

2011-09-16 21:30:50 -04:00

airtime-check-system.php

CC-3109: Missing properties in airtime check system.

2011-11-28 17:46:52 -05:00

airtime-log

CC-2754: "airtime-log -d" should create the log file in the current directory

2011-09-06 14:08:55 -04: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-update-db-settings

temp comit

2011-07-19 15:06:35 -04: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

serbianLatinToCyrillicConverter.py

CC-2810: More chmnod fixes for scripts

2011-09-16 14:01:23 -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