Ashley Engelund (weedySeaDragon @ github) 
							
						 
					 
					
						
						
							
						
						599d035daf 
					 
					
						
						
							
							merge MERMAID/develop into branch  
						
						 
						
						
						
						
					 
					
						2022-10-25 07:42:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						f4bb978a87 
					 
					
						
						
							
							Merge pull request  #3649  from DKurilo/feat/3247-statements-aliases  
						
						 
						
						... 
						
						
						
						add statement aliases for ER diagram 
						
						
					 
					
						2022-10-25 14:46:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						27a68819bc 
					 
					
						
						
							
							Merge pull request  #3647  from DKurilo/feat/1414-notes-to-class-diagram  
						
						 
						
						... 
						
						
						
						add the way to add notes to class diagram 
						
						
					 
					
						2022-10-25 14:45:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santosh Viswanatham 
							
						 
					 
					
						
						
							
						
						c71b6e31f7 
					 
					
						
						
							
							Merge branch 'develop' into feat/3601-cspell-configuration  
						
						 
						
						
						
						
					 
					
						2022-10-18 21:02:38 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dima Kurilo 
							
						 
					 
					
						
						
							
						
						20751a6496 
					 
					
						
						
							
							fix cypress tests for erDiagram, add eslint-plugin-no-only-tests plugin because of this comment:  https://github.com/mermaid-js/mermaid/pull/3647#issuecomment-1281163858  
						
						 
						
						
						
						
					 
					
						2022-10-17 13:20:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dima Kurilo 
							
						 
					 
					
						
						
							
						
						75e11b1fde 
					 
					
						
						
							
							add basic render (cypress) test for classDiagram-v2 too  
						
						 
						
						
						
						
					 
					
						2022-10-17 12:33:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dima Kurilo 
							
						 
					 
					
						
						
							
						
						cead1f36f4 
					 
					
						
						
							
							add basic render (cypress test for notes  
						
						 
						
						
						
						
					 
					
						2022-10-17 12:13:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dima Kurilo 
							
						 
					 
					
						
						
							
						
						3108e896b6 
					 
					
						
						
							
							add renedering (cypress) tests  
						
						 
						
						
						
						
					 
					
						2022-10-17 12:03:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alois Klink 
							
						 
					 
					
						
						
							
						
						989d716c36 
					 
					
						
						
							
							style: fix @cspell/eslint warnings  
						
						 
						
						... 
						
						
						
						Ignores some names of contributors, and adjusts some capitilization
spacing to fix all cspell warnings. 
						
						
					 
					
						2022-10-16 10:23:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashley Engelund (weedySeaDragon @ github) 
							
						 
					 
					
						
						
							
						
						d1f3b889d6 
					 
					
						
						
							
							add cypress tests for classDefs and applying classes to states  
						
						 
						
						
						
						
					 
					
						2022-10-11 08:33:43 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						646f76d343 
					 
					
						
						
							
							Fix for broken test  
						
						 
						
						
						
						
					 
					
						2022-10-07 14:36:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elliot Nelson 
							
						 
					 
					
						
						
							
						
						4e4b5ccf8d 
					 
					
						
						
							
							feat(git): allow cherry-pick to suppress tag altogether  
						
						 
						
						
						
						
					 
					
						2022-09-18 09:22:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elliot Nelson 
							
						 
					 
					
						
						
							
						
						ae920eaa93 
					 
					
						
						
							
							feat(git): cherry-pick keyword supports tag attribute  
						
						 
						
						
						
						
					 
					
						2022-09-17 23:57:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alois Klink 
							
						 
					 
					
						
						
							
						
						a25c9a30d0 
					 
					
						
						
							
							text(e2e): give git tests consistent commit id  
						
						 
						
						... 
						
						
						
						gitGraph render tests are currently using random commit ids,
which causes visual regression tests to fail.
I couldn't find a way to make the random commit IDs consistent
(JavaScript/Cypress doesn't seem to have a random.seed() function),
so I've just hardcoded all the commit ids. 
						
						
					 
					
						2022-09-14 04:15:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alois Klink 
							
						 
					 
					
						
						
							
						
						05b8a6e77f 
					 
					
						
						
							
							test(e2e): widen flowchart width to within 10%  
						
						 
						
						... 
						
						
						
						Widen flowchart width acceptable values to within 10% of 300px.
On my local environment, I'm getting 283px, which is 5.5% of 300px. 
						
						
					 
					
						2022-09-14 04:15:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						01106caa59 
					 
					
						
						
							
							Merged typescript changes  
						
						 
						
						
						
						
					 
					
						2022-09-05 11:22:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						047b7023a2 
					 
					
						
						
							
							Updated with cloud and bang shapes  
						
						 
						
						
						
						
					 
					
						2022-09-05 09:54:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						ccb16e5f5a 
					 
					
						
						
							
							Adding cloud and bang shapes  
						
						 
						
						
						
						
					 
					
						2022-09-02 11:08:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						68f8010ab9 
					 
					
						
						
							
							Merge branch 'develop' into minmaps  
						
						 
						
						
						
						
					 
					
						2022-09-01 13:42:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						63c385a5d7 
					 
					
						
						
							
							Adding some rendering tests  
						
						 
						
						
						
						
					 
					
						2022-08-30 21:36:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashish Jain 
							
						 
					 
					
						
						
							
						
						d7e0888801 
					 
					
						
						
							
							Merge pull request  #3361  from aloisklink/feature/3356_git_custom_merge_commit_id  
						
						 
						
						... 
						
						
						
						feat(git): allow custom merge commit ids 
						
						
					 
					
						2022-08-30 17:50:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						6ab0eef6f3 
					 
					
						
						
							
							Merge branch 'develop'  
						
						 
						
						... 
						
						
						
						Conflicts:
	cypress/platform/knsv.html 
						
						
					 
					
						2022-08-28 14:22:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						080bde0bc2 
					 
					
						
						
							
							#2824  Updated regressionstest afters diagram sizing changes  
						
						 
						
						
						
						
					 
					
						2022-08-28 11:39:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						e6e7bdcb55 
					 
					
						
						
							
							#2824  Size changes and updated regressionstest afters diagram sizing changes  
						
						 
						
						
						
						
					 
					
						2022-08-28 11:25:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						2968b400c4 
					 
					
						
						
							
							Updated viewBox settings  
						
						 
						
						
						
						
					 
					
						2022-08-27 15:03:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						d0d5739ab0 
					 
					
						
						
							
							Merge branch 'develop' into minmaps  
						
						 
						
						
						
						
					 
					
						2022-08-27 12:35:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alois Klink 
							
						 
					 
					
						
						
							
						
						b2f5ba3ee8 
					 
					
						
						
							
							feat(git): allow custom merge commit ids  
						
						 
						
						... 
						
						
						
						Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.
This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42 
						
						
					 
					
						2022-08-25 23:42:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Valentin Valls 
							
						 
					 
					
						
						
							
						
						0583c4fa25 
					 
					
						
						
							
							Added 'ms' duration  
						
						 
						
						
						
						
					 
					
						2022-08-24 22:26:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								FlorianWoelki 
							
						 
					 
					
						
						
							
						
						19a9f90186 
					 
					
						
						
							
							test(e2e): add array and generic attributes erDiagram test  
						
						 
						
						
						
						
					 
					
						2022-08-20 15:15:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						9b54feab84 
					 
					
						
						
							
							Merge branch 'develop' into minmaps  
						
						 
						
						
						
						
					 
					
						2022-08-06 10:53:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						afe343e94f 
					 
					
						
						
							
							Changes after merge  
						
						 
						
						
						
						
					 
					
						2022-08-06 10:49:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						b0074bf723 
					 
					
						
						
							
							Merge pull request  #3222  from leon19/bugfix/incorrect-label-padding  
						
						 
						
						... 
						
						
						
						fix: remove right padding when a label contains HTML entities 
						
						
					 
					
						2022-08-04 13:06:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						aa9149912d 
					 
					
						
						
							
							Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment  
						
						 
						
						
						
						
					 
					
						2022-08-04 13:05:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Muhammad Faisal Bin Arba'in 
							
						 
					 
					
						
						
							
						
						9ee43c0b7a 
					 
					
						
						
							
							snapshot test for more 8 branches with commits  
						
						 
						
						
						
						
					 
					
						2022-08-01 19:41:54 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						ffe520db06 
					 
					
						
						
							
							Curved edges  
						
						 
						
						
						
						
					 
					
						2022-07-29 15:06:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lorens León 
							
						 
					 
					
						
						
							
						
						c40368b0fa 
					 
					
						
						
							
							fix: remove right padding when a label contains HTML entities  
						
						 
						
						... 
						
						
						
						Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length 
						
						
					 
					
						2022-07-26 21:50:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						8681e78e50 
					 
					
						
						
							
							Fixes for rendering tests  
						
						 
						
						
						
						
					 
					
						2022-07-20 14:39:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						dee9cfea85 
					 
					
						
						
							
							Reverting to cypress 9.7 in order to get applitools back in the game  
						
						 
						
						
						
						
					 
					
						2022-07-20 11:32:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MOREL Matthieu 
							
						 
					 
					
						
						
							
						
						648b15b00b 
					 
					
						
						
							
							Upgrade Cypress  
						
						 
						
						
						
						
					 
					
						2022-06-19 14:36:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashishj 
							
						 
					 
					
						
						
							
						
						e3df38e078 
					 
					
						
						
							
							#3080  Added more rendering test for cherry pick functionality  
						
						 
						
						
						
						
					 
					
						2022-06-07 20:52:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashishj 
							
						 
					 
					
						
						
							
						
						c147404d1c 
					 
					
						
						
							
							#3080  Added support for cherry pick commits  
						
						 
						
						
						
						
					 
					
						2022-06-07 20:32:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashishj 
							
						 
					 
					
						
						
							
						
						90d187c48a 
					 
					
						
						
							
							#3080  Added rendering test cases  
						
						 
						
						
						
						
					 
					
						2022-06-07 18:52:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						bd459fadd3 
					 
					
						
						
							
							 
						
						 
						
						
						
						
					 
					
						2022-05-31 20:35:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ronald Heggenberger 
							
						 
					 
					
						
						
							
						
						7372ca5e8e 
					 
					
						
						
							
							Adding "Critical Region" and "Break" blocks  
						
						 
						
						
						
						
					 
					
						2022-05-21 09:31:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashishj 
							
						 
					 
					
						
						
							
						
						85062ac570 
					 
					
						
						
							
							#3046  Add support for cyclic themeVariable rotation for more than 8 branches  
						
						 
						
						
						
						
					 
					
						2022-05-17 19:15:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						eadbf595ba 
					 
					
						
						
							
							Adding applitools to inegration tests  
						
						 
						
						
						
						
					 
					
						2022-05-10 20:33:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						65143a0182 
					 
					
						
						
							
							#2732  Regression fixes for accessibility  
						
						 
						
						
						
						
					 
					
						2022-05-06 19:42:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						bada661bd0 
					 
					
						
						
							
							Merge branch 'develop' of github.com:mermaid-js/mermaid into develop  
						
						 
						
						
						
						
					 
					
						2022-04-28 18:45:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Knut Sveidqvist 
							
						 
					 
					
						
						
							
						
						d914e23626 
					 
					
						
						
							
							Fix for hideUnusedParticipants  
						
						 
						
						
						
						
					 
					
						2022-04-28 18:45:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashishj 
							
						 
					 
					
						
						
							
						
						5aac0734d5 
					 
					
						
						
							
							Fix for broken Requirement diagram cypress test  
						
						 
						
						
						
						
					 
					
						2022-04-28 18:26:31 +02:00