76b4b88e4b
#1295 Alternating graph directions for subgraphs
2020-04-26 12:57:45 +02:00
fd37edc53f
#1295 Adding support for forks and joins
2020-04-26 10:07:25 +02:00
5662c06a33
#1295 Adding support for multiline descriptions for states
2020-04-26 09:47:47 +02:00
0aede618ec
#1295 Adding support for multiline descriptions for states
2020-04-25 17:01:20 +02:00
e52d4ce033
#1295 Removing invalid title for concurrency clusters
2020-04-25 14:18:23 +02:00
b646672d3e
#1295 Fix for statediagram labels
2020-04-25 14:12:35 +02:00
a1a7d44fd7
#1295 for Multi line labels separated with \n
2020-04-25 14:12:04 +02:00
25ea221a6a
#1295 Rendering tests for stateDiagram v2
2020-04-25 14:11:05 +02:00
38ee4f556e
Added (& pretty-printed) sequence diagram docs
...
This commit adds documentation to new config variables that were
introduced as part of this PR, namely, the font settings for actors,
messages and notes.
I've also linted the markdown document.
2020-04-23 18:39:23 +03:00
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
5c902001b9
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-04-23 17:08:25 +03:00
5f6887b316
Sequence diagram fixes & improvements
...
This commit fixes some bugs, and I believe, improves upon the current
implementation.
In no particular order, it adds:
1. Control over note font size, family and alignment (now defaults to
center)
2. Dynamic actor resizing - actor's width will now scale if its
description is bigger than the static configured width
3. Dynamic actor margins - the margin between actors will now be
dynamically calculated by taking into account the width of connecting
messages or notes
4. Fixed a small visual annoyance where a loop arrow would intersect
with the text it loops on
5. Fixed a bug where if global config -> fontFamily wasn't defined, it
would override the actorFontFamily with an undefined
6. Removed some stale / commented out code
7. Added missing config variables to the global config object in mermaidAPI.js
8. Added messageFontSize, messageFontFamily to control message (non-note)
font settings
9. Memoized the actor widths in a pre-calculation that takes notes and
signals lengths into account
10. Removed redundant console.log lines
11. Extracted out actor width & margin calculation to getMaxMessageWidthPerActor, and
calculateActorMargins
2020-04-23 16:50:00 +03:00
45b96bd568
Merge pull request #1364 from dany74q/feature/extract-line-break-regex
...
Feature/Extracted out the commonly used line break regex
2020-04-23 07:13:57 +02:00
197d006860
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:55:28 +03:00
49f8aac6a9
Fixed outdated doc strings
...
This commit fixes some outdated docstrings, replacing the description
and @params where necessary.
2020-04-23 07:55:09 +03:00
22dd50a047
Extracted out the commonly used line break regex
...
This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
2020-04-23 07:20:47 +03:00
81d9b5afd6
#1295 Linting
2020-04-22 20:05:36 +02:00
59f3d2a11e
#1295 Fix for edges in subgraphs and handling of concurrent states in statediagram-v2
2020-04-22 20:03:41 +02:00
134a170a61
Update docs to include ER diagram descriptions
2020-04-17 14:24:44 +01:00
681f006ae1
Tiny tweaks to docs for ER diagram
2020-04-17 14:24:44 +01:00
36abfcc79b
Escape the pipes in the syntax table
2020-04-17 14:24:44 +01:00
249a14f84a
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-17 07:30:53 +01:00
10fdc45dea
Merge pull request #1356 from mermaid-js/feature/1295_generic_rendering_engine
...
Feature/1295 generic rendering engine
2020-04-16 20:16:37 +02:00
e8e7b419b5
#1295 Lint fixes
2020-04-16 19:57:56 +02:00
955fc58773
Merge pull request #1351 from adutton/patch-1
...
Show source code in later examples
2020-04-16 19:50:53 +02:00
2da3d83420
Merge pull request #1355 from spopida/develop
...
Update docs to include ER diagram descriptions
2020-04-16 19:50:05 +02:00
c3f2e8dde1
#1295 Render fix for flowchart, correct marker handling and some cleanup
2020-04-16 19:44:11 +02:00
4e4c80b7fa
Update docs to include ER diagram descriptions
2020-04-16 12:19:04 +01:00
3e776c8c41
Merge pull request #1353 from TomWright/mermaid-server
...
Add HTTP Server implementation to related projects.
2020-04-15 22:10:52 +02:00
7c82e4b6c1
Add mermaid-server to integrations.md
2020-04-15 21:00:47 +01:00
12d26d5a3d
Add HTTP Server implementation to related projects.
2020-04-15 19:29:17 +01:00
d228769b1b
Show source code in later examples
...
The first few examples on the page show source code but the later ones didn't
2020-04-14 15:15:10 -07:00
433f88b459
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-13 20:08:20 +01:00
704d56d193
#1295 Updates mermaid-graphlib
2020-04-13 16:25:10 +02:00
5f4da6e0bc
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-04-11 18:53:47 +02:00
0ce89d53d7
Adding ERD diagram section to the docs
2020-04-11 18:50:57 +02:00
5bdffd7d20
Merge branch 'master' into develop
2020-04-11 18:10:53 +02:00
5996920249
Merge branch 'release/8.5.0'
2020-04-11 18:03:42 +02:00
f0119085e4
Updating mermaid to version 8.5.0
2020-04-11 18:02:05 +02:00
22e17172dd
#1295 Recursive rendering, draft
2020-04-11 17:16:01 +02:00
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
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
a4a19845d4
Merge pull request #1335 from GDFaber/bug/1271_fix_autonumber_position_for_multiline_texts
...
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-11 14:01:24 +02:00
fffb0eafde
Merge pull request #1332 from Soptq/stateRenderer
...
Add useMaxWidth to stateRenderer
2020-04-11 11:58:22 +02:00
10f60e2807
Merge pull request #1346 from spopida/develop
...
Fix docs for ER diagrams
2020-04-10 16:18:49 +02:00
3db27e6017
Tiny tweaks to docs for ER diagram
2020-04-10 11:47:29 +01:00
91b64798bb
Escape the pipes in the syntax table
2020-04-10 11:40:39 +01:00
8455db6fae
#1295 Moving graph operations into mermaid-graplib and adding tests
2020-04-10 07:27:04 +02:00
530648e937
Trigger tests once more
2020-04-10 00:28:33 +02:00
7f67435cb9
#1343 Add flowchart subroutine node shape
2020-04-10 00:14:41 +02:00
Knut Sveidqvist