Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into bootstrap4

Browse Source
This commit is contained in:
JC Brand 2018-02-19 22:13:01 +01:00
commit d8f80bc0e6
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -3,6 +3,7 @@
## 3.3.4 (Unreleased) ## 3.3.4 (Unreleased)
- Avoid `eval` (via `_.template` from lodash). - Avoid `eval` (via `_.template` from lodash).
- Bugfix. Avatars weren't being shown.
## 3.3.3 (2018-02-14) ## 3.3.3 (2018-02-14)

1
src/converse-chatboxes.js
View File

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