infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
yflory 2019-12-04 10:50:13 +01:00
parent d52acfa5d2 ff67f8381b
commit 69d8b413a6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bower.json
View File

@ -18,7 +18,7 @@
"tests"
],
"dependencies": {
"jquery": "~2.1.3",
"jquery": "2.2.4",
"tweetnacl": "0.12.2",
"components-font-awesome": "^4.6.3",
"ckeditor": "4.7.3",
@ -51,6 +51,7 @@
"requirejs-plugins": "^1.0.3"
},
"resolutions": {
"bootstrap": "^v4.0.0"
"bootstrap": "^v4.0.0",
"jquery": "2.2.4"
}
}

2
www/common/diffMarked.js
View File

@ -84,7 +84,7 @@ define([
var defaultCode = renderer.code;
renderer.code = function (code, language) {
if (language === 'mermaid' && (code.match(/^sequenceDiagram/) || code.match(/^graph/))) {
if (language === 'mermaid' && code.match(/^(graph|pie|gantt|sequenceDiagram|classDiagram|gitGraph)/)) {
return '<pre class="mermaid">'+code+'</pre>';
} else {
return defaultCode.apply(renderer, arguments);