Merge branch 'master' into mockup

converse.js

@@ -697,12 +697,8 @@
                     }, this),
                     $.proxy(function (stanza) {
                         console.log("An error occured while fetching vcard");
-                        if ($(stanza).find('error').attr('code') == '503') {
-                            // If we get service-unavailable, we continue to create
-                            // the user
-                            var jid = $(stanza).attr('from');
-                            this.addContact(jid, jid);
-                        }
+                        var jid = $(stanza).attr('from');
+                        this.addContact(jid, jid);
                     }, this));
                 $('.search-xmpp').hide();
             },
@@ -2235,7 +2231,7 @@
         this.XMPPStatus = Backbone.Model.extend({
             initialize: function () {
                 this.set({
-                    'status' : this.get('status') || 'online',
+                    'status' : this.get('status') || 'online'
                 });
                 this.on('change', $.proxy(function () {
                     if (this.get('fullname') === undefined) {

index.html

@@ -167,7 +167,8 @@
             i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
             prebind: false,
             show_controlbox_by_default: true,
-            xhr_user_search: false
+            xhr_user_search: false,
+            debug: false
         });
     });
 </script>