2454 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Knut Sveidqvist	61684830bf		2020-07-12 11:15:32 +02:00
Knut Sveidqvist	e93a0556e7	Merge pull request #1471 from vantoan8x/securityLevel_antiscript_option ... add security level antiscript option, use rich html format but dont permit script element.	2020-07-12 10:58:08 +02:00
Knut Sveidqvist	12668b78b9	Merge pull request #1535 from 72636c/feature/er_classes ... Add classes to ERD elements	2020-07-12 10:52:30 +02:00
Knut Sveidqvist	8255088508	Merge pull request #1534 from 72636c/feature/er_use_max_width ... Add `er.useMaxWidth` config option	2020-07-12 10:51:00 +02:00
Knut Sveidqvist	e66f7f012e	Merge pull request #1533 from 72636c/feature/config_flowchart_diagram_padding ... Add `flowchart.diagramPadding` config option	2020-07-12 10:49:31 +02:00
Ryan Ling	3e38da2120	Document er defaults	2020-07-11 20:50:36 +10:00
Ryan Ling	f2e7c82231	Fix table alignment	2020-07-11 20:44:46 +10:00
Ryan Ling	20e56d7dfa	Add classes to ERD elements ... It's a little hard to style the current ERDs. This aims to make things easier by associating a distinct class with each type of element within the diagram. I've added a common `er` class across the elements so that those that bring their own `themeCSS` can target styles at this diagram type. This hasn't really been done elsewhere so I'm open to suggestions; an alternative may be to add classes to a top-level element so that we can do e.g. `svg.mermaid.er .entityBox`.	2020-07-11 20:34:57 +10:00
Ryan Ling	13225faa9e	Update docs	2020-07-11 18:59:43 +10:00
Ryan Ling	99cb752c71	Add er.useMaxWidth config option ... This restores the option of rendering an ERD with an absolute width, which is consistent with the approach taken with the other diagram types. This logic was lost in #1324, which was probably just a small oversight: 9199546dca (diff-7c38d27acbe0676d923bf19283671616L397-L409) The option defaults to true for backwards compatibility.	2020-07-11 18:54:26 +10:00
Ryan Ling	5da4ced8c1	Add flowchart.diagramPadding config option ... This option lets you customise the padding around the whole flowchart. It is equivalent to `er.diagramPadding` and defaults to 8px for backwards compatibility with the current hardcoded value.	2020-07-11 16:54:00 +10:00
Chris Moran	c390e9e877	Merge pull request #1529 from cmmoran/develop ... Missed test case for allowing site owner to append to `secure` field set	2020-07-09 06:32:16 -04:00
chris moran	dee47ec978	Missed test case for allowing site owner to append to secure field set ... Missed logic for default-appending src array values where not existing within dst array in assignWithDepth function	2020-07-08 08:41:35 -04:00
Toan	fce2a16e42	add security level antiscript option, to let use rich html format but remove all script element.	2020-07-05 23:04:22 +07:00
Knut Sveidqvist	5242672efb	Adding configuration docs to setup.md and bumping version to 8.6.0	2020-07-04 14:25:14 +02:00
Knut Sveidqvist	5c043dd908	Merge pull request #1525 from mermaid-js/bug/1524_message_text_vertical_pos ... Bug/1524 message text vertical pos	2020-07-04 12:46:24 +02:00
Knut Sveidqvist	19ed03c44c	#1524 Updated tests	2020-07-04 12:35:34 +02:00
Knut Sveidqvist	32b2ee8cab		2020-07-04 11:13:54 +02:00
Knut Sveidqvist	7e9ab546eb	Fix for broken build, issue with config use in flowcahart and gantt diagram	2020-07-02 22:34:13 +02:00
Knut Sveidqvist	2af1f9a9d3	Fix for broken build, issue with config use in flowcahart and gantt diagram	2020-07-02 22:27:03 +02:00
Knut Sveidqvist	b6d6d3c980	Merge pull request #1523 from mermaid-js/feature/1483_long_messages ... Directives, sequenceDiagram refactor, config normalization, many tweaks	2020-07-02 18:39:25 +02:00
Knut Sveidqvist	c655cfaca8	Merge branch 'develop' into feature/1483_long_messages	2020-07-02 18:38:37 +02:00
Knut Sveidqvist	b3a465dbca	Merge branch 'develop' into feature/1483_long_messages	2020-07-02 18:25:49 +02:00
Knut Sveidqvist	33d3bc53b4	Merge pull request #1519 from cmmoran/develop ... Utils - memoize, calculateTextDimensions (and friends), assignWithDepth, etc	2020-07-02 17:01:24 +02:00
Knut Sveidqvist	be9da3928b	Updated mermaidAPI.md from PR	2020-07-02 16:59:09 +02:00
Knut Sveidqvist	a9fd557c4e	Merge branch 'NeilCuzon-patch-8' into develop	2020-07-02 16:57:00 +02:00
Knut Sveidqvist	faac22f6ed	Lint fix	2020-07-02 16:56:30 +02:00
Chris Moran	35a47093ab	Merge pull request #1522 from cmmoran/feature/1483_long_messages ... Fixed dark theme (sequenceDiagram) sequenceNumbers color	2020-07-01 07:59:17 -04:00
chris moran	01a2d90e38	sequence numbers for dark mode should probably be black since the circle is the contrast color	2020-07-01 07:53:03 -04:00
Chris Moran	1cc2e74a03	Merge pull request #1521 from cmmoran/feature/1483_long_messages ... added hasBreaks and splitBreaks to common.js	2020-07-01 07:44:37 -04:00
chris moran	ca86ab71f2	added hasBreaks and splitBreaks to common.js ... updated parseMessage to set wrap: true when breaks are detected	2020-07-01 07:41:44 -04:00
Chris Moran	ee425d278c	Merge pull request #1520 from mermaid-js/develop ... Merging changes from develop into feature/1483_long_messages	2020-07-01 06:34:48 -04:00
chris moran	1c3c2b6a74	utils refactor ... - memoize to poor-man-cache properly-ish - wrapLabel, calculateTextDimensions (and friends) moved to utils for all to enjoy - drawSimpleText getTextObj moved to utils to support the functions listed above - assignWithDepth - Object.assign but depth-ier - random - for crypto random numbers	2020-07-01 06:20:53 -04:00
Chris Moran	9952f7734a	Merge pull request #1518 from cmmoran/feature/1483_long_messages ... Feature/1483 long messages	2020-07-01 05:36:11 -04:00
chris moran	2ffb2988bf	One small refactor to fix activation starty ... Ensure a minimum amount of space between wrapped / non-wrapped title text and the next element	2020-07-01 05:34:53 -04:00
chris moran	fda1d7c4c5	Merge remote-tracking branch 'upstream/feature/1483_long_messages' into feature/1483_long_messages	2020-07-01 04:49:15 -04:00
Chris Moran	19519ac74e	Merge pull request #1 from mermaid-js/develop ... Merge upstream	2020-07-01 04:47:47 -04:00
Chris Moran	eb3f62fd90	Merge pull request #1517 from cmmoran/feature/1483_long_messages ... Feature/1483 long messages	2020-07-01 04:46:27 -04:00
Neil Cuzon	891b362e7d	Update mermaidAPI.js ... -Added tables into the comments from mermaidAPI.md, to reflect documentation that I had added through a previous PR, #1509 -as per @knsv 's directions, added comments here. -also found a list of parameters, who's documentation do not come out in the markdown file. I left them alone, but will be raising a separate issue, for others to review.	2020-07-01 01:35:25 -07:00
chris moran	cbb69bd3cb	() => is not the same as function() {} smh ... Fixed a few of the text rendering issues	2020-07-01 04:34:29 -04:00
Knut Sveidqvist	200a3e5e8c	Merge pull request #1498 from mermaid-js/feature/1424_dark_mode_in_docs ... Feature/1424 dark mode in docs	2020-06-30 16:54:06 +02:00
Knut Sveidqvist	0fab2dc24f	Merge pull request #1499 from maiconschmitz/patch-1 ... Update README.md	2020-06-30 16:34:34 +02:00
Knut Sveidqvist	a48654f195	Merge pull request #1503 from NeilCuzon/patch-4 ... Update sequenceDiagram.md	2020-06-30 16:31:20 +02:00
chris moran	174b098724	loop/opt/alt/etc titles should always wrap	2020-06-30 07:54:51 -04:00
Chris Moran	ecb4671e0d	Merge pull request #1513 from cmmoran/feature/1483_long_messages ... conf.messageFont() would have a different cacheKey based on the cache…	2020-06-30 07:21:39 -04:00
chris moran	6c6f6838ee	conf.messageFont() would have a different cacheKey based on the cacheKey calculations done in this particular branch. This will be normalized with the memoize PR about to be created.	2020-06-30 07:18:28 -04:00
Chris Moran	b4414758a7	Merge pull request #1512 from cmmoran/feature/1483_long_messages ... math is hard sometimes?	2020-06-30 06:47:50 -04:00
chris moran	5b37536ce5	math is hard sometimes?	2020-06-30 06:42:29 -04:00
Chris Moran	3365fa174d	Merge pull request #1511 from cmmoran/feature/1483_long_messages ... Fixed config *font helpers	2020-06-30 06:24:36 -04:00
chris moran	d42b95bab9	messageFont, noteFont, and actorFont getConfig() calls were not specifying the sequence object ... take into account width of message over single actor for actors' max message width	2020-06-30 06:20:45 -04:00