2400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Moran	6a3aaf360e	Merge pull request #1510 from cmmoran/feature/1483_long_messages ... Feature/1483 long messages	2020-06-30 03:51:25 -04:00
chris moran	083d0c90e2	Merge branch 'develop' into feature/1483_long_messages	2020-06-30 03:50:04 -04:00
chris moran	fed142dad2	Merge branch 'mermaid-js-develop' into develop	2020-06-30 03:34:55 -04:00
chris moran	fcd2126330	Getting closer	2020-06-28 08:37:26 -04:00
Chris Moran	06dad7865c	Merge pull request #1502 from cmmoran/develop ... Missed `activationWidth` new configuration option for sequence diagrams	2020-06-26 10:19:02 -04:00
chris moran	6915634729	Missed activationWidth new configuration option for sequence diagrams	2020-06-26 10:17:13 -04:00
Chris Moran	d3647e2e8a	Merge pull request #1501 from cmmoran/develop ... Fixes	2020-06-26 09:33:57 -04:00
chris moran	217bd1f4bf	Fixed test cases for sequence diagrams ... Updated config to match a conversation knut and i had about the relationship between global, site, and integrator configuration (Will update docs) Renamed wrapEnabled to wrap Poor man's caching for calculateTextDimensions, wrapLabel, and breakString (actually makes a huge difference)	2020-06-26 09:26:56 -04:00
Knut Sveidqvist	0849aa3f03	Merge pull request #1488 from abhijeet-pathak/1005_gantt_sequnce_creation_order_change ... Fix for the issue 1005	2020-06-24 18:33:01 +02:00
Knut Sveidqvist	4cdeb214a7	Merge pull request #1486 from zwpaper/develop ... gitGraph dot and minus should be valid branch name	2020-06-24 18:25:56 +02:00
abhijeet-pathak	3c727bc46f	Corrected the test case description	2020-06-24 14:51:08 +05:30
GDFaber	e13662dd2c	Merge pull request #1492 from NeilCuzon/patch-5 ... Update flowchart.md	2020-06-23 19:27:15 +02:00
Abhijeet Pathak	2840c98bb0	Added test case for preserving creation order ... of tasks	2020-06-23 22:32:49 +05:30
chris moran	7d9bf83f66	addition: added bounds models for bounds checking in unit tests. ... addition: bounds.init will clear models addition: added loop model widths id instead of using title as the id removed parseMessage debug message addition: added configuration labelBoxWidth and labelBoxHeight for loop label box width/height change: adjusted svgDraw drawText to support anchor and valign and whether to output a tspan change: drawText returns an array regardless of array size change: hardcoded label width/height uses conf.labelBoxWidth and conf.labelBoxHeight change: Math.round() on many of the calculations to clean up bounds values change: getTextObj anchor, width, height start as undefined	2020-06-22 16:59:07 -04:00
GDFaber	d2c47bb153	Merge pull request #1491 from NeilCuzon/patch-4 ... Update faq.md	2020-06-22 08:04:03 +02:00
Neil Cuzon	9da3402997	Update flowchart.md ... -added a few workarounds, I found for writing "end" as a node name alongside the workaround found in the FAQ. -also made a few minor edits to the contents.	2020-06-21 15:19:45 -07:00
Neil Cuzon	e7784e3c34	Update faq.md	2020-06-21 11:41:46 -07:00
Neil Cuzon	224d6dc93f	Update faq.md	2020-06-21 10:03:21 -07:00
Chris Moran	f95b5d05d7	Merge pull request #1489 from cmmoran/develop ... noteModel generated during calculation of loop bounds	2020-06-20 20:56:29 -04:00
chris moran	ee109c2279	noteModel generated during calculation of loop bounds ... msgModel generated during calculation of loop bounds simplifies draw messages loop	2020-06-20 18:15:24 -04:00
Abhijeet Pathak	e515c7beb1	Fxed liniting issues.	2020-06-20 18:39:19 +05:30
Abhijeet Pathak	5f56db6f6e	Fix for the issue 1005 ... (https://github.com/mermaid-js/mermaid/issues/1005) A new attribute 'order' has been introduced in the task which records the serial number of task in the script. In ganttRenderer.js, the tasks are sorted by stratTime attribute. The function which calculates 'y' for task rectangles, lables etc. has been modified to correctly position it.	2020-06-20 18:03:48 +05:30
zwPapEr	c00b204259	gitGraph: 🔨 dot and minus should be valid branch name	2020-06-20 11:58:38 +08:00
Knut Sveidqvist	280c89a78d	Merge pull request #1484 from chrismoran-bkt/develop ... PR 1482 redux	2020-06-19 20:04:15 +02:00
Chris Moran	809ba2b392	Fixed: width of notes left of and right of	2020-06-19 13:50:53 -04:00
Chris Moran	18254392ab	Merge branch 'mermaid-js-develop' into develop	2020-06-19 13:32:23 -04:00
Chris Moran	5646518352	Tweaked the PR for long messages	2020-06-19 12:45:04 -04:00
Chris Moran	710b88efae	Merge branch 'feature/1483_long_messages' of https://github.com/mermaid-js/mermaid into develop	2020-06-19 09:17:04 -04:00
Chris Moran	1118c3399c	Fixed incorrect positioning and bounds for actors and notes with wrapping enabled and disabled	2020-06-19 09:13:37 -04:00
Knut Sveidqvist	98a7800fae	Merge pull request #1481 from mermaid-js/1474_missplaced_transitions ... 1474 missplaced transitions	2020-06-19 11:38:43 +02:00
Knut Sveidqvist	b3f9bbe50f	Merge branch 'develop' into 1474_missplaced_transitions	2020-06-19 11:38:30 +02:00
Knut Sveidqvist	e37c7e58cf	Merge pull request #1479 from chewnoill/chewy/cleanup-after-failed-render ... cleanup helper dom elements before rendering	2020-06-19 11:29:46 +02:00
Knut Sveidqvist	feb9ffadec	Diagram showing sequence diagram with cut long message text	2020-06-19 11:03:37 +02:00
Knut Sveidqvist	a4d96b032e	Diagram showing sequence diagram with long message text	2020-06-19 11:01:54 +02:00
Knut Sveidqvist	038d70a40b	Diagram showing sequence diagram with long message text	2020-06-19 10:57:16 +02:00
Knut Sveidqvist	44d5009538	Revert of PR #1482	2020-06-19 10:52:20 +02:00
Knut Sveidqvist	8e1e7fb314	Merge branch 'chrismoran-bkt-develop' into develop	2020-06-19 08:41:52 +02:00
Knut Sveidqvist	dbbfbb2855	Updates after review	2020-06-19 08:40:54 +02:00
Chris Moran	24ed979faf	Fixed an incorrect reference to an outer variable (actor) when processing actor widths	2020-06-18 08:51:16 -04:00
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	60586d8ce0	#1474 Lint changes	2020-06-17 18:31:53 +02: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	e6df4f24f4	Merge remote-tracking branch 'origin/develop' into develop	2020-06-17 06:05:00 -04:00
Chris	d4b733ff16	Merge pull request #5 from mermaid-js/develop ... Merging upstream develop	2020-06-17 06:04:04 -04:00
Chris Moran	3c72d28511	Refactored rendering sequence diagrams	2020-06-17 05:54:24 -04:00
Knut Sveidqvist	e4b63a68fd	Merge pull request #1477 from mermaid-js/1473_default_config ... 1473 default config	2020-06-16 08:07:18 +02:00