Merge branch '2.1.x' into devel

airtime_mvc/public/js/airtime/preferences/streamsetting.js

@@ -304,4 +304,25 @@ $(document).ready(function() {
             at: "right center"
         },
     })
+    
+    $(".stream_username_help_icon").qtip({
+        content: {
+            text: "If your live streaming client does not ask for a username, this field should be 'source'."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        },
+    })
 });