Commit graph

5 commits

Author SHA1 Message Date
Douwe Maan
603fa7c141 Merge branch 'fix-mermaid-xss' into 'security-10-4'
[10.4] Fix stored XSS in code blocks
2018-02-09 12:13:44 -06:00
Stan Hu
b1261ad942 Fix Mermaid drawings not loading on some browsers
As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the
parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()`
expects to see `startOnLoad` in the `mermaid` hash:

6cd5ffe637/src/mermaid.js (L118)

Closes #42052
2018-01-17 20:12:48 -08:00
Douwe Maan
288b276077 Copy Mermaid graphs as GFM 2018-01-05 15:53:07 +01:00
Phil Hughes
ffd7fbf53b
moved to es6 modules 2017-11-22 18:51:06 +00:00
Vitaliy @blackst0ne Klachkov
131e74d10d Add support of Mermaid 2017-11-22 14:12:04 +11:00