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

customize.dist/pages.js

@@ -76,7 +76,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v1.19.0 (Tarasque)")
+            h('div.cp-version-footer', "CryptPad v1.20.0 (Unicorn)")
         ]);
     };
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "dependencies": {
     "chainpad-server": "^1.0.1",
     "express": "~4.10.1",

www/contacts/messenger-ui.js

@@ -21,6 +21,14 @@ define([
             // remove potentially malicious elements
             $d.find('script, iframe, object, applet, video, audio').remove();
 
+            // override link clicking, because we're in an iframe
+            $d.find('a').each(function () {
+                var href = $(this).click(function (e) {
+                    e.preventDefault();
+                    window.open(href);
+                }).attr('href');
+            });
+
             // activate media-tags
             $d.find('media-tag').each(function (i, e) { MediaTag(e); });
         } catch (e) {