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

1999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Knut Sveidqvist
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers 2020-01-29 21:08:31 +01:00
Ashish Jain
fbd8dfa5be
Merge pull request #1230 from mermaid-js/bug/1223_multiple_transitions_in_statediagram 
Bug/1223 multiple transitions in statediagram
 2020-01-29 21:02:14 +01:00
Knut Sveidqvist
c43f791b29 #1223 Removing/updating some logging, adding current.html to .gitignore 2020-01-29 20:44:15 +01:00
Ashish Jain
39b873cd5f
Merge pull request #1229 from mermaid-js/bug/1217_fix_for_keyword_as_in_stateDiagram 
#1217 Better matching of words beginning with as as matching token
 2020-01-29 20:24:28 +01:00
Knut Sveidqvist
ec90537181 #1223 Adding support for multiple transitions to a node from another node 2020-01-29 20:01:21 +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
c7b559f449
Update todo.md 2020-01-27 20:28:43 +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
b6f0b25f24
Merge pull request #1222 from GDFaber/bug/1218_fix_link_click_events 
Fix anchor and script support in link click events
 2020-01-27 20:13:07 +01:00
Knut Sveidqvist
5ea6bd5980
Merge branch 'develop' into bug/1218_fix_link_click_events 2020-01-27 20:06:00 +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
Knut Sveidqvist
1f851bc04c
Merge pull request #1219 from GDFaber/feature/487_flowchart_node_text_color_from_style 
#487 Set text color for flowchart nodes according to style definitions
 2020-01-27 20:01:19 +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
Justin Greywolf
4a2e0bfa00 Merge branch 'develop' into 1179-SupportGenericTypesForMembers 2020-01-27 09:44:12 -08:00
Justin Greywolf
8ebc587fb5
Merge pull request #15 from mermaid-js/develop 
Merge from parent
 2020-01-27 09:43:46 -08:00
Marc Faber
c7b46f4fba #1218 Fix anchor and script support in link click events 2020-01-26 16:56:42 +01: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
Justin Greywolf
425b071a50
Merge pull request #14 from mermaid-js/develop 
merge from
 2020-01-24 15:58:42 -08:00
Marc Faber
4dd72e6793 Trigger tests again 2020-01-24 01:42:46 +01:00
Marc Faber
d2d4a24229 #487 Set text color for flowchart nodes according to style definitions 2020-01-24 01:24:47 +01:00
Knut Sveidqvist
4805394e61 New version in the docs 8.4.6 2020-01-22 19:22:37 +01:00
Knut Sveidqvist
5cbd723f8d Merge branch 'release/8.4.6' 2020-01-22 19:07:20 +01:00
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