Chris Moran 
							
						 
					 
					
						
						
							
						
						e64a65c41e 
					 
					
						
						
							
							Refactored rendering sequence diagrams  
						
						 
						
						... 
						
						
						
						Fixed default config clobbering issues
Updated/corrected sequenceDiagram.spec to set the config using mermaidAPI
Enabled freeze on mermaidAPI to protect defaultConfig 
						
						
					 
					
						2020-06-18 08:10:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Moran 
							
						 
					 
					
						
						
							
						
						67c2fe8005 
					 
					
						
						
							
							Refactored rendering sequence diagrams  
						
						 
						
						... 
						
						
						
						Fixed default config clobbering issues 
						
						
					 
					
						2020-06-17 18:13:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								will cohen 
							
						 
					 
					
						
						
							
						
						d3d15b79fb 
					 
					
						
						
							
							cleanup helper dom elements before rendering  
						
						 
						
						
						
						
					 
					
						2020-06-17 17:54:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						c95257f32c 
					 
					
						
						
							
							#1474  Adding some tests  
						
						 
						
						
						
						
					 
					
						2020-06-17 18:28:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						f0162557c5 
					 
					
						
						
							
							#1474  Handling transitions  
						
						 
						
						
						
						
					 
					
						2020-06-17 18:16:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Moran 
							
						 
					 
					
						
						
							
						
						5f257119d6 
					 
					
						
						
							
							Merge branch 'develop' into refactor-sequences  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	dist/mermaid.core.js
#	dist/mermaid.core.js.map
#	dist/mermaid.js
#	dist/mermaid.js.map
#	dist/mermaid.min.js
#	dist/mermaid.min.js.map
#	src/config.js
#	src/mermaidAPI.js 
						
						
					 
					
						2020-06-17 06:12:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Moran 
							
						 
					 
					
						
						
							
						
						3c72d28511 
					 
					
						
						
							
							Refactored rendering sequence diagrams  
						
						 
						
						
						
						
					 
					
						2020-06-17 05:54:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						a251029546 
					 
					
						
						
							
							#§473 Font update for e2e tests  
						
						 
						
						
						
						
					 
					
						2020-06-15 22:42:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						b5d457daa9 
					 
					
						
						
							
							Testcommit  
						
						 
						
						
						
						
					 
					
						2020-06-15 22:26:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						603f2a2154 
					 
					
						
						
							
							1473 Using setConfig instead of initialize from mermaid in some cases  
						
						 
						
						
						
						
					 
					
						2020-06-15 21:55:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						bd0210cdce 
					 
					
						
						
							
							1473 Updated config handling  
						
						 
						
						
						
						
					 
					
						2020-06-15 01:11:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						5677523800 
					 
					
						
						
							
							1473 Setting default config  
						
						 
						
						
						
						
					 
					
						2020-06-14 23:37:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						2150933368 
					 
					
						
						
							
							Setting default config  
						
						 
						
						
						
						
					 
					
						2020-06-14 22:50:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						6559cfd0e1 
					 
					
						
						
							
							#1466  Handling line styles using the new rendering engine  
						
						 
						
						
						
						
					 
					
						2020-06-13 13:12:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Greywolf 
							
						 
					 
					
						
						
							
						
						0495103635 
					 
					
						
						
							
							Fix regex and Fix incorrect test  
						
						 
						
						
						
						
					 
					
						2020-06-08 19:21:33 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						85a8feec9d 
					 
					
						
						
							
							Also fix for error handling when setting mermaid.parseError  
						
						 
						
						
						
						
					 
					
						2020-06-06 12:42:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						b76e833ea5 
					 
					
						
						
							
							#1436  Correcting intersection calculations for circles  
						
						 
						
						
						
						
					 
					
						2020-05-30 18:04:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						3bdb9f289f 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
						
					 
					
						2020-05-30 17:11:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						8958b2aa1b 
					 
					
						
						
							
							Merge pull request  #1432  from mermaid-js/1418_html_labels_rendering_engine  
						
						 
						
						... 
						
						
						
						1418 html labels rendering engine 
						
						
					 
					
						2020-05-27 22:34:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						8603cf89b0 
					 
					
						
						
							
							#1418  Fix for descriptions in states  
						
						 
						
						
						
						
					 
					
						2020-05-27 22:18:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						4ea6c98f43 
					 
					
						
						
							
							#1418  Adding support for htmlLabels in stateDiagram (v2)  
						
						 
						
						
						
						
					 
					
						2020-05-27 20:41:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						39bdf261c6 
					 
					
						
						
							
							 
						
						 
						
						
						
						
					 
					
						2020-05-27 19:38:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Adrian Hall 
							
						 
					 
					
						
						
							
						
						f1c05bc909 
					 
					
						
						
							
							Ensure empty quoted relationship labels are accepted in ER diagrams  
						
						 
						
						
						
						
					 
					
						2020-05-23 13:33:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						9da027cf74 
					 
					
						
						
							
							Fix for intersect issues for start/end state  
						
						 
						
						
						
						
					 
					
						2020-05-17 09:34:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						c21b61bbd2 
					 
					
						
						
							
							Bug fixes in new functionality, intersections not taken into account in nodes used by new graph engine. Graph flowchart not usable when integrating using mermaid.core. Incorrect flwochart docs  
						
						 
						
						
						
						
					 
					
						2020-05-16 19:58:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						9a3ec31191 
					 
					
						
						
							
							#1386  Adding support for click events and links  
						
						 
						
						
						
						
					 
					
						2020-05-06 18:51:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						a20e6086cc 
					 
					
						
						
							
							#1386  Adding subroutine support for new rendering engine  
						
						 
						
						
						
						
					 
					
						2020-05-03 21:52:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						67aed51742 
					 
					
						
						
							
							#1382  Fix for lost parentage for nodes in deep structure  
						
						 
						
						
						
						
					 
					
						2020-05-01 19:18:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Russell Geraghty 
							
						 
					 
					
						
						
							
						
						950af2e753 
					 
					
						
						
							
							Tidy up documentation, correct rendering in test  
						
						 
						
						
						
						
					 
					
						2020-04-28 08:28:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						fa612b731c 
					 
					
						
						
							
							Renaming some tests to diffrentiate the old implementation from the impl via the new rendering engine  
						
						 
						
						
						
						
					 
					
						2020-04-26 17:48:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						3aa5fc0cc2 
					 
					
						
						
							
							Merge pull request  #1365  from dany74q/feature/sequence-diagrams-improvements  
						
						 
						
						... 
						
						
						
						Feature/sequence diagrams improvements 
						
						
					 
					
						2020-04-26 17:21:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						397f57accb 
					 
					
						
						
							
							Merge pull request  #1334  from russellgeraghty/feature/user-journey  
						
						 
						
						... 
						
						
						
						Feature/user journey 
						
						
					 
					
						2020-04-26 17:17:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						507582f40b 
					 
					
						
						
							
							#1295  Bugfix for descriptions  
						
						 
						
						
						
						
					 
					
						2020-04-26 16:01:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						fd37edc53f 
					 
					
						
						
							
							#1295  Adding support for forks and joins  
						
						 
						
						
						
						
					 
					
						2020-04-26 10:07:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						5662c06a33 
					 
					
						
						
							
							#1295  Adding support for multiline descriptions for states  
						
						 
						
						
						
						
					 
					
						2020-04-26 09:47:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						0aede618ec 
					 
					
						
						
							
							#1295  Adding support for multiline descriptions for states  
						
						 
						
						
						
						
					 
					
						2020-04-25 17:01:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						25ea221a6a 
					 
					
						
						
							
							#1295  Rendering tests for stateDiagram v2  
						
						 
						
						
						
						
					 
					
						2020-04-25 14:11:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Danny Shemesh 
							
						 
					 
					
						
						
							
						
						862f20ef20 
					 
					
						
						
							
							Added cypress e2e tests for suggested improvements  
						
						 
						
						... 
						
						
						
						This commits adds e2e tests for the suggested improvements.
I've went over the generated screenshots and they look good to me. 
						
						
					 
					
						2020-04-23 18:31:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						59f3d2a11e 
					 
					
						
						
							
							#1295  Fix for edges in subgraphs and handling of concurrent states in statediagram-v2  
						
						 
						
						
						
						
					 
					
						2020-04-22 20:03:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Russell Geraghty 
							
						 
					 
					
						
						
							
						
						249a14f84a 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into feature/user-journey  
						
						 
						
						
						
						
					 
					
						2020-04-17 07:30:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						c3f2e8dde1 
					 
					
						
						
							
							#1295  Render fix for flowchart, correct marker handling and some cleanup  
						
						 
						
						
						
						
					 
					
						2020-04-16 19:44:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Russell Geraghty 
							
						 
					 
					
						
						
							
						
						433f88b459 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into feature/user-journey  
						
						 
						
						
						
						
					 
					
						2020-04-13 20:08:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						704d56d193 
					 
					
						
						
							
							#1295  Updates mermaid-graphlib  
						
						 
						
						
						
						
					 
					
						2020-04-13 16:25:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						5f4da6e0bc 
					 
					
						
						
							
							Merge branch 'develop' into feature/1295_generic_rendering_engine  
						
						 
						
						
						
						
					 
					
						2020-04-11 18:53:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						22e17172dd 
					 
					
						
						
							
							#1295  Recursive rendering, draft  
						
						 
						
						
						
						
					 
					
						2020-04-11 17:16:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						6ec731e263 
					 
					
						
						
							
							Merge pull request  #1345  from GDFaber/feature/1343_add_flowchart_subroutine_shape  
						
						 
						
						... 
						
						
						
						Add flowchart subroutine node shape 
						
						
					 
					
						2020-04-11 14:12:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						7cd8b6f938 
					 
					
						
						
							
							Merge pull request  #1336  from GDFaber/feature/1290_hide_or_style_gantt_today_marker  
						
						 
						
						... 
						
						
						
						#1290  Hide/style today marker in gantt diagram 
						
						
					 
					
						2020-04-11 14:04:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						8455db6fae 
					 
					
						
						
							
							#1295  Moving graph operations into mermaid-graplib and adding tests  
						
						 
						
						
						
						
					 
					
						2020-04-10 07:27:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Faber 
							
						 
					 
					
						
						
							
						
						7f67435cb9 
					 
					
						
						
							
							#1343  Add flowchart subroutine node shape  
						
						 
						
						
						
						
					 
					
						2020-04-10 00:14:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Faber 
							
						 
					 
					
						
						
							
						
						dcfa903176 
					 
					
						
						
							
							#1290  Hide/style today marker in gantt diagram  
						
						 
						
						
						
						
					 
					
						2020-04-05 01:59:18 +02:00