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

www/common/notifications.js

@@ -134,6 +134,7 @@ define([
         };
 
         // if not archived, add handlers
+        if (!content.archived) {
             content.handler = function () {
                 var metadataMgr = common.getMetadataMgr();
                 var priv = metadataMgr.getPrivateData();
@@ -181,7 +182,6 @@ define([
                 });
             };
 
-        if (!content.archived) {
             content.dismissHandler = defaultDismiss(common, data);
         }
     };
@@ -284,5 +284,6 @@ define([
         remove: function (common, data) {
             common.removeFriendRequest(data.hash);
         },
+        allowed: Object.keys(handlers)
     };
 });

www/common/outer/mailbox.js

@@ -343,6 +343,7 @@ proxy.mailboxes = {
                 try {
                     var decrypted = box.encryptor.decrypt(_msg[4]);
                     message = JSON.parse(decrypted.content);
+                    message.author = decrypted.author;
                 } catch (e) {
                     console.log(e);
                 }

www/notifications/app-notifications.less

@@ -105,6 +105,8 @@
                     p {
                         display: inline-block;
                         margin: 1rem 1rem;
+                        flex: 1;
+                        min-width: 0;
                     }
                     .notification-time {
                         margin: 1rem 1rem;

www/notifications/inner.js

@@ -8,6 +8,7 @@ define([
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/common/common-interface.js',
+    '/common/notifications.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -21,7 +22,8 @@ define([
     SFCommon,
     h,
     Messages,
-    UI
+    UI,
+    Notifications
     )
 {
     var APP = {};
@@ -44,7 +46,7 @@ define([
         ],
     };
 
-    var notifsAllowedTypes = ["FRIEND_REQUEST", "FRIEND_REQUEST_ACCEPTED", "FRIEND_REQUEST_DECLINED", "SHARE_PAD", "REQUEST_PAD_ACCESS"];
+    var notifsAllowedTypes = Notifications.allowed;
 
     var create = {};