Merge branch 'master' into private-jquery

converse.js

@@ -3085,10 +3085,14 @@
                 return this;
             },
 
-            restore: _.debounce(function (ev) {
+            restore: function(ev) {
                 if (ev && ev.preventDefault) {
                     ev.preventDefault();
                 }
+                this._restore();
+            },
+
+            _restore: _.debounce(function () {
                 this.remove();
                 this.model.maximize();
             }, 200)

docs/source/index.rst

@@ -858,7 +858,7 @@ The map of attributes:
 +----------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | Attribute      |                                                                                                                                      |
 +================+======================================================================================================================================+
-| ask            | If ask === 'subscribe', then we have asked this person to be our chat buddy.                                                         |          
+| ask            | If ask === 'subscribe', then we have asked this person to be our chat buddy.                                                         |
 +----------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | fullname       | The person's full name.                                                                                                              |
 +----------------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -944,7 +944,7 @@ Default:  ``true``
 Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
 the ``Chatrooms`` tab from the control box.
 
-allow_muc
+allow_otr
 ---------
 
 Default:  ``true``
@@ -1033,7 +1033,7 @@ Default:    ``true``
 Determines whether Converse.js will maintain the chat session across page
 loads.
 
-See also: 
+See also:
 
 * `Prebinding and Single Session Support`_
 * `Using prebind in connection with keepalive`_
@@ -1159,7 +1159,7 @@ The ``keepalive`` option caches the ``rid``, ``sid`` and ``jid`` values
 (henceforth referred to as *session tokens*) one receives from a prebinded
 BOSH session, in order to re-use them when the page reloads.
 
-However, if besides setting ``keepalive`` to ``true``, you also set ``prebind`` 
+However, if besides setting ``keepalive`` to ``true``, you also set ``prebind``
 to ``true``, and you pass in valid session tokens to ``converse.initialize``,
 then those passed in session tokens will be used instead of any tokens cached by
 ``keepalive``.

index.html

@@ -207,16 +207,14 @@
                 <div class="row">
                     <div class="col-lg-8 col-lg-offset-2">
                         <h2>Contact</h2>
-                        <p>
-                            <ul class="contact">
-                                <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a>.</li>
-                                <li>Chat with me via XMPP: <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
-                                <li>For technical support, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a>.</li>
-                                <li>Also check out the <a href="http://librelist.com/browser/conversejs" target="_blank">mailing list archives</a>.</li>
-                                <li>Please file <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">bugs on Github</a>.</li>
-                                <li>I'm available for features and <a href="http://opkode.com/contact" target="_blank">consulting</a>.</li>
-                            <ul>
-                        </p>
+                        <ul class="contact">
+                            <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a>.</li>
+                            <li>Chat with me via XMPP: <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
+                            <li>For technical support, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a>.</li>
+                            <li>Also check out the <a href="http://librelist.com/browser/conversejs" target="_blank">mailing list archives</a>.</li>
+                            <li>Please file <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">bugs on Github</a>.</li>
+                            <li>I'm available for features and <a href="http://opkode.com/contact" target="_blank">consulting</a>.</li>
+                        </ul>
                     </div>
                 </div>
             </div>

src/templates/add_contact_form.html

@@ -6,4 +6,4 @@
             placeholder="{{label_contact_username}}"/>
         <button type="submit">{{label_add}}</button>
     </form>
-<li>
+</li>

src/templates/login_panel.html

@@ -5,4 +5,4 @@
     <input type="password" name="password" placeholder="Password">
     <input class="login-submit" type="submit" value="{{label_login}}">
     <span class="conn-feedback"></span>
-</form">
+</form>

src/templates/search_contact.html

@@ -6,4 +6,4 @@
             placeholder="{{label_contact_name}}"/>
         <button type="submit">{{label_search}}</button>
     </form>
-<li>
+</li>