Merge remote-tracking branch 'origin/support' into notifications

www/common/common-ui-elements.js

@@ -1866,6 +1866,13 @@ define([
                 content: h('span', Messages.adminPage || 'Admin')
             });
         }
+        if (padType !== 'support' && accountName) {
+            options.push({
+                tag: 'a',
+                attributes: {'class': 'cp-toolbar-menu-support fa fa-life-ring'},
+                content: h('span', Messages.supportPage || 'Support')
+            });
+        }
         // Add login or logout button depending on the current status
         if (accountName) {
             options.push({
@@ -1961,6 +1968,13 @@ define([
                 window.parent.location = origin+'/settings/';
             }
         });
+        $userAdmin.find('a.cp-toolbar-menu-support').click(function () {
+            if (padType) {
+                window.open(origin+'/support/');
+            } else {
+                window.parent.location = origin+'/support/';
+            }
+        });
         $userAdmin.find('a.cp-toolbar-menu-admin').click(function () {
             if (padType) {
                 window.open(origin+'/admin/');

www/common/outer/mailbox.js

@@ -339,6 +339,7 @@ proxy.mailboxes = {
             if (!req) { return; }
 
             if (type === 'HISTORY_RANGE') {
+                if (!Array.isArray(_msg)) { return; }
                 var message;
                 try {
                     var decrypted = box.encryptor.decrypt(_msg[4]);
@@ -348,6 +349,7 @@ proxy.mailboxes = {
                 }
                 ctx.emit('HISTORY', {
                     txid: txid,
+                    time: _msg[5],
                     message: message,
                     hash: _msg[4].slice(0,64)
                 }, [req.cId]);
@@ -375,7 +377,7 @@ proxy.mailboxes = {
         var network = ctx.store.network;
         network.sendto(network.historyKeeper, JSON.stringify(msg)).then(function () {
         }, function (err) {
-            throw new Error(err);
+            console.error(err);
         });
     };
 

www/common/sframe-common-mailbox.js

@@ -199,6 +199,7 @@ define([
                     type: type,
                     content: {
                         msg: data.message,
+                        time: data.time,
                         hash: data.hash
                     }
                 });