GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
1,953 Commits 182 Branches 159 Tags
Commit Graph

724 Commits

Author SHA1 Message Date
Marc Faber
a0e7789d50 #962 added color setting for default link style 2020-02-04 22:07:10 +01:00
Marc Faber
2dd4aa31e5 #962 moved "style from array" function to utils.js, added unit test 2020-02-04 00:24:50 +01:00
Marc Faber
c95adfaf74 #962 Set text color for flowchart link labels according to linkStyle definitions 2020-02-02 22:59:59 +01:00
Knut Sveidqvist
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers 2020-01-29 21:08:31 +01:00
Knut Sveidqvist
c43f791b29 #1223 Removing/updating some logging, adding current.html to .gitignore 2020-01-29 20:44:15 +01:00
Knut Sveidqvist
4709195a1d #1223 Adding support for multiple transitions to a node from another node 2020-01-29 19:57:59 +01:00
Knut Sveidqvist
0082c23a90 #1217 Better matchingof words beginning with as as matching token AS in stateDiagram's state definition. 2020-01-29 19:05:51 +01:00
Knut Sveidqvist
d571c7e08e
Merge pull request #1225 from jgreywolf/1058-ClassDiagramScaling 
1058 class diagram scaling
 2020-01-27 20:14:39 +01:00
Knut Sveidqvist
ea29b67c5c
Merge pull request #1221 from mermaid-js/bug/1216_dodging_huge_diagrams 
#1216 Fix for issue when mermaid freezes the browser tab due to large…
 2020-01-27 20:01:54 +01:00
Justin Greywolf
0921007d92 1058-Set diagram dimensions appropriately 
Make sure height and width are set so that all of the diagram is displayed
 2020-01-27 10:27:05 -08:00
Knut Sveidqvist
4ad354a561 #1216 Fix for issue when mermaid freezes the browser tab due to large diagrams 2020-01-25 13:35:11 +01:00
Justin Greywolf
587592449a 1179 Add ability to use generics for members 
Created new class to handle parsing of members with regex to handle determining type of member and the different elements within.  Also moved addTSpan in drawClass method to this new file.  Finally, I added a "catch all" section in case something fails in the regex to make sure everything gets formatted correctly.

Added more tests and documentation

updating gitignore

Tired of constantly having to ignore files and stash/pop when switching between branches
 2020-01-24 16:01:04 -08:00
Marc Faber
d2d4a24229 #487 Set text color for flowchart nodes according to style definitions 2020-01-24 01:24:47 +01:00
Marc Faber
c38f053294 #1212 Class definition is not applied to flowchart nodes with links 2020-01-19 18:10:14 +01:00
Knut Sveidqvist
921d274579
Merge pull request #1208 from mermaid-js/feature/Issue-1206_Parsing_Crashing_Browser_In_Class_Diagram 
Feature/issue 1206 parsing crashing browser in class diagram
 2020-01-15 20:55:21 +01:00
