denise 135aadf16b Merge branch '2.2.x' into devel ...

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js

2012-11-02 12:28:21 -04:00

..

airtime-import

cc-4630: Added permission set on permission folder before watching it

2012-11-01 17:01:32 -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

Merged baseUrl related conflicts

2012-10-29 11:56:20 -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

CC-4624: phone_home_stat is broken in Ubuntu 12.10, with php 5.4

2012-10-25 12:25:02 -04:00

airtime-nuke.sh

CC-4114: use liquidsoap shutdown() command to restart liquidsoap

2012-08-20 16:54:01 -04: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-3838: Exception in "airtime-test-stream"

2012-05-16 17:26:18 -04: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-4133: airtime-test-stream does not work with shoutcast streams

2012-07-28 23:21:30 -04: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-4624: phone_home_stat is broken in Ubuntu 12.10, with php 5.4

2012-10-25 12:25:02 -04:00

rabbitmq-update-pid.sh

CC-4356: Improved method of detecting RabbitMQ PID

2012-09-05 15:51:38 -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-4624: phone_home_stat is broken in Ubuntu 12.10, with php 5.4

2012-10-25 12:25:02 -04:00