mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,926 Commits 158 Branches 138 Tags 346 MiB
Commit Graph

5926 Commits

Author SHA1 Message Date
knsv ee6ad01209 Merge branch 'master' of https://github.com/knsv/mermaid 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
 2015-01-20 20:04:16 +01:00
knsv 33973354ed * Removed logging 2015-01-20 19:53:38 +01:00
knsv 2af4a1f9f8 * Removed logging 2015-01-20 19:52:13 +01:00
knsv 44a2e0472a * Draft implementation of info diagram 
* Fix for issue #109
 2015-01-20 19:48:33 +01:00
Knut Sveidqvist 699d3bca52 Merge pull request #107 from markdalgleish/require-d3 
Require d3 directly to better support Node usage
 2015-01-20 07:28:03 +01:00
Mark Dalgleish 50d285bc49 Require d3 directly to better support Node usage 2015-01-20 16:59:58 +11:00
knsv 48500652b3 Allow overriding sequence diagram configuration (SVG properties) - handling of non existent configuration 2015-01-14 19:10:39 +01:00
knsv 8e050d4223 Merge branch 'jjmr-sequence_config_file' 2015-01-14 18:11:14 +01:00
knsv 73f567f3e2 Merge branch 'sequence_config_file' of https://github.com/jjmr/mermaid into jjmr-sequence_config_file 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/main.js
 2015-01-14 18:10:21 +01:00
Knut Sveidqvist 1033a74970 Merge pull request #101 from bjowes/text-labels 
Text based labels, new shape
 2015-01-14 08:13:49 +01:00
Björn Weström 595fe1fd32 New build 2015-01-14 00:06:38 +01:00
Björn Weström 9095b2df97 Corrected example syntax 2015-01-14 00:06:14 +01:00
Björn Weström 8e45e7284b Removed extraction of dagre-d3 
Pending resolution of a issue with globals
 2015-01-14 00:05:58 +01:00
Björn Weström fe437550fc Test cases for styling 2015-01-14 00:05:06 +01:00
Björn Weström 84124c9427 Improved CSS cloning 
Better separation of styles between multiple mermaid SVGs on the same
page
Added support for text label styling
 2015-01-14 00:04:38 +01:00
Björn Weström 3fe38237e6 New config attribute, htmlLabels 2015-01-14 00:03:41 +01:00
Björn Weström 9c8e36ea95 Syntax suggestion for reverse asymmetric shape 2015-01-14 00:03:19 +01:00
Björn Weström 8e9890d6e1 New shape, text labels 
Added support to configure mermaid to use plain text labels for better
SVG compatibility
Added a reverse asymmetric shape, not in the graph syntax yet
 2015-01-14 00:02:58 +01:00
Björn Weström 1abb53ce00 Merge branch 'master' into text-labels 2015-01-13 22:13:51 +01:00
Björn Weström fec3101f37 Merge pull request #5 from knsv/master 
Update README.md
 2015-01-13 22:13:30 +01:00
Björn Weström a23fce6c2d Cleanup after merge 2015-01-13 21:55:10 +01:00
Björn Weström 9f970ed953 Merge branch 'master' into text-labels 
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/flowchart/flowRenderer.js
	src/utils.js
	test/web_style.html
 2015-01-13 21:50:05 +01:00
jjmr 9b892ef128 Add new parameter to the console client to override the svg configuration in sequence diagrams 2015-01-13 16:17:30 +01:00
Knut Sveidqvist 0b2afb8e71 Update README.md 2015-01-12 07:31:51 +01:00
Björn Weström cbd7393d36 Additional tests for labels 2015-01-11 16:17:02 +01:00
Björn Weström a27b3d8fcb Added edge labels 2015-01-11 16:16:50 +01:00
Björn Weström 9246df4410 Break out dagre-d3 dependency 2015-01-11 16:16:18 +01:00
Björn Weström 5ad30c86c5 Improved style handling 2015-01-11 16:16:07 +01:00
Björn Weström 43d2b0b9d7 Improved style handling 2015-01-11 16:15:57 +01:00
Björn Weström 367d620a82 Break out dagre-d3, new label styling 2015-01-11 16:15:38 +01:00
Björn Weström 1b76160a7d Break out dagre-d3 dependency 2015-01-11 16:15:19 +01:00
Björn Weström d9f8ef6d57 Generated 2015-01-11 16:14:34 +01:00
Björn Weström 58659c4d85 Merge pull request #4 from knsv/master 
Merge from master
 2015-01-11 16:12:13 +01:00
knsv 911cd09dd8 New release 2015-01-11 15:02:35 +01:00
knsv 27687fc742 Added notation for titles on subgraphs 2015-01-10 19:23:57 +01:00
knsv 3027882847 Added notation for dotted links as described in issue #26 and support for thicker links 2015-01-10 14:33:50 +01:00
Knut Sveidqvist a7fd52237a Merge pull request #96 from gkchic/master 
Merge pull request #1 from knsv/master
 2015-01-10 09:46:04 +01:00
knsv 36b389b1fd Added arrow head to async arrow with cross 2015-01-09 08:21:48 +01:00
knsv 952723706b Making it possible to have style/% in class definitions as described in issue #54 2015-01-08 08:20:07 +01:00
knsv 5a720b6d63 Introducing subgraphs 2015-01-07 21:02:58 +01:00
gkchic 0ae130de0a Merge pull request #1 from knsv/master 
Update from original
 2015-01-07 13:23:17 +01:00
knsv 273eb63efb Added link to demos page 2015-01-07 11:30:08 +01:00
knsv c5c995c916 Added the option to disable auto rendering via the mermaid namespace as described in issue #91 
Added optional ; as statement separator equal to newline for sequence diagrams (help for tidy users)
 2015-01-06 19:33:00 +01:00
knsv 222a6e0682 New release 0.3.1 2015-01-05 15:32:39 +01:00
knsv 7741f49ed8 Move of drawLoop to svgDraw 2015-01-05 15:06:01 +01:00
knsv 786d9ddb54 Move of drawLoop to svgDraw 2015-01-05 14:41:00 +01:00
knsv 03a711d82d Cleanup of code 2015-01-05 14:12:49 +01:00
knsv 758a9d7254 Cleanup of code 2015-01-05 13:41:32 +01:00
knsv 9bc23129d5 Html file for testing sequence diagrams 2015-01-05 13:26:15 +01:00
knsv 343bd52c17 Support for alt & opt statements. 2015-01-05 13:25:37 +01:00