Ashish Jain
99469f8404 #1206 Added test case to verify parsing fails to allow EOF until first '{' is closed 2020-01-15 20:34:41 +01:00
Ashish Jain
417d2c0336 #1206 Added test case to verify parsing fails to allow another '{' until first one is closed 2020-01-15 20:33:23 +01:00
Ashish Jain
2a3de1a090 #1206 Updated the classDiagram JISON to not allow EOF or another '{' until first one is closed 2020-01-15 20:29:13 +01:00
Knut Sveidqvist
d9318c5af3 #1205 Adding parsing exception for then an inactive participant is inactivated 2020-01-15 20:27:31 +01:00
Justin Greywolf
0e02cf5c86
Merge pull request #1195 from fgrandel/bug/1193_allow_multiple_relations 
fix(#1193): render multiple relations
 2020-01-15 09:29:02 -08:00
Knut Sveidqvist
45277affe8
Merge pull request #1204 from GDFaber/bug/1196_keep_flowchart_label_text_when_style_is_applied 
Keep flowchart node label text (if already defined) when a style is applied
 2020-01-15 18:27:48 +01:00
Knut Sveidqvist
c564a843fa
Merge pull request #1202 from GDFaber/bug/1200_unify_regex_for_br_tags 
Unify regex for finding <br> tags throughout mermaid
 2020-01-15 16:53:06 +01:00
Marc Faber
b1bfdec473 #1196 Keep flowchart node label text (if already defined) when a style is applied 2020-01-14 23:37:30 +01:00
Justin Greywolf
244f423baf
Merge pull request #1194 from fgrandel/bug/1192_relation_cut_off 
fix(#1192): relation got cut off
 2020-01-14 09:35:00 -08:00
Marc Faber
5493fadc9e #1200 Unify regex for finding <br> tags throughout mermaid 2020-01-13 22:04:47 +01:00
Justin Greywolf
fa1331ffd5 Fix after removing other code 2020-01-10 10:24:04 -08:00
Justin Greywolf
57b5b9a7a6 Added conditional to fallback to old style 2020-01-10 09:50:21 -08:00
Justin Greywolf
58fbfc3c38 1119 Support method return types 
Small refactor to split out logic for determining method display text and style. Updated documentation
Used regex to parse method statements in class diagrams to extract discrete elements to set display appropriately. Added tests and updated docs
 2020-01-10 09:50:21 -08:00
Justin Greywolf
0af5e0b795 Address code style issues 2020-01-10 09:50:21 -08:00
Justin Greywolf
d7771eb4b6 1119 Add ability to define return type for methods 
Updated ClassRenderer to check for `[]` to indicate return type for method. Small refactor to split out logic for determining method display text and style. Updated documentation
 2020-01-10 09:50:21 -08:00
Florian Grandel
75890f88fa fix(#1193): render multiple relations 2020-01-09 17:00:34 +01:00
Florian Grandel
9a6b07e1e1 fix(#1192): relation got cut off 2020-01-09 16:24:47 +01:00
Knut Sveidqvist
ce02d1dc98
Merge pull request #1190 from mermaid-js/Issue-1092_Mangled_Multiple_Class_Diagrams 
#1092 Fix for mangling of multiple classDiagrams
 2020-01-08 21:05:42 +01:00
Ashish Jain
48c345a403 #1092 Fix for mangling of multiple classDiagrams 2020-01-08 20:48:57 +01:00
Marc Faber
ffbf9f265f #1182: remove "newDagreD3" switch from the flowchart renderer 2020-01-08 20:27:33 +01:00
Knut Sveidqvist
144f65c459
Merge pull request #1176 from GDFaber/feature/1152_flowchart_node_spacing 
Feature/Add node spacing to flowchart configuration
 2020-01-08 18:16:03 +01:00
Marc Faber
1cfd93640c #743 handle multiline section titles in gantt diagrams 2020-01-08 13:50:58 +01:00
Marc Faber
b3934c9788 #1152 add node spacing to flowchart configuration 2020-01-05 22:03:53 +01:00
Knut Sveidqvist
37ae863443
Merge pull request #1170 from jgreywolf/1064-ClickEventInClassDiagram 
1064 click event in class diagram
 2020-01-05 12:07:34 +01:00
Knut Sveidqvist
f57356006d
Merge pull request #1171 from mermaid-js/feature/Issue-1146_Dashed_Line_For_Class_Diagram 
Feature/issue 1146 dashed line for class diagram
 2020-01-05 12:02:36 +01:00
Justin Greywolf
38097c9095 code style 2020-01-02 11:27:56 -08:00
Justin Greywolf
7f31e624ca Addressing code style issues 2020-01-02 11:24:06 -08:00
Justin Greywolf
e6fbfcb1e8 1064 Adding tooltip and function calls to click evens in class diagrams 2020-01-02 11:06:29 -08:00
Ashish Jain
190353785e #1146 Added jest test for dash line (dependecy) parsing 2020-01-02 19:51:25 +01:00
Ashish Jain
b14c768fa2 #1146 Fix for dashed line (Dependency) support for classDiagram 2020-01-02 19:25:31 +01:00
Knut Sveidqvist
4e6aad5115 #834 Using & as a separator for the multiple nodes 2020-01-02 18:52:50 +01:00
Knut Sveidqvist
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram 
1064 click event in class diagram
 2020-01-02 08:10:48 -08:00
Justin Greywolf
d63eb396e1 Fix code style issues 2020-01-02 07:59:36 -08:00
Knut Sveidqvist
a1626927cc
Merge pull request #1136 from keenanjt33/feature/921_callback_params 
Gantt: Add support for callback with parameters
 2020-01-01 00:29:00 -08:00
Knut Sveidqvist
75e2abe242
Merge pull request #1166 from GDFaber/feature/flowchart_add_cylindric_shape 
#1154 Flow diagram DB shape request
 2020-01-01 00:24:56 -08:00