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

2017-07-12 18:56:12 +02:00
parent eda9908c3b 8fb5762eea
commit 575d4612f9
15 changed files with 281 additions and 313 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1662,7 +1662,7 @@ define([
                content: Messages.user_rename
            });
        }
-        if (account && parsed && (!parsed.type || parsed.type !== 'profile')) {
+        if (account) {
            options.push({
                tag: 'a',
                attributes: {'class': 'profile'},