Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2019-09-09 17:43:04 +02:00
parent b84c4be69c 26faf72df8
commit d92122347f
11 changed files with 42 additions and 37 deletions
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -126,7 +126,7 @@ define([

        var onMessage = function (data, cb) {
            // data = { type: 'type', content: {msg: 'msg', hash: 'hash'} }
-            console.log(data.type, data.content);
+            console.debug(data.type, data.content);
            pushMessage(data);
            if (data.content && typeof (data.content.getFormatText) == "function") {
                var text = $('<div>').html(data.content.getFormatText()).text();