Merge pull request #142 from lorenzhs/merge

Fix botched merge

index.html

@@ -61,9 +61,6 @@
                       <input type="text" class="form-control monospace" id="port" ng-model="port" placeholder="9001">
                     </div>
 
-                    <label class="control-label" for="password">WeeChat relay password</label>
-                    <input type="password" class="form-control monospace" id="password" ng-model="password" placeholder="Password">
-
                     <div class="checkbox">
                       <label class="control-label" for="savepassword">
                           <input type="checkbox" id="savepassword" ng-model="savepassword">

js/glowingbear.js

@@ -361,8 +361,7 @@ function($rootScope,
     };
 
     var disconnect = function() {
-        /* TODO: Send protocol disconnect */
+        ngWebsockets.send(weeChat.Protocol.formatQuit());
-        ngWebsockets.disconnect();
     };
 
     /*