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

1969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Knut Sveidqvist
bf2862f164 Updated packages 2020-02-16 09:30:08 +01:00
Knut Sveidqvist
d9ef227435 Updated packages, trying to fix e2e tests in build 2020-02-16 09:17:17 +01:00
Knut Sveidqvist
324c845dc4 Disabling Static tests action due to issues with cypress 2020-02-16 09:06:05 +01:00
Knut Sveidqvist
5d0c44e84b Adding @babel/preset-env inorder to help build action 2020-02-16 08:54:17 +01:00
GDFaber
01a71c3dbb
Merge pull request #1254 from xbojch/patch-1 
Typos
 2020-02-15 23:54:05 +01:00
Bojan Bedrac
b018f026e3
Typo 
- fixes a typo
 2020-02-13 15:51:00 +01:00
Knut Sveidqvist
0a38e3557d
Merge pull request #1248 from DCsunset/bug/1247_ssr_error 
Bug/1247 Fix "window is not defined" with ssr
 2020-02-11 07:02:50 +01:00
DCsunset
6f450272b8 #1247 fix "window is not defined" with ssr 2020-02-06 20:26:09 -08:00
Knut Sveidqvist
7e01f9be6e
Merge pull request #1245 from mermaid-js/feature/1224_styling_of_subgraphs 
Feature/1224 styling of subgraphs
 2020-02-05 20:06:22 +01:00
Knut Sveidqvist
00d2a1fe9f Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-02-05 19:42:13 +01:00
Knut Sveidqvist
18d0d435c6
Merge pull request #1241 from jgreywolf/1240-ClassDiagramRefactor 
1240 class diagram refactor
 2020-02-05 19:42:01 +01:00
Knut Sveidqvist
f298c154e2 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-02-05 19:40:18 +01:00
Knut Sveidqvist
822df37f8c #1224 Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs 2020-02-05 19:39:50 +01:00
Knut Sveidqvist
73cac95255
Merge pull request #1238 from GDFaber/feature/962_flowchart_line_label_color_from_linkstyle 
Set text color for flowchart link labels according to linkStyle definitions
 2020-02-05 19:36:12 +01:00
Marc Faber
a0e7789d50 #962 added color setting for default link style 2020-02-04 22:07:10 +01:00
Justin Greywolf
c825b37cc6 1240-refactor for class renderer 
prep for future functionality work
 2020-02-03 16:04:59 -08: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
Justin Greywolf
9da8ea5967
Merge pull request #16 from mermaid-js/develop 
Merge from parent
 2020-01-30 10:20:14 -08:00
Knut Sveidqvist
4d5ecc5518
Merge pull request #1203 from jgreywolf/1179-SupportGenericTypesForMembers 
1179 support generic types for members
 2020-01-29 21:08:41 +01:00
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