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

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-06-14 13:45:14 -04:00
commit 6b990f8712
12 changed files with 74 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -292,7 +292,7 @@ $(document).ready(function() {
$("#auto_transition_help").qtip({
content: {
text: "Check this box to allow automatic transitions between sources. If enabled, Airtime will fallback to the next available source upon current (Master or Show) source failure. The fallback hierarchy is Master Source > Show Source > Scheduled Play."
text: "Check this box to automatically switch off Master/Show source upon source disconnection."
},
hide: {
delay: 500,