Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas ...

Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml

2013-12-17 17:20:38 -05:00

..

library

add ability to use id's with mksafe operator

2013-05-21 16:31:32 -04:00

aac.liq

CC-4417: Opus codec support

2013-04-25 18:23:02 -04:00

aacplus.liq

CC-4417: Opus codec support

2013-04-25 18:23:02 -04:00

airtime-liquidsoap.logrotate

CC-2850: Liquidsoap doesn't rotate its log files in Airtime

2011-09-23 12:23:33 -04:00

fdkaac.liq

use he-aac v2 for fdk-aac

2013-06-12 15:31:36 -04:00

generate_liquidsoap_cfg.py

CC-5049:

2013-05-23 17:17:00 -04:00

liquidsoap_auth.py

CC-4910: Need to properly handle non-200 http status codes in api client

2013-02-03 00:40:41 -05:00

liquidsoap_prepare_terminate.py

take liquidsoap by the horns if it misbehaves.

2013-01-27 15:00:56 -05:00

liquidsoap.cfg

CC-3169: Default liquidsoap.cfg file is missing sX_user

2011-12-07 11:31:21 -05:00

ls_lib.liq

CC-5347 : Random Error think to do with updating is scheduled status of a webstream

2013-09-30 15:56:26 -04:00

ls_script.liq

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

2013-09-02 15:46:25 -04:00

mp3.liq

CC-4417: Opus codec support

2013-04-25 18:23:02 -04:00

notify.sh

CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive

2012-08-30 15:58:05 -04:00

ogg.liq

CC-4417: Opus codec support

2013-04-25 18:23:02 -04:00

opus.liq

CC-4417: Opus codec support

2013-04-25 18:23:02 -04:00