Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
This commit is contained in:
Martin Konecny 2013-03-06 13:47:21 -05:00
commit 43ffa2aece
23 changed files with 394 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View file

@ -71,7 +71,7 @@ function showForIcecast(ele){
div.find("#outputMountpoint-element").show()
div.find("#outputUser-label").show()
div.find("#outputUser-element").show()
div.find("select[id$=data-type]").find("option[value='ogg']").attr("disabled","");
div.find("select[id$=data-type]").find("option[value='ogg']").removeAttr("disabled");
}
function checkLiquidsoapStatus(){