web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory
2017-11-20 14:17:37 +01:00
parent 80803ad076 78e972201a
commit eb88efd83f
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/pages.js
View File

@@ -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)")
]); ]);
}; };

2
package.json
View File

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

8
www/contacts/messenger-ui.js
View File

@@ -21,6 +21,14 @@ define([
// remove potentially malicious elements // remove potentially malicious elements
$d.find('script, iframe, object, applet, video, audio').remove(); $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 // activate media-tags
$d.find('media-tag').each(function (i, e) { MediaTag(e); }); $d.find('media-tag').each(function (i, e) { MediaTag(e); });
} catch (e) { } catch (e) {