Merge branch 'master' into bootstrap4

d8f80bc0 · JC Brand · c4367e7a · 745b8218 · d8f80bc0 · d8f80bc0
Commit d8f80bc0 authored Feb 19, 2018 by JC Brand
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGES.md CHANGES.md +1 -0

src/converse-chatboxes.js src/converse-chatboxes.js +1 -0

No files found.
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## 3.3.4 (Unreleased)

 - Avoid `eval` (via `_.template` from lodash).
+- Bugfix. Avatars weren't being shown.

 ## 3.3.3 (2018-02-14)


--- a/src/converse-chatboxes.js
+++ b/src/converse-chatboxes.js
@@ -96,6 +96,7 @@
            _converse.ChatBox = Backbone.Model.extend({
                defaults: {
                    'type': 'chatbox',
+                    'show_avatar': true,
                    'bookmarked': false,
                    'chat_state': undefined,
                    'num_unread': 0,