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,975 Commits 182 Branches 159 Tags
Commit Graph

1975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Knut Sveidqvist
28153656d7 Updated docs with info on chaining of nodes and using ::: to attach a class 2020-01-22 18:52:16 +01:00
Knut Sveidqvist
d2eaf16751 Updating version to 8.4.6 2020-01-22 18:33:33 +01:00
Knut Sveidqvist
e0d98b2e14
Merge pull request #1214 from GDFaber/bug/1212_apply_classDef_to_flowchart_nodes_with_links 
Fix styling of flowchart nodes with links when class definitions are assigned
 2020-01-22 17:59:53 +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
c9f95a1866
Merge pull request #1207 from mermaid-js/bug/1205_activations_error 
#1205 Adding parsing exception for then an inactive participant is inactivated
 2020-01-15 20:48:36 +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
Knut Sveidqvist
efa810da91
Merge pull request #1199 from GDFaber/bug/fix_mermaidAPI_configuration_example_in_the_docs 
Fix mermaidAPI configuration example in the docs
 2020-01-15 16:50:11 +01:00
Knut Sveidqvist
c0e1c90497
Merge pull request #1198 from GDFaber/bug/add_docs_and_defaults_for_node_spacing 
Add docs and default values for node spacing in mermaidAPI
 2020-01-15 16:48:58 +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
Justin Greywolf
8897b32cd3
Merge pull request #13 from mermaid-js/develop 
sync
 2020-01-13 16:01:40 -08:00
Marc Faber
5493fadc9e #1200 Unify regex for finding <br> tags throughout mermaid 2020-01-13 22:04:47 +01:00
Knut Sveidqvist
eade3d0a2d
Merge pull request #1178 from jgreywolf/1119-SpecifyMethodReturnTypeInClassDiagram 
1119 specify method return type in class diagram
 2020-01-13 19:55:47 +01:00
Marc Faber
36f9eca33e Example 2 is not shown in mermaidAPI configuration section of the docs 2020-01-12 14:38:57 +01:00
Marc Faber
4dd90e56b1 Add docs and default values for node spacing in mermaidAPI 2020-01-12 14:09:24 +01:00
Knut Sveidqvist
5e7484a12d
Update mermaidAPI.md 2020-01-12 01:04:15 -08:00
Knut Sveidqvist
fdbc44e41b
Update mermaidAPI.md 2020-01-12 01:03:46 -08:00
Knut Sveidqvist
e0d16dcb22 Version 8.4.5 untagged-f43366252632a1a42020 2020-01-11 10:07:41 +01:00
Knut Sveidqvist
0a5ee0634f Merge branch 'master' of github.com:mermaid-js/mermaid 
# Conflicts:
#	docs/classDiagram.md
 2020-01-11 09:47:51 +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
Justin Greywolf
fc0902c290
Merge pull request #12 from mermaid-js/develop 
sync
 2020-01-10 09:47:16 -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
Knut Sveidqvist
7760e63b47
Merge pull request #1189 from GDFaber/maintenance/1182_flowchart_remove_newDagreD3 
Maintenance/Remove "newDagreD3" switch from the flowchart renderer
 2020-01-08 20:56:54 +01:00
Christian Klemm
a483f2466f
added artifact to build action 2020-01-08 20:52:39 +01:00
Ashish Jain
48c345a403 #1092 Fix for mangling of multiple classDiagrams 2020-01-08 20:48:57 +01:00
Marc Faber
82b79aa332 Trigger tests once more 2020-01-08 20:42:58 +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
Ashish Jain
18204586e1
Merge pull request #1188 from GDFaber/feature/743_gantt_multiline_section_titles 
Feature/Handle multiline section titles in gantt diagrams
 2020-01-08 18:06:29 +01:00
Marc Faber
1f3c970e7a Trigger tests once more 2020-01-08 14:03:16 +01:00
Marc Faber
1cfd93640c #743 handle multiline section titles in gantt diagrams 2020-01-08 13:50:58 +01:00
Marc Faber
553ea4971f Trigger tests one more time 2020-01-07 01:24:24 +01:00
Justin Greywolf
ac8b01a94c
Merge pull request #11 from mermaid-js/develop 
sync
 2020-01-06 10:08:43 -08: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
591a104c80 1064 Class diagram interactivity docs 
Updated documentation for Class Diagram with details for interactivity
 2020-01-03 10:14:07 -08:00