Russell Geraghty
e4a2d7dfb7
Updated API
2020-04-04 17:50:02 +01:00
Russell Geraghty
f081527731
User journey handler
2020-04-04 16:38:30 +01:00
Knut Sveidqvist
cff68fc062
#1295 Better way of finding suitable child in cluster to point to
2020-04-02 19:48:28 +02:00
Knut Sveidqvist
365c741864
#1295 Fix for intersection calculation for edges to clusters and adding concurrency in stateDiagrams as clusters
2020-04-02 19:35:12 +02:00
Adrian Hall
9d5303c59d
Prevent un-labelled edges that are left of the left-most vertex from being cut off the diagram
2020-04-02 15:29:12 +01:00
Knut Sveidqvist
933cc333cc
#1295 Backwards compatability
2020-03-30 22:08:48 +02:00
Knut Sveidqvist
a5af248715
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-30 19:15:17 +02:00
Knut Sveidqvist
240077ffe8
#1295 Adding note support to state diagrams
2020-03-29 14:20:49 +02:00
Adrian Hall
9199546dca
Alter ERD syntax for compatibility with PlantUML
2020-03-29 08:42:20 +01:00
Knut Sveidqvist
5fbb69e7c5
#1295 Styling of composite states
2020-03-28 17:34:23 +01:00
Knut Sveidqvist
85f47e1693
#1295 Styling of start/end nodes, arrows and regular states
2020-03-28 13:59:41 +01:00
Knut Sveidqvist
159a3a3706
#1295 Start shape and handling of setting a unique start id per cluster level
2020-03-25 20:16:27 +01:00
Knut Sveidqvist
5b302ae2e6
#1295 Applying new rendering engine for stateDiagrams
2020-03-22 21:45:14 +01:00
Knut Sveidqvist
02b19fed27
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-22 14:44:43 +01:00
Knut Sveidqvist
17f06564a2
#1295 Added the flowchart shapes
2020-03-18 22:08:19 +01:00
Adrian Hall
d3f78299e7
Add integration tests, basic docs, and fix multi-diagram bug
2020-03-18 16:53:26 +00:00
Knut Sveidqvist
215e930da4
#1295 Markers implmented, the gereric pattern and diagram specific for flowcharts.
2020-03-16 07:55:02 +01:00
Knut Sveidqvist
5b74d75011
#1295 Arrow head start
2020-03-14 18:13:34 +01:00
Knut Sveidqvist
963a0ce6ef
#1295 Edges between subgraphs
2020-03-14 17:38:35 +01:00
Knut Sveidqvist
ad288be2ee
1295 Lint fixes
2020-03-14 08:24:45 +01:00
Knut Sveidqvist
da048cbc7b
1295 Handling labels of clusters
2020-03-11 20:25:55 +01:00
Knut Sveidqvist
7bd5529bb7
1295 Support for subgraphs with wide labels
2020-03-11 19:52:57 +01:00
Knut Sveidqvist
1b64af143e
#1295 Drawing edges between nodes
2020-03-11 17:36:30 +01:00
Knut Sveidqvist
aa32d454c9
#1295 First draft of generic renderer applied to flowcharts.
2020-03-08 09:49:41 +01:00
Knut Sveidqvist
25e2d78311
#1295 Start renderer
2020-03-04 20:35:59 +01:00
Knut Sveidqvist
0ee9c69ddf
#1269 Work around for inaccurate bounding box results in Safari. Fix for multiple lines
2020-02-26 20:53:08 +01:00
Knut Sveidqvist
dd5e6c18d5
#1269 Work around for inaccurate bounding box results in Safari.
2020-02-26 20:01:53 +01:00
Marc Faber
d67e49400f
#684 Fix applying default class to flowchart nodes
2020-02-24 01:31:39 +01:00
Knut Sveidqvist
50c71ebb01
#1261 Removal of emojis making rendering tests give false warnings from time to time
2020-02-21 10:08:52 +01:00
Knut Sveidqvist
aad080aa1b
Merge pull request #1259 from mermaid-js/bug/1257_autonumbering
...
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 17:13:59 +01:00
Knut Sveidqvist
3dd0c537ee
Font update for e2e tests
2020-02-16 15:39:52 +01:00
Knut Sveidqvist
f8137ea7c1
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 15:26:08 +01:00
Knut Sveidqvist
f298c154e2
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:40:18 +01:00
Knut Sveidqvist
822df37f8c
#1224 Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs
2020-02-05 19:39:50 +01:00
Marc Faber
a0e7789d50
#962 added color setting for default link style
2020-02-04 22:07:10 +01:00
Marc Faber
c95adfaf74
#962 Set text color for flowchart link labels according to linkStyle definitions
2020-02-02 22:59:59 +01:00
Knut Sveidqvist
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers
2020-01-29 21:08:31 +01:00
Knut Sveidqvist
c43f791b29
#1223 Removing/updating some logging, adding current.html to .gitignore
2020-01-29 20:44:15 +01:00
Knut Sveidqvist
ec90537181
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 20:01:21 +01:00
Knut Sveidqvist
4709195a1d
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 19:57:59 +01:00
Knut Sveidqvist
5ea6bd5980
Merge branch 'develop' into bug/1218_fix_link_click_events
2020-01-27 20:06:00 +01:00
Knut Sveidqvist
ea29b67c5c
Merge pull request #1221 from mermaid-js/bug/1216_dodging_huge_diagrams
...
#1216 Fix for issue when mermaid freezes the browser tab due to large…
2020-01-27 20:01:54 +01:00
Marc Faber
c7b46f4fba
#1218 Fix anchor and script support in link click events
2020-01-26 16:56:42 +01:00
Knut Sveidqvist
4ad354a561
#1216 Fix for issue when mermaid freezes the browser tab due to large diagrams
2020-01-25 13:35:11 +01:00
Justin Greywolf
587592449a
1179 Add ability to use generics for members
...
Created new class to handle parsing of members with regex to handle determining type of member and the different elements within. Also moved addTSpan in drawClass method to this new file. Finally, I added a "catch all" section in case something fails in the regex to make sure everything gets formatted correctly.
Added more tests and documentation
updating gitignore
Tired of constantly having to ignore files and stash/pop when switching between branches
2020-01-24 16:01:04 -08:00
Marc Faber
d2d4a24229
#487 Set text color for flowchart nodes according to style definitions
2020-01-24 01:24:47 +01:00
Marc Faber
c38f053294
#1212 Class definition is not applied to flowchart nodes with links
2020-01-19 18:10:14 +01:00
Knut Sveidqvist
45277affe8
Merge pull request #1204 from GDFaber/bug/1196_keep_flowchart_label_text_when_style_is_applied
...
Keep flowchart node label text (if already defined) when a style is applied
2020-01-15 18:27:48 +01:00
Marc Faber
b1bfdec473
#1196 Keep flowchart node label text (if already defined) when a style is applied
2020-01-14 23:37:30 +01:00
Marc Faber
5493fadc9e
#1200 Unify regex for finding <br> tags throughout mermaid
2020-01-13 22:04:47 +01:00
Justin Greywolf
58fbfc3c38
1119 Support method return types
...
Small refactor to split out logic for determining method display text and style. Updated documentation
Used regex to parse method statements in class diagrams to extract discrete elements to set display appropriately. Added tests and updated docs
2020-01-10 09:50:21 -08:00
Knut Sveidqvist
144f65c459
Merge pull request #1176 from GDFaber/feature/1152_flowchart_node_spacing
...
Feature/Add node spacing to flowchart configuration
2020-01-08 18:16:03 +01:00
Marc Faber
1cfd93640c
#743 handle multiline section titles in gantt diagrams
2020-01-08 13:50:58 +01:00
Marc Faber
b3934c9788
#1152 add node spacing to flowchart configuration
2020-01-05 22:03:53 +01:00
Knut Sveidqvist
f57356006d
Merge pull request #1171 from mermaid-js/feature/Issue-1146_Dashed_Line_For_Class_Diagram
...
Feature/issue 1146 dashed line for class diagram
2020-01-05 12:02:36 +01:00
Ashish Jain
96fc0d043e
#1146 Added cypress test for dash line (dependecy) rendering
2020-01-02 19:57:11 +01:00
Knut Sveidqvist
4e6aad5115
#834 Using & as a separator for the multiple nodes
2020-01-02 18:52:50 +01:00
Knut Sveidqvist
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-02 08:10:48 -08:00
Knut Sveidqvist
33916cfbd3
Adding interaction tests for gantt callbacks with arguments
2020-01-01 12:03:29 -08:00
Knut Sveidqvist
75e2abe242
Merge pull request #1166 from GDFaber/feature/flowchart_add_cylindric_shape
...
#1154 Flow diagram DB shape request
2020-01-01 00:24:56 -08:00
Knut Sveidqvist
413876644c
Merge pull request #1162 from sdankel/bug/1060_date_infinite_loop
...
Fix infinite loop caused by date iteration
2019-12-31 07:57:16 -08:00
Marc Faber
bc59d015e6
#1154 Flow diagram DB shape request
2019-12-31 16:30:03 +01:00
Justin Greywolf
2decf94ad0
1064- Add click functionality to class diagrams
...
modified interaction functionality from flowcharts to work with class diagrams
2019-12-30 17:27:20 -08:00
Sophie Dankel
7b12c7a07d
Fix infinite loop caused by date iteration
2019-12-24 19:01:29 -08:00
Gene Wood
b4f9dd46a9
Add tests for <br \t> case
...
This adds tests for the case where
* multiple pieces of whitespace are used
* one of those whitespace characters is a tab
2019-12-23 08:52:15 -08:00
Marc Faber
233520b797
#702 improve handling of different "br" tag notations for multiline texts in sequence diagrams
2019-12-21 20:39:32 +01:00
Knut Sveidqvist
a4e7305d52
#834 Adding unit tests and rendering tests
2019-12-18 19:13:56 +01:00
Knut Sveidqvist
4ff4058244
#1142 Simplified arrows/edges in the grammar
2019-12-15 13:34:35 +01:00
Knut Sveidqvist
fcf20215a6
#552 Adding rendering test
2019-12-11 21:12:48 +01:00
Knut Sveidqvist
1811318dea
#1088 Adding rendering tests
2019-12-11 20:17:51 +01:00
Justin Greywolf
363d49b655
Renumber render tests
2019-12-11 10:34:51 -08:00
Justin Greywolf
de8c6d5572
Merge branch 'develop' into 1104(b)-SupportForAbstractMethodInClassDiagram
2019-12-11 10:31:27 -08:00
Knut Sveidqvist
5b4e95484e
Merge pull request #1120 from jgreywolf/1063-GenericTypeSupportInClassDiagrams
...
Class: Generic type support
2019-12-11 19:09:19 +01:00
Justin Greywolf
5b2f9351c7
Add support for abstract methods
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 18:13:06 -08:00
Justin Greywolf
6fdf30357c
1104-Add support to designate a method as abstract
...
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 17:41:26 -08:00
Knut Sveidqvist
d23ce9fb63
#935 Fix for stylink of links. Default theme colors are picked up and styling via themeCSS works
2019-12-08 10:10:03 +01:00
Knut Sveidqvist
ab191abd5a
#903 Fix for broken build
2019-12-07 15:06:44 +01:00
Knut Sveidqvist
c2e5e94b37
#903 Allowing >,< and = characters in svg. Updating xss tests to handle both htmlLabels and non htmlLabels
2019-12-07 12:19:45 +01:00
Justin Greywolf
2a41280076
Add support for Generic class definitions
...
Added support in parser to translate characters surrounded by `~` into generic type definition ie: `Class01~T~` would turn into `Class01<T>`
2019-12-05 12:59:22 -08:00
Knut Sveidqvist
5c71a3c85b
#1110 Fix for transparent rect under edge title, was misaligned
2019-12-04 18:20:28 +01:00
Knut Sveidqvist
94e768dd01
#1110 Cleanup and removal of loggings
2019-12-04 18:04:56 +01:00
Knut Sveidqvist
0fb91d6bcc
#1110 Fixing height issue
2019-12-03 23:38:51 +01:00
Knut Sveidqvist
346328156a
#1110 Adding tests for this case and some calcuations for width
2019-12-02 21:10:37 +01:00
Knut Sveidqvist
71c531240f
Merge pull request #1089 from jgreywolf/1073-CommentsInClassDiagrams
...
Bug/1073 Comments in class diagrams
2019-12-01 00:39:33 +01:00
Knut Sveidqvist
50ea9bda89
Removed loggin
2019-11-28 11:41:54 -05:00
Justin Greywolf
753bd7e1d9
Update class diagrams to handle comments
...
updated regex in parser to correctly handle comments in class diagrams. Also updated flowchart parser to remove unused elements for comments, as well as modifying the regex to match
2019-11-26 11:23:07 -08:00
Justin Greywolf
b57492c1c6
Initial checkin
2019-11-26 11:22:21 -08:00
Knut Sveidqvist
5736d523dd
Merge pull request #1081 from jgreywolf/Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Bug/1061 Cannot mark members as protected in class diagram
2019-11-21 20:54:15 +01:00
Justin Greywolf
5004b5723d
Added separate render test
2019-11-21 11:17:53 -08:00
Knut Sveidqvist
f6028b63b6
#1078 Using the configuration of the arrowMarkerAbsolute
2019-11-20 19:06:46 +01:00
Justin Greywolf
68c2ea38c9
Bug1061-CannotMarkMembersAsProtectedInClassDiagram
...
Using # to indicate protected status of a member or method causing parser error when not used inside class declaration brackets {}. Removed '#' from `LABEL` regex
2019-11-19 12:49:59 -08:00
Knut Sveidqvist
3f8f9f6711
#1055 Better selectors
2019-11-08 20:15:48 +01:00
Knut Sveidqvist
d01f494277
Merge branch 'master' into develop
2019-11-08 19:32:54 +01:00
Knut Sveidqvist
4db525c6a9
#1050 Merge of PR
2019-11-08 11:42:26 +01:00
Knut Sveidqvist
e313625ccb
Fixing the conflict
2019-11-08 08:54:48 +01:00
Ashish Jain
5b5be40dd5
Fixing the binding function error
2019-11-07 22:09:34 +01:00
Knut Sveidqvist
fa7d1ac554
#1023 Fix for interaction tests
2019-11-07 19:42:09 +01:00
Knut Sveidqvist
09bf54f9af
#1038 Updated prefix for the internal dom id
2019-11-07 19:14:06 +01:00
MATSUDA Takashi
7208f045c1
add test for multiple class diagram
2019-11-05 17:54:52 +09:00
MATSUDA Takashi
f7a3c42da1
e2e support multiple diagram
2019-11-05 17:54:52 +09:00
Ashish Jain
e4a2d2a290
Updated Jest test cases for Pie diagram
2019-10-30 18:29:26 +01:00
Knut Sveidqvist
034a7c424d
#1033 Better handling of multiline notes
2019-10-27 17:16:29 +01:00
Knut Sveidqvist
b113436055
#1033 Fix for diagram bounds and viewbox
2019-10-27 16:58:32 +01:00
Knut Sveidqvist
a5cc1e804b
#1031 Adding stricter code checks
2019-10-27 15:24:56 +01:00
Knut Sveidqvist
d1c74070ab
#1029 Fix for issues after switching to master branch of dagre-d3
2019-10-24 19:33:13 +02:00
Knut Sveidqvist
66152b42ae
#1023 New line in transition labels, basic support
2019-10-23 21:16:59 +02:00
Knut Sveidqvist
4a1eb55127
#1022 Fix for long names for state diagrams
2019-10-23 19:22:36 +02:00
Knut Sveidqvist
0ce42e6185
Merge pull request #994 from edekadigital/bug-478
...
#478 API crashes on 2nd render() call
2019-10-15 19:40:29 +02:00
Kolja Markwardt
d743838716
#478 API crashes on 2nd render() call
...
- add e2e test for (re)rendering by api
2019-10-15 17:36:02 +02:00
Knut Sveidqvist
047ce2949a
#989 Added font styling classes to diagrams lacking then
2019-10-13 19:16:35 +02:00
Knut Sveidqvist
53bdfee057
#989 Font configuration
2019-10-12 16:53:21 +02:00
Knut Sveidqvist
2da55993e0
Test of font-settings for correct image snapshots
2019-10-12 09:16:33 +02:00
Knut Sveidqvist
7a7c09493c
Adding more info about documentation and moving the contributing file to its proper place
2019-10-11 08:17:39 +02:00
Knut Sveidqvist
f3d588eca5
Adding contributing information
2019-10-11 08:10:54 +02:00
Knut Sveidqvist
85e58faa78
#945 White background and forks in composite mode
2019-10-10 17:57:29 +02:00
Knut Sveidqvist
54e6e2f66e
#945 Some bug fixes and draft docs
2019-10-09 20:05:24 +02:00
Knut Sveidqvist
fe1e09f06b
Merge branch 'feature/945_state_diagrams'
2019-10-09 18:16:32 +02:00
Ashish Jain
aaac86fd9d
#949 Added cypress test case for class diagram cardinality support
2019-10-08 21:46:03 +02:00
Ashish Jain
6b4a8325ae
Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop
2019-10-08 12:49:52 +02:00
Knut Sveidqvist
ce0b0fa0c8
#945 Divider lines for concurrency
2019-10-06 15:44:31 +02:00
Knut Sveidqvist
dce09586cd
#945 Support for forks and joins
2019-10-06 14:11:17 +02:00
Knut Sveidqvist
4f1186a610
#945 Support for notes, better width and handling of +/-
2019-10-06 11:35:46 +02:00
Knut Sveidqvist
1cb52a602a
#945 Support for notes
2019-10-06 10:52:37 +02:00
Knut Sveidqvist
3b731282e3
#945Renabling support for descriptions
2019-10-05 12:15:14 +02:00
Knut Sveidqvist
d4306e61c2
#945 Some cleanup
2019-10-05 09:02:20 +02:00
Christian Klemm
92eec664b1
test fix
2019-10-05 00:57:58 +02:00
Christian Klemm
723fe84383
added diagram escaping for e2e tests
2019-10-05 00:39:07 +02:00
Christian Klemm
3ca9347361
test fix
2019-10-05 00:05:47 +02:00
Christian Klemm
704d36a7eb
adjusted integration test
2019-10-04 23:58:06 +02:00
Knut Sveidqvist
65cbfbdb40
#945 Tweaking
2019-10-03 19:54:07 +02:00
Knut Sveidqvist
7865fd4f02
#945 Rendering of composite state in a box
2019-10-03 19:08:15 +02:00
Knut Sveidqvist
f9f8785aef
#945 Recursive object from parsing and stateDb
2019-10-02 19:32:13 +02:00
Knut Sveidqvist
94afcfb6f9
#945 Rendering of state descriptions
2019-09-29 15:50:43 +02:00
Knut Sveidqvist
3cffd1e3ed
#945 Rendering of labels and new label positioning algorithm
2019-09-28 13:31:10 +02:00
Knut Sveidqvist
fad76ad534
#945 Rendering of start & end node
2019-09-25 21:01:21 +02:00
Knut Sveidqvist
244be86207
E2e test of interaction in graphs
2019-09-18 19:42:19 +02:00
Knut Sveidqvist
21622f575b
Updating cypress tests
2019-09-18 18:25:06 +02:00
Ashish Jain
42fc23cff2
#22 Basic Pie Chart
2019-09-11 21:20:28 +02:00
Knut Sveidqvist
9f87ab4941
#927 Adding support for cypress and Percy
2019-09-11 18:53:05 +02:00