diff --git a/CHANGELOG.md b/CHANGELOG.md index f5d1bd860..dede59be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,27 +2,66 @@ ## [Unreleased](https://github.com/knsv/mermaid/tree/HEAD) -[Full Changelog](https://github.com/knsv/mermaid/compare/8.1.0...HEAD) +[Full Changelog](https://github.com/knsv/mermaid/compare/8.2.0...HEAD) **Closed issues:** +- Cross-Site Scripting:DOM - Issue [\#847](https://github.com/knsv/mermaid/issues/847) + +## [8.2.0](https://github.com/knsv/mermaid/tree/8.2.0) (2019-07-17) +[Full Changelog](https://github.com/knsv/mermaid/compare/8.1.0...8.2.0) + +**Closed issues:** + +- Create issue templates [\#871](https://github.com/knsv/mermaid/issues/871) +- cross site scripting in mermaid [\#869](https://github.com/knsv/mermaid/issues/869) +- Make Gantt chart date inclusive [\#868](https://github.com/knsv/mermaid/issues/868) +- CHANGELOG missing updates for all versions since 0.4.0 [\#865](https://github.com/knsv/mermaid/issues/865) - please add tag for 8.0.0 release [\#863](https://github.com/knsv/mermaid/issues/863) - classDiagram breaks on any edit [\#858](https://github.com/knsv/mermaid/issues/858) +- found 1 high severity vulnerability [\#839](https://github.com/knsv/mermaid/issues/839) +- Missing fontawesome icon support [\#830](https://github.com/knsv/mermaid/issues/830) +- Docs for integration with wiki.js? [\#829](https://github.com/knsv/mermaid/issues/829) +- Is this project still maintained? [\#826](https://github.com/knsv/mermaid/issues/826) +- typroa [\#823](https://github.com/knsv/mermaid/issues/823) +- Maintain the order of the nodes in Flowchart [\#815](https://github.com/knsv/mermaid/issues/815) +- Overlap, Overflow and cut titles in flowchart [\#814](https://github.com/knsv/mermaid/issues/814) +- How load mermaidApi notejs electron [\#813](https://github.com/knsv/mermaid/issues/813) +- How to set the spacing between the text of the flowchart node and the border? [\#812](https://github.com/knsv/mermaid/issues/812) +- no triming participant name and the name following spaces is as another actor in sequence [\#809](https://github.com/knsv/mermaid/issues/809) +- uml Class as shape type [\#807](https://github.com/knsv/mermaid/issues/807) +- Force-directed graph Layout Style [\#806](https://github.com/knsv/mermaid/issues/806) +- how can I start a newLine in FlowChart [\#805](https://github.com/knsv/mermaid/issues/805) +- UOEProcessShow [\#801](https://github.com/knsv/mermaid/issues/801) +- Why the use of code blocks? [\#799](https://github.com/knsv/mermaid/issues/799) +- fixing class diagram [\#794](https://github.com/knsv/mermaid/issues/794) +- Autonumber support in sequence diagrams [\#782](https://github.com/knsv/mermaid/issues/782) +- MomentJS dependency [\#781](https://github.com/knsv/mermaid/issues/781) +- Feature : Can we color code the flow/arrows [\#766](https://github.com/knsv/mermaid/issues/766) +- Is there any way to convert flowchart.js code to mermaid code [\#726](https://github.com/knsv/mermaid/issues/726) +- Fixed width of nodes [\#653](https://github.com/knsv/mermaid/issues/653) +- Inline comment [\#650](https://github.com/knsv/mermaid/issues/650) +- alt attribute of img tag in HTML [\#619](https://github.com/knsv/mermaid/issues/619) +- Just wanted to say : THANKS ! [\#618](https://github.com/knsv/mermaid/issues/618) +- "animation" [\#446](https://github.com/knsv/mermaid/issues/446) + +**Merged pull requests:** + +- Trimming whitespace after participant id [\#882](https://github.com/knsv/mermaid/pull/882) ([IOrlandoni](https://github.com/IOrlandoni)) +- chore\(deps\): bump atob from 2.0.3 to 2.1.2 [\#881](https://github.com/knsv/mermaid/pull/881) ([dependabot[bot]](https://github.com/apps/dependabot)) +- chore\(deps\): bump fstream from 1.0.11 to 1.0.12 [\#880](https://github.com/knsv/mermaid/pull/880) ([dependabot[bot]](https://github.com/apps/dependabot)) +- chore\(deps\): bump js-yaml from 3.12.0 to 3.13.1 [\#879](https://github.com/knsv/mermaid/pull/879) ([dependabot[bot]](https://github.com/apps/dependabot)) +- I847 cross site scripting [\#878](https://github.com/knsv/mermaid/pull/878) ([knsv](https://github.com/knsv)) +- Bump lodash.mergewith from 4.6.1 to 4.6.2 [\#877](https://github.com/knsv/mermaid/pull/877) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Adding docs into core repo again [\#876](https://github.com/knsv/mermaid/pull/876) ([knsv](https://github.com/knsv)) +- Bump lodash from 4.17.11 to 4.17.13 [\#875](https://github.com/knsv/mermaid/pull/875) ([dependabot[bot]](https://github.com/apps/dependabot)) +- feat\(stale.yml\): update issue label and bot comment [\#874](https://github.com/knsv/mermaid/pull/874) ([ThePenguin1140](https://github.com/ThePenguin1140)) +- Feature/allow inclusive enddates [\#872](https://github.com/knsv/mermaid/pull/872) ([ThePenguin1140](https://github.com/ThePenguin1140)) +- Adding trapezoid and inverse trapezoid vertex options. [\#741](https://github.com/knsv/mermaid/pull/741) ([adamwulf](https://github.com/adamwulf)) ## [8.1.0](https://github.com/knsv/mermaid/tree/8.1.0) (2019-06-25) [Full Changelog](https://github.com/knsv/mermaid/compare/7.0.5...8.1.0) -**Implemented enhancements:** - -- Theme for dark background [\#301](https://github.com/knsv/mermaid/issues/301) -- \[Feature request\] gantt diagram axis format [\#269](https://github.com/knsv/mermaid/issues/269) -- Implement render function for server side rendering using phantomjs [\#169](https://github.com/knsv/mermaid/issues/169) - -**Fixed bugs:** - -- mermaid -v filename.mmd gives You must specify at least one source file. [\#328](https://github.com/knsv/mermaid/issues/328) -- Not Able to See Labels even htmlLabels:false added [\#268](https://github.com/knsv/mermaid/issues/268) - **Closed issues:** - Gantt and sequence diagram do not render [\#853](https://github.com/knsv/mermaid/issues/853) @@ -139,6 +178,7 @@ - Arrows endings are missing [\#419](https://github.com/knsv/mermaid/issues/419) - shouldn't mermaid become more like Markdown ? [\#417](https://github.com/knsv/mermaid/issues/417) - Live editor show rendered diagram if syntax invalid [\#415](https://github.com/knsv/mermaid/issues/415) +- Live editor sticky sidebar [\#414](https://github.com/knsv/mermaid/issues/414) - Linkstyle stroke does not work [\#410](https://github.com/knsv/mermaid/issues/410) - flowchart id's with dots in them .. break links [\#408](https://github.com/knsv/mermaid/issues/408) - Flowchart: Link text beginning with lowercase 'o' causes flowchart to break [\#407](https://github.com/knsv/mermaid/issues/407) @@ -165,6 +205,7 @@ - Tabs & subgraphs cause rendering error [\#336](https://github.com/knsv/mermaid/issues/336) - Display question: right angles [\#335](https://github.com/knsv/mermaid/issues/335) - No Arrows rendered v0.5.8 [\#330](https://github.com/knsv/mermaid/issues/330) +- mermaid -v filename.mmd gives You must specify at least one source file. [\#328](https://github.com/knsv/mermaid/issues/328) - You had errors in your syntax. Use --help for further information. [\#327](https://github.com/knsv/mermaid/issues/327) - Allow alternate arrow syntax that doesn't close html comments [\#322](https://github.com/knsv/mermaid/issues/322) - Comment in subgraph [\#319](https://github.com/knsv/mermaid/issues/319) @@ -174,12 +215,16 @@ - Fix phantomjs2 compatibility [\#304](https://github.com/knsv/mermaid/issues/304) - Flowcharts do not work in native IE11 [\#303](https://github.com/knsv/mermaid/issues/303) - Integration with remark.js - tutorial added [\#302](https://github.com/knsv/mermaid/issues/302) +- Theme for dark background [\#301](https://github.com/knsv/mermaid/issues/301) - Sequence diagram Loops: changing boxMargin spoils the "loop" notation [\#299](https://github.com/knsv/mermaid/issues/299) - src/mermaid.js generates bad code [\#297](https://github.com/knsv/mermaid/issues/297) - Fresh fork: jasmine tests fail [\#294](https://github.com/knsv/mermaid/issues/294) - CSS clash [\#292](https://github.com/knsv/mermaid/issues/292) - Mermaid does not work in Chrome 48 [\#281](https://github.com/knsv/mermaid/issues/281) +- node click is not effective [\#272](https://github.com/knsv/mermaid/issues/272) - circle and ellipse cannot change color by classDef [\#271](https://github.com/knsv/mermaid/issues/271) +- \[Feature request\] gantt diagram axis format [\#269](https://github.com/knsv/mermaid/issues/269) +- Not Able to See Labels even htmlLabels:false added [\#268](https://github.com/knsv/mermaid/issues/268) - npm run watch doesn’t work due missing dependencies [\#266](https://github.com/knsv/mermaid/issues/266) - label out of node [\#262](https://github.com/knsv/mermaid/issues/262) - IE11 Support issue [\#261](https://github.com/knsv/mermaid/issues/261) @@ -189,7 +234,9 @@ - Live editor offline access [\#217](https://github.com/knsv/mermaid/issues/217) - suggest: code highlight mode config for editors [\#212](https://github.com/knsv/mermaid/issues/212) - Uncaught RangeError: Maximum call stack size exceeded [\#189](https://github.com/knsv/mermaid/issues/189) +- Implement render function for server side rendering using phantomjs [\#169](https://github.com/knsv/mermaid/issues/169) - Styling label texts [\#50](https://github.com/knsv/mermaid/issues/50) +- Graphviz DOT syntax [\#5](https://github.com/knsv/mermaid/issues/5) **Merged pull requests:** @@ -210,9 +257,10 @@ - Gantt milestones [\#788](https://github.com/knsv/mermaid/pull/788) ([gijswijs](https://github.com/gijswijs)) - Remove duplicate code [\#768](https://github.com/knsv/mermaid/pull/768) ([znxkznxk1030](https://github.com/znxkznxk1030)) - Render nodes as real links [\#765](https://github.com/knsv/mermaid/pull/765) ([flying-sheep](https://github.com/flying-sheep)) +- Support Multi-line Actor Descriptions [\#764](https://github.com/knsv/mermaid/pull/764) ([watsoncj](https://github.com/watsoncj)) - Fix issue with marker-end. [\#757](https://github.com/knsv/mermaid/pull/757) ([gjlubbertsen](https://github.com/gjlubbertsen)) - Make Class Diagrams usable in Stackedit and Live Editor [\#749](https://github.com/knsv/mermaid/pull/749) ([monsterkrampe](https://github.com/monsterkrampe)) -- Adding trapezoid and inverse trapezoid vertex options. [\#741](https://github.com/knsv/mermaid/pull/741) ([adamwulf](https://github.com/adamwulf)) +- Sequence numbers [\#722](https://github.com/knsv/mermaid/pull/722) ([paulbland](https://github.com/paulbland)) - Add option for right angles [\#721](https://github.com/knsv/mermaid/pull/721) ([paulbland](https://github.com/paulbland)) - Add nested activation classes [\#720](https://github.com/knsv/mermaid/pull/720) ([paulbland](https://github.com/paulbland)) - wip: class diagram cardinality display [\#705](https://github.com/knsv/mermaid/pull/705) ([Vrixyz](https://github.com/Vrixyz)) @@ -273,7 +321,6 @@ **Merged pull requests:** -- Support Multi-line Actor Descriptions [\#764](https://github.com/knsv/mermaid/pull/764) ([watsoncj](https://github.com/watsoncj)) - Update Travis config [\#538](https://github.com/knsv/mermaid/pull/538) ([tylerlong](https://github.com/tylerlong)) - Fix spelling of 'you' in sequenceDiagram docs [\#537](https://github.com/knsv/mermaid/pull/537) ([ctruelson](https://github.com/ctruelson)) - Improve CLI output [\#536](https://github.com/knsv/mermaid/pull/536) ([gibson042](https://github.com/gibson042)) @@ -292,11 +339,6 @@ ## [7.0.0](https://github.com/knsv/mermaid/tree/7.0.0) (2017-01-29) [Full Changelog](https://github.com/knsv/mermaid/compare/6.0.0...7.0.0) -**Implemented enhancements:** - -- npm install -g mermaid does not install phantomjs [\#329](https://github.com/knsv/mermaid/issues/329) -- activation boxes [\#313](https://github.com/knsv/mermaid/issues/313) - **Closed issues:** - demos on io site not working [\#466](https://github.com/knsv/mermaid/issues/466) @@ -311,6 +353,8 @@ - document the use of shebang line in mmd files [\#364](https://github.com/knsv/mermaid/issues/364) - Diagrams are small and unreadable in IE 11 - since 0.5.1 [\#356](https://github.com/knsv/mermaid/issues/356) - \[Feature Request\] ER-Diagram Support [\#354](https://github.com/knsv/mermaid/issues/354) +- npm install -g mermaid does not install phantomjs [\#329](https://github.com/knsv/mermaid/issues/329) +- activation boxes [\#313](https://github.com/knsv/mermaid/issues/313) - The need for mermaid.css should be mentioned explicitly in the intro docs... [\#273](https://github.com/knsv/mermaid/issues/273) **Merged pull requests:** @@ -407,14 +451,6 @@ ## [0.5.6](https://github.com/knsv/mermaid/tree/0.5.6) (2015-11-22) [Full Changelog](https://github.com/knsv/mermaid/compare/0.5.5...0.5.6) -**Implemented enhancements:** - -- Add download SVG link to the live editor [\#144](https://github.com/knsv/mermaid/issues/144) - -**Fixed bugs:** - -- Live Editor: Permalink address not being parsed [\#202](https://github.com/knsv/mermaid/issues/202) - **Closed issues:** - title doesn't work in sequenceDiagram [\#248](https://github.com/knsv/mermaid/issues/248) @@ -424,6 +460,8 @@ - Non-alpha characters included in ALPHA token \(flow graph jison\) [\#232](https://github.com/knsv/mermaid/issues/232) - subgraph not rendering with change to sample [\#231](https://github.com/knsv/mermaid/issues/231) - sequence diagram requires a new line at the end? [\#229](https://github.com/knsv/mermaid/issues/229) +- Live Editor: Permalink address not being parsed [\#202](https://github.com/knsv/mermaid/issues/202) +- Add download SVG link to the live editor [\#144](https://github.com/knsv/mermaid/issues/144) **Merged pull requests:** @@ -454,22 +492,20 @@ ## [0.5.4](https://github.com/knsv/mermaid/tree/0.5.4) (2015-10-19) [Full Changelog](https://github.com/knsv/mermaid/compare/0.5.3...0.5.4) -**Implemented enhancements:** - -- Set log level from mermaid configuration [\#220](https://github.com/knsv/mermaid/issues/220) -- Links in sequence diagrams [\#159](https://github.com/knsv/mermaid/issues/159) -- Add syntax for double headed arrows [\#123](https://github.com/knsv/mermaid/issues/123) - -**Fixed bugs:** - -- comment characters `%%` cause parse error [\#141](https://github.com/knsv/mermaid/issues/141) - **Closed issues:** +- Weird bug in live editor when using words with substring `end` [\#184](https://github.com/knsv/mermaid/issues/184) +- Custom icons [\#15](https://github.com/knsv/mermaid/issues/15) - Marker-end arrow cannot be shown for URL with query parameter [\#225](https://github.com/knsv/mermaid/issues/225) - Please update bower's D3 version [\#221](https://github.com/knsv/mermaid/issues/221) +- Set log level from mermaid configuration [\#220](https://github.com/knsv/mermaid/issues/220) - Width fixed to 400px [\#204](https://github.com/knsv/mermaid/issues/204) - render to png from the cli does not display the marker-end arrow heads [\#181](https://github.com/knsv/mermaid/issues/181) +- Links in sequence diagrams [\#159](https://github.com/knsv/mermaid/issues/159) +- comment characters `%%` cause parse error [\#141](https://github.com/knsv/mermaid/issues/141) +- Add a reversed assymetric shape [\#124](https://github.com/knsv/mermaid/issues/124) +- Add syntax for double headed arrows [\#123](https://github.com/knsv/mermaid/issues/123) +- Support for font-awesome [\#49](https://github.com/knsv/mermaid/issues/49) **Merged pull requests:** @@ -482,13 +518,11 @@ ## [0.5.2](https://github.com/knsv/mermaid/tree/0.5.2) (2015-10-04) [Full Changelog](https://github.com/knsv/mermaid/compare/0.5.1...0.5.2) -**Implemented enhancements:** - -- Support for hyperlink and tooltip [\#34](https://github.com/knsv/mermaid/issues/34) - **Closed issues:** - Installing “atom-mermaid@0.1.3” failed [\#218](https://github.com/knsv/mermaid/issues/218) +- Render mermaid code on websites? [\#215](https://github.com/knsv/mermaid/issues/215) +- Brackets in a node with text? [\#213](https://github.com/knsv/mermaid/issues/213) - node feature request [\#211](https://github.com/knsv/mermaid/issues/211) - Please add prefix for styles [\#208](https://github.com/knsv/mermaid/issues/208) - Bad handling of block arguments [\#207](https://github.com/knsv/mermaid/issues/207) @@ -510,7 +544,9 @@ - Problem wit click event callback [\#174](https://github.com/knsv/mermaid/issues/174) - How to escape characters? [\#170](https://github.com/knsv/mermaid/issues/170) - it can not work [\#167](https://github.com/knsv/mermaid/issues/167) +- UML Class diagram [\#154](https://github.com/knsv/mermaid/issues/154) - Broken subgraph using the CLI [\#153](https://github.com/knsv/mermaid/issues/153) +- Support PlantUML syntax [\#149](https://github.com/knsv/mermaid/issues/149) - IE Support issue [\#142](https://github.com/knsv/mermaid/issues/142) - Flowchart truncated [\#140](https://github.com/knsv/mermaid/issues/140) - Double Quote as text is not working [\#219](https://github.com/knsv/mermaid/issues/219) @@ -522,6 +558,7 @@ - IE9 issue [\#179](https://github.com/knsv/mermaid/issues/179) - inoperable in an AMD/requirejs environment: IPython Notebook [\#127](https://github.com/knsv/mermaid/issues/127) - \[Parser\] Hyphen in participant name bring TypeError [\#74](https://github.com/knsv/mermaid/issues/74) +- Support for hyperlink and tooltip [\#34](https://github.com/knsv/mermaid/issues/34) **Merged pull requests:** @@ -534,18 +571,6 @@ ## [0.5.1](https://github.com/knsv/mermaid/tree/0.5.1) (2015-06-21) [Full Changelog](https://github.com/knsv/mermaid/compare/0.5.0...0.5.1) -**Implemented enhancements:** - -- To SVG Export [\#146](https://github.com/knsv/mermaid/issues/146) -- Possibility to set the width of the generated flowchart [\#129](https://github.com/knsv/mermaid/issues/129) -- Special characters break parsing [\#54](https://github.com/knsv/mermaid/issues/54) -- Responsive graph layout for mobile viewers [\#51](https://github.com/knsv/mermaid/issues/51) -- Styling connector lines [\#31](https://github.com/knsv/mermaid/issues/31) - -**Fixed bugs:** - -- flowchart - styling of edges via css overrides specific styles set in the graph definition [\#128](https://github.com/knsv/mermaid/issues/128) - **Closed issues:** - Live editor is broken [\#173](https://github.com/knsv/mermaid/issues/173) @@ -558,10 +583,17 @@ - How to center align gantt diagram [\#150](https://github.com/knsv/mermaid/issues/150) - Security concern regarding class definition [\#148](https://github.com/knsv/mermaid/issues/148) - File Extension [\#147](https://github.com/knsv/mermaid/issues/147) +- To SVG Export [\#146](https://github.com/knsv/mermaid/issues/146) - `setTimeout` with clusters problematic with programmatic edits and no callback [\#133](https://github.com/knsv/mermaid/issues/133) +- Possibility to set the width of the generated flowchart [\#129](https://github.com/knsv/mermaid/issues/129) +- flowchart - styling of edges via css overrides specific styles set in the graph definition [\#128](https://github.com/knsv/mermaid/issues/128) - module.exports.cloneCssStyles\(\) in combination with Angularjs breaks display in Chrome and IE [\#126](https://github.com/knsv/mermaid/issues/126) - Gantt - suitable xAxis for longer project [\#125](https://github.com/knsv/mermaid/issues/125) +- Mix horizontal and vertical graph [\#68](https://github.com/knsv/mermaid/issues/68) - How to get started with this project ? [\#64](https://github.com/knsv/mermaid/issues/64) +- Special characters break parsing [\#54](https://github.com/knsv/mermaid/issues/54) +- Responsive graph layout for mobile viewers [\#51](https://github.com/knsv/mermaid/issues/51) +- Styling connector lines [\#31](https://github.com/knsv/mermaid/issues/31) **Merged pull requests:** @@ -570,14 +602,10 @@ ## [0.5.0](https://github.com/knsv/mermaid/tree/0.5.0) (2015-06-07) [Full Changelog](https://github.com/knsv/mermaid/compare/0.4.0...0.5.0) -**Implemented enhancements:** - -- Add a css file, mermaid.css, with default styling [\#122](https://github.com/knsv/mermaid/issues/122) -- software architecture diagram [\#36](https://github.com/knsv/mermaid/issues/36) -- Support for bar charts and pie diagrams [\#22](https://github.com/knsv/mermaid/issues/22) - **Closed issues:** +- it can not work where graph TD contains chinese character [\#166](https://github.com/knsv/mermaid/issues/166) +- Broken Examples [\#163](https://github.com/knsv/mermaid/issues/163) - uglifyjs wanrings which means we can improve the code [\#156](https://github.com/knsv/mermaid/issues/156) - New\(er\) features unavailable in downloadable js files? [\#151](https://github.com/knsv/mermaid/issues/151) - Add gh-gapes link to description [\#143](https://github.com/knsv/mermaid/issues/143) @@ -585,10 +613,13 @@ - tags ending in a "v" don't render [\#132](https://github.com/knsv/mermaid/issues/132) - Links in flowchart [\#131](https://github.com/knsv/mermaid/issues/131) - Using the library for iOS development [\#130](https://github.com/knsv/mermaid/issues/130) +- Add a css file, mermaid.css, with default styling [\#122](https://github.com/knsv/mermaid/issues/122) - Add capability for gantt diagrams [\#118](https://github.com/knsv/mermaid/issues/118) - lower case v causes error in the parser [\#108](https://github.com/knsv/mermaid/issues/108) - Label's css conflict with boostrap's .label [\#67](https://github.com/knsv/mermaid/issues/67) - TypeError: Cannot read property 'layout' of undefined [\#37](https://github.com/knsv/mermaid/issues/37) +- software architecture diagram [\#36](https://github.com/knsv/mermaid/issues/36) +- Support for bar charts and pie diagrams [\#22](https://github.com/knsv/mermaid/issues/22) **Merged pull requests:** @@ -605,20 +636,14 @@ ## [0.4.0](https://github.com/knsv/mermaid/tree/0.4.0) (2015-03-01) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.5...0.4.0) -**Implemented enhancements:** - -- Assymetric shapes not documented [\#82](https://github.com/knsv/mermaid/issues/82) -- Improve arrows [\#3](https://github.com/knsv/mermaid/issues/3) - -**Fixed bugs:** - -- NoModificationAllowedError [\#23](https://github.com/knsv/mermaid/issues/23) - **Closed issues:** - subgraph background is black in rendered flowchart PNG via CLI [\#121](https://github.com/knsv/mermaid/issues/121) - Integrate editor at https://github.com/naseer/mermaid-webapp [\#110](https://github.com/knsv/mermaid/issues/110) - Internet Explorer Support [\#99](https://github.com/knsv/mermaid/issues/99) +- Assymetric shapes not documented [\#82](https://github.com/knsv/mermaid/issues/82) +- NoModificationAllowedError [\#23](https://github.com/knsv/mermaid/issues/23) +- Improve arrows [\#3](https://github.com/knsv/mermaid/issues/3) ## [0.3.5](https://github.com/knsv/mermaid/tree/0.3.5) (2015-02-15) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.4...0.3.5) @@ -626,12 +651,6 @@ ## [0.3.4](https://github.com/knsv/mermaid/tree/0.3.4) (2015-02-15) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.3...0.3.4) -**Implemented enhancements:** - -- Apply styling from css when using the CLI utility [\#85](https://github.com/knsv/mermaid/issues/85) -- Generated SVG works poorly outside web browsers [\#58](https://github.com/knsv/mermaid/issues/58) -- Generating SVG text blob for use in Node [\#2](https://github.com/knsv/mermaid/issues/2) - **Closed issues:** - Subgraph syntax bug? [\#120](https://github.com/knsv/mermaid/issues/120) @@ -644,7 +663,10 @@ - Error when rendering A-- This is the text -- B [\#102](https://github.com/knsv/mermaid/issues/102) - Clipping in documentation [\#97](https://github.com/knsv/mermaid/issues/97) - isolate class styling to the svg container [\#92](https://github.com/knsv/mermaid/issues/92) +- Apply styling from css when using the CLI utility [\#85](https://github.com/knsv/mermaid/issues/85) +- Generated SVG works poorly outside web browsers [\#58](https://github.com/knsv/mermaid/issues/58) - Make the new graph declaration more visual [\#40](https://github.com/knsv/mermaid/issues/40) +- Generating SVG text blob for use in Node [\#2](https://github.com/knsv/mermaid/issues/2) **Merged pull requests:** @@ -656,14 +678,11 @@ ## [0.3.3](https://github.com/knsv/mermaid/tree/0.3.3) (2015-01-25) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.2...0.3.3) -**Implemented enhancements:** - -- Support for dotted links [\#26](https://github.com/knsv/mermaid/issues/26) - **Closed issues:** - Missing arrows in sequence diagram [\#98](https://github.com/knsv/mermaid/issues/98) - Error with \>9 linkStyles [\#95](https://github.com/knsv/mermaid/issues/95) +- Support for dotted links [\#26](https://github.com/knsv/mermaid/issues/26) **Merged pull requests:** @@ -676,16 +695,13 @@ ## [0.3.2](https://github.com/knsv/mermaid/tree/0.3.2) (2015-01-11) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.1...0.3.2) -**Implemented enhancements:** - -- Make link text look like it is on the line [\#53](https://github.com/knsv/mermaid/issues/53) - **Closed issues:** - disable auto render [\#91](https://github.com/knsv/mermaid/issues/91) - Tidy breaks mermaid \(linebreaks in \\) [\#87](https://github.com/knsv/mermaid/issues/87) - Bug: \ being rendered as text in node [\#73](https://github.com/knsv/mermaid/issues/73) - Graph edges appear to render outside of the canvas [\#70](https://github.com/knsv/mermaid/issues/70) +- Make link text look like it is on the line [\#53](https://github.com/knsv/mermaid/issues/53) **Merged pull requests:** @@ -698,16 +714,14 @@ ## [0.3.1](https://github.com/knsv/mermaid/tree/0.3.1) (2015-01-05) [Full Changelog](https://github.com/knsv/mermaid/compare/0.3.0...0.3.1) -**Implemented enhancements:** - -- Support for sequence diagrams [\#16](https://github.com/knsv/mermaid/issues/16) -- Client utility for mermaid [\#6](https://github.com/knsv/mermaid/issues/6) - **Closed issues:** - Non ASCII chars in labels [\#84](https://github.com/knsv/mermaid/issues/84) - 'undefined' titles of Quicklinks on the usage page [\#80](https://github.com/knsv/mermaid/issues/80) - \[cli\] Enhancement proposal: not fail --version / --help if phantomjs isn't installed [\#71](https://github.com/knsv/mermaid/issues/71) +- Neural Networks [\#39](https://github.com/knsv/mermaid/issues/39) +- Support for sequence diagrams [\#16](https://github.com/knsv/mermaid/issues/16) +- Client utility for mermaid [\#6](https://github.com/knsv/mermaid/issues/6) **Merged pull requests:** @@ -720,18 +734,14 @@ ## [0.3.0](https://github.com/knsv/mermaid/tree/0.3.0) (2014-12-22) [Full Changelog](https://github.com/knsv/mermaid/compare/0.2.16...0.3.0) -**Implemented enhancements:** - -- How do I do comments? [\#47](https://github.com/knsv/mermaid/issues/47) -- Improve readability with new line as terminator and whitespace [\#38](https://github.com/knsv/mermaid/issues/38) - -**Fixed bugs:** - -- This characters failed the lexical parsing [\#46](https://github.com/knsv/mermaid/issues/46) - **Closed issues:** +- Consider shipping a standalone executable [\#65](https://github.com/knsv/mermaid/issues/65) - Trailing whitespace at the end of lines is not ignored [\#55](https://github.com/knsv/mermaid/issues/55) +- How do I do comments? [\#47](https://github.com/knsv/mermaid/issues/47) +- This characters failed the lexical parsing [\#46](https://github.com/knsv/mermaid/issues/46) +- tutorial for creating new type of graph/layout [\#44](https://github.com/knsv/mermaid/issues/44) +- Improve readability with new line as terminator and whitespace [\#38](https://github.com/knsv/mermaid/issues/38) - Use classes instead of inline style for easy styling [\#24](https://github.com/knsv/mermaid/issues/24) **Merged pull requests:** @@ -742,18 +752,16 @@ ## [0.2.16](https://github.com/knsv/mermaid/tree/0.2.16) (2014-12-15) [Full Changelog](https://github.com/knsv/mermaid/compare/0.2.15...0.2.16) -**Fixed bugs:** - -- Lines routed outside visible area [\#19](https://github.com/knsv/mermaid/issues/19) - **Closed issues:** - Mermaid not rendering properly on Wordpress pages [\#59](https://github.com/knsv/mermaid/issues/59) - Improve example page with live demo [\#52](https://github.com/knsv/mermaid/issues/52) +- Create image file via CLI? [\#48](https://github.com/knsv/mermaid/issues/48) - Does not render upon AngularJS Updates [\#45](https://github.com/knsv/mermaid/issues/45) - Download link in README.MD doesn't work. [\#42](https://github.com/knsv/mermaid/issues/42) - linkStyle usage is not obvious [\#41](https://github.com/knsv/mermaid/issues/41) - Move \*.spec.js in src/ to test/ [\#35](https://github.com/knsv/mermaid/issues/35) +- Lines routed outside visible area [\#19](https://github.com/knsv/mermaid/issues/19) **Merged pull requests:** @@ -767,16 +775,13 @@ ## [0.2.15](https://github.com/knsv/mermaid/tree/0.2.15) (2014-12-05) [Full Changelog](https://github.com/knsv/mermaid/compare/0.2.14...0.2.15) -**Fixed bugs:** - -- Error with some characters [\#25](https://github.com/knsv/mermaid/issues/25) -- Cap-cased words break parser [\#8](https://github.com/knsv/mermaid/issues/8) - **Closed issues:** - Question marks don't render properly with /dist/mermaid.full.min.js [\#30](https://github.com/knsv/mermaid/issues/30) +- Error with some characters [\#25](https://github.com/knsv/mermaid/issues/25) - Provide parse function in browser widthout `require`? [\#21](https://github.com/knsv/mermaid/issues/21) - Better label text support [\#18](https://github.com/knsv/mermaid/issues/18) +- Cap-cased words break parser [\#8](https://github.com/knsv/mermaid/issues/8) **Merged pull requests:** @@ -789,16 +794,15 @@ ## [0.2.13](https://github.com/knsv/mermaid/tree/0.2.13) (2014-12-03) [Full Changelog](https://github.com/knsv/mermaid/compare/0.2.10...0.2.13) -**Implemented enhancements:** - -- Publish to NPM [\#7](https://github.com/knsv/mermaid/issues/7) - **Closed issues:** - modified init to be applied more than once [\#29](https://github.com/knsv/mermaid/issues/29) - Wanted to know build process for the project. [\#28](https://github.com/knsv/mermaid/issues/28) +- Container support [\#27](https://github.com/knsv/mermaid/issues/27) - can not support Chinese description [\#20](https://github.com/knsv/mermaid/issues/20) +- Node Label text mistaken for Direction [\#17](https://github.com/knsv/mermaid/issues/17) - Support unicode chars in labels [\#9](https://github.com/knsv/mermaid/issues/9) +- Publish to NPM [\#7](https://github.com/knsv/mermaid/issues/7) ## [0.2.10](https://github.com/knsv/mermaid/tree/0.2.10) (2014-12-01) [Full Changelog](https://github.com/knsv/mermaid/compare/0.2.9...0.2.10) diff --git a/README.md b/README.md index 6f99dd3f7..6f3622ddd 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,23 @@ # mermaid +## Special note regarding version 8.2 + +In version 8.2 a security improvement was introduced. A securityLevel configuration was introduced which sets the level of trust to be used on the parsed diagrams. + +* **`strict`**: (default) tags in text are encoded, click functionality is disabled +* `loose`: tags in text are allowed, click functionality is enabledClosed issues: + +⚠️ **Note** : This changes the default behaviour of mermaid so that after upgrade to 8.2, if the securityLevel is not configured, tags in flowcharts are encoded as tags and clicking is prohibited. + +If your application is taking resposibility for the diagram source security you can set the securityLevel accordingly. By doing this clicks and tags are again allowed. + +```javascript + mermaidAPI.initialize({ + securityLevel: 'loose' + }); +``` + **🖖 Keep a steady pulse: mermaid needs more Collaborators [#866](https://github.com/knsv/mermaid/issues/866)** ![banner](./img/header.png) diff --git a/dist/index.html b/dist/index.html index 22c956d77..d33127fe2 100644 --- a/dist/index.html +++ b/dist/index.html @@ -5,6 +5,12 @@ Mermaid Quick Test Page +
@@ -127,7 +133,7 @@
graph TD A[Christmas] -->|Get money| B(Go shopping) - B --> C{Let me thinksssss
ssssssssssssssssssssss
sssssssssssssssssssssssssss} + B --> C{Let me thinksssssx
sssssssssssssssssssuuu
tttsssssssssssssssssssssss} C -->|One| D[Laptop] C -->|Two| E[iPhone] C -->|Three| F[Car] diff --git a/dist/xssi.html b/dist/xssi.html index df853a0a4..1ab21073c 100644 --- a/dist/xssi.html +++ b/dist/xssi.html @@ -10,16 +10,30 @@ alert(x + ' cause an xss attack'); } +
- gantt - title Exclusive end dates If bold then xss (Manual date should end on 3d) - dateFormat YYYY-MM-DD - axisFormat %d - section Section1 - 2 Days: 1, 2019-01-01,2d - Manual Date: 2, 2019-01-01,2019-01-03 + info +
+
+ graph LR; + alert`xss`-->B; + click B "javaSc +ript:alert`salt`" "This is a tooltip for a link" +
+
+ graph LR; + alert`xss`-->B; + click B "java +script:alert`xss`" "This is a tooltip for a link" +
+
+ graph LR; + alert`base64`-->B; + click B "data:image/png;base64,HNjcmlwdD5hbGVydCgiSGVsbG8iKTs8L3NjcmlwdD4="
@@ -38,17 +52,61 @@ graph TB
graph TD -A[Christmas] -->|Get money| B(Go shopping) -B --> C{Let me think} +A[Click on] -->|Get happines| BBBB(Clickable) +BBBB --> C{Let me think} C -->|One| D[Laptop] C -->|Two| E[iPhone] C -->|Three| F[Car] -click A "index.html#link-clicked" "link test" -click B testClick "click test" +click A "http://localhost:9000/index.html#link-clicked" "link test" +click BBBB testClick "click test" +click C "javascript:alert" "link test" classDef someclass fill:#f96; class A someclass;
- +
+ graph LR; + alert`md5_salt`-->B; + click alert`md5_salt` eval "Tooltip for a callback" + click B "javascript:alert`salt`" "This is a tooltip for a link" +
+
+ gantt + dateFormat YYYY-MM-DD + axisFormat %d/%m + title Adding GANTT diagram to mermaid + excludes weekdays 2014-01-10 + + section A section + Completed task :done, des1, 2014-01-06,2014-01-08 + Active task :active, des2, 2014-01-09, 3d + Future task : des3, after des2, 5d + Future task2 : des4, after des3, 5d + + section Critical tasks + Completed task in the critical line :crit, done, 2014-01-06,24h + Implement parser and jison :crit, done, after des1, 2d + Create tests for parser :crit, active, 3d + Future task in critical line :crit, 5d + Create tests for renderer :2d + Add to mermaid :1d + + section Documentation + Describe gantt syntax :active, a1, after des1, 3d + Add gantt diagram to demo page :after a1 , 20h + Add another diagram to demo page :doc1, after a1 , 48h + + section Clickable + Visit mermaidjs :active, cl1, 2014-01-07,2014-01-10 + Calling a Callback (look at the console log) :cl2, after cl1, 3d + + click cl1 href "javascript:alert`salt`" + click cl2 call ganttTestClick("test", test, test) + + section Last section + Describe gantt syntax :after doc1, 3d + Add gantt diagram to demo page : 20h + Add another diagram to demo page : 48h +
sequenceDiagram participant "Alice" @@ -90,17 +148,39 @@ Class01 : int chimp Class01 : int gorilla Class08 <--> C2: Cool label
+
+ graph LR + + SavePropertyController --> SavePropertyCommand + SavePropertyCommand --> SavePropertyCommandHandler + SavePropertyCommandHandler --> EventElastica[elastica.postupdate] + SavePropertyCommandHandler --> EventProperty[property.postdisable] + + SavePropertyController --> Exceptions + Exceptions --> ExceptionList(SecurityException
EmptyRequestBodyException
Throwable) + + classDef Ui fill:#FFFFFF + classDef object fill:#1E98EC + classDef event fill:#ECB11E + + class EventElastica,EventProperty event + class SavePropertyCommand,SavePropertyCommandHandler object + class SavePropertyController Ui +
+ +