5d7ef149aa
Merge pull request #1161 from wfnuser/fix/typos-in-flowDb
...
Error typos in flowDb
2019-12-26 16:26:02 +01:00
7ce0974767
#891 Clicking on a link only works directly on the node text
2019-12-26 15:38:53 +01:00
7b12c7a07d
Fix infinite loop caused by date iteration
2019-12-24 19:01:29 -08:00
4eedeebd46
other/typos in flowDb
2019-12-24 16:14:42 +08:00
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
3abd77a1e6
Extend the `br` tag regex
...
This extends the `br` tag regex to accommodate an arbitrary amount of
any type of whitespace instead of a single space character, which holds
more closely to the HTML spec[1]
This extends the fix to #702 added in #1153
[1]: http://www.w3.org/TR/REC-xml/#sec-starttags
2019-12-23 08:02:11 -08:00
d96b79a9ba
Merge pull request #1153 from GDFaber/bug/702_br_tags_in_sequence_diagrams
...
Bug/702 br tags in sequence diagrams
2019-12-23 10:04:30 +01:00
233520b797
#702 improve handling of different "br" tag notations for multiline texts in sequence diagrams
2019-12-21 20:39:32 +01:00
ec742d3180
fix git graph not clearing
2019-12-20 14:48:36 -05:00
1bc62cfba4
Merge pull request #1150
2019-12-19 13:45:21 -05:00
028d9a2667
changes tick contrast for gantt chart
2019-12-19 09:52:46 -07:00
a4e7305d52
#834 Adding unit tests and rendering tests
2019-12-18 19:13:56 +01:00
5716d163ec
Merge branch 'develop' into other/1143_utilze_browser_console_object_better
2019-12-18 18:41:14 +01:00
42ef035241
#834 Using space as separator, simplfifying the grammar some more, reomving some logging
2019-12-18 18:36:34 +01:00
6598b1b10d
#1143 Adding support in grammar for multiple nodes in dependency declarations
2019-12-15 18:10:52 +01:00
4ff4058244
#1142 Simplified arrows/edges in the grammar
2019-12-15 13:34:35 +01:00
26fac9507e
#1143 Fixing up the color putput of the logger
2019-12-15 09:50:24 +01:00
aa2f9622f8
Merge branch 'issue-552' of https://github.com/itprdev/mermaid into itprdev-issue-552
2019-12-11 21:10:11 +01:00
5eb50cb2b6
Merge pull request #1132 from GDFaber/develop_Bugfixes_linkStyle_910_1088
...
Flow: Bugfixes for link style
2019-12-11 20:04:32 +01:00
f6ef6ff7db
Merge pull request #1130 from GDFaber/develop
...
Flow: Add stadium shape for nodes
2019-12-11 19:48:47 +01:00
de8c6d5572
Merge branch 'develop' into 1104(b)-SupportForAbstractMethodInClassDiagram
2019-12-11 10:31:27 -08:00
5b4e95484e
Merge pull request #1120 from jgreywolf/1063-GenericTypeSupportInClassDiagrams
...
Class: Generic type support
2019-12-11 19:09:19 +01:00
d504e00e18
Adds simple tests for parsing callbacks wrt args
2019-12-10 18:27:06 -05:00
74c8e7fad9
another style fix
2019-12-10 15:21:25 -08:00
4b781d3827
remove extra space
2019-12-10 15:18:26 -08:00
9fbcc5c32d
Code style fix
2019-12-10 15:12:37 -08:00
c7ec8190fb
Gantt callback: default to node id as callback arg
2019-12-10 15:25:28 -05:00
2eaa7f1ab6
Generic Type support for classes
...
Fixed typos after refactor
2019-12-10 11:39:25 -08:00
608445e64f
#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle
2019-12-10 03:51:37 +01:00
1f4be77662
Revert "#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle" - Sorry, forgot to push to a new branch.
...
This reverts commit 0deae4abf9
2019-12-10 03:48:12 +01:00
0deae4abf9
#910 set correct position and style for edge labels when using linkStyle, #1088 handle multiline texts in edge labels when using linkStyle
2019-12-10 03:34:40 +01:00
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
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
9a0df5afb0
#723 Add stadium shape for flowchart nodes
2019-12-08 16:51:47 +01:00
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
ab191abd5a
#903 Fix for broken build
2019-12-07 15:06:44 +01:00
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
6a9b251be1
Fix code style errors
2019-12-06 20:35:22 -08:00
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
9fe0aa0604
Merge pull request #1116 from mermaid-js/bug/1110_state_diagram_rendering_composit_state
...
Bug/1110 state diagram rendering composit state
2019-12-04 19:15:06 +01:00
5c71a3c85b
#1110 Fix for transparent rect under edge title, was misaligned
2019-12-04 18:20:28 +01:00
94e768dd01
#1110 Cleanup and removal of loggings
2019-12-04 18:04:56 +01:00
0fb91d6bcc
#1110 Fixing height issue
2019-12-03 23:38:51 +01:00
02854881b4
#1110 Zoom in a bit
2019-12-03 22:48:55 +01:00
4254781391
Adjusted imports
2019-12-03 22:09:43 +01:00
5a38562bfc
#1110 Handling case with concurrency lines
2019-12-03 20:59:17 +01:00
fcd1e106a5
#1110 Handling case when title is less wide then subgraph
2019-12-02 21:22:22 +01:00
346328156a
#1110 Adding tests for this case and some calcuations for width
2019-12-02 21:10:37 +01:00
de8f8b02dc
Merge branch 'master' into develop
2019-12-01 07:54:02 +01:00
eec45dfff9
Merge branch 'release/8.4.3'
2019-12-01 07:52:44 +01:00
cb07a729e5
Merge pull request #1098 from mermaid-js/feature/1053_documentation-update
...
Feature/1053 documentation update
2019-12-01 00:42:41 +01:00
78e4fead49
Feature request 552. Gnatt chart task with multiple dependencies
2019-11-28 16:53:33 +02:00
bea2e73b82
#1065 Updated dependency of dagre-d3 to unofficial release
2019-11-27 19:09:14 +01:00
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
b57492c1c6
Initial checkin
2019-11-26 11:22:21 -08:00
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
9a87ff684d
Removed logging
2019-11-20 19:33:42 +01:00
f79fc21bfc
Merge branch 'develop' into bug/1078_handling_of_arrowMarkerAbsolute
2019-11-20 19:22:10 +01:00
087e5eaa32
#1055 Fix for tests
2019-11-20 19:21:19 +01:00
cbd27831df
#1078 Lint fixes
2019-11-20 19:14:32 +01:00
f6028b63b6
#1078 Using the configuration of the arrowMarkerAbsolute
2019-11-20 19:06:46 +01:00
a60e01db97
Corrected typo in test
2019-11-19 13:02:08 -08:00
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
3f8f9f6711
#1055 Better selectors
2019-11-08 20:15:48 +01:00
d01f494277
Merge branch 'master' into develop
2019-11-08 19:32:54 +01:00
1542e15a1b
Introduction and getting started howtos
2019-11-07 23:15:53 +01:00
48ce7a9b78
#1023 Fix for tests
2019-11-07 19:19:44 +01:00
09bf54f9af
#1038 Updated prefix for the internal dom id
2019-11-07 19:14:06 +01:00
a3017b8456
Merge branch 'release/8.4.1'
2019-11-06 10:52:10 -08:00
aac915b285
#1044 fix: Multiple class diagrams are not rendered correctly
2019-11-05 18:00:52 +09:00
427aea73e7
test pass with underscore in a class name
2019-10-29 17:39:15 +01:00
c4436b7a1e
ALPHA pattern now include underscore
2019-10-29 17:20:25 +01:00
034a7c424d
#1033 Better handling of multiline notes
2019-10-27 17:16:29 +01:00
b113436055
#1033 Fix for diagram bounds and viewbox
2019-10-27 16:58:32 +01:00
e550d974da
Merge pull request #1032 from knsv/bug/1031_stricter_code_checks
...
Fix for Bug/1031 stricter code checks
2019-10-27 15:33:48 +01:00
bc34ef4b66
Merge pull request #1028 from knsv/Issue-1027_Pie-Chart-Legends
...
#1027 Updated Pie chart to render percentages and labels separately …
2019-10-27 15:26:54 +01:00
a5cc1e804b
#1031 Adding stricter code checks
2019-10-27 15:24:56 +01:00
8f8638fb7c
#1029 Linting fixes
2019-10-24 19:46:42 +02:00
d1c74070ab
#1029 Fix for issues after switching to master branch of dagre-d3
2019-10-24 19:33:13 +02:00
66152b42ae
#1023 New line in transition labels, basic support
2019-10-23 21:16:59 +02:00
76c8737485
#1027 Updated Pie chart to render percentages and labels separately as legends
2019-10-23 21:00:33 +02:00
4a1eb55127
#1022 Fix for long names for state diagrams
2019-10-23 19:22:36 +02:00
c87637c6f4
#1024 Removal of leftover loggings
2019-10-23 18:47:41 +02:00
ca5e60b38b
Use dagre-d3 master branch (for d3v5)
2019-10-21 22:46:20 +05:30
2a2fd7a8b1
Small gramatical mistake
2019-10-21 22:46:18 +05:30
0157f665a3
Merge branch 'release/8.4.0'
2019-10-19 07:59:04 -07:00
7adb80b35b
Fixes after verification, font-family set to label of transitions in statediagram
2019-10-19 14:43:26 +02:00
dc88e7a2c2
Fixes after verification, documentation of stateDiagram
2019-10-19 14:42:34 +02:00
1b813d371d
Small gramatical mistake
2019-10-16 10:08:24 +03:00
0ce42e6185
Merge pull request #994 from edekadigital/bug-478
...
#478 API crashes on 2nd render() call
2019-10-15 19:40:29 +02:00
3709d9d5c8
Merge pull request #996 from edekadigital/bug-783
...
#783 Hard to customize font-size for gantt charts
2019-10-15 19:38:20 +02:00
e65f916ba5
Merge pull request #992 from edekadigital/enhancement-958
...
#958 Cannot center-justify text in nodes
2019-10-15 18:54:28 +02:00
f9c8ce1ac7
Merge branch 'master' into develop
2019-10-15 18:50:11 +02:00
b881e5c69c
Merge pull request #991 from christopherkade/feature/divided-flow-tests
...
#906 Divided flow unit tests
2019-10-15 18:43:39 +02:00
51a89c80aa
Merge pull request #985 from knsv/bug/984_bracket_syntax_properties_reversed_order
...
bug/984 Class diagram: properties with bracket syntax are reversed in order
2019-10-15 18:39:20 +02:00
069b4854f8
#478 API crashes on 2nd render() call
...
- remove element from DOM before rendering to avoid conflicts in case of rerendering
2019-10-15 17:36:02 +02:00
f089c45115
#958 Cannot center-justify text in nodes
...
- changed fit() to it() to reactivate test
2019-10-15 16:02:11 +02:00
90fe015d68
#958 Cannot center-justify text in nodes
...
- assign text-align style to text node to allow aligning of node text
2019-10-15 16:02:11 +02:00
96c86fd4b2
#783 Hard to customize font-size for gantt charts
...
- deselect theme style if font-size is set on the taskText element (e.g. via gantt-config)
2019-10-15 15:59:36 +02:00
89b6ccf47d
#906 Divided flow unit tests
2019-10-14 16:17:43 +02:00
047ce2949a
#989 Added font styling classes to diagrams lacking then
2019-10-13 19:16:35 +02:00
53bdfee057
#989 Font configuration
2019-10-12 16:53:21 +02:00
2da55993e0
Test of font-settings for correct image snapshots
2019-10-12 09:16:33 +02:00
a258eda035
#945 Setting up stylesheet, classes and colors
2019-10-11 18:12:24 +02:00
7c125cf9d6
#945 Moving hardcoded sizes etc to config
2019-10-11 15:39:50 +02:00
031c0b7b21
#945 Increasing size, handling forks and joins in multiple directions
2019-10-10 20:55:27 +02:00
ce017ecd40
Merge branch 'master' of github.com:knsv/mermaid
2019-10-10 17:57:39 +02:00
85e58faa78
#945 White background and forks in composite mode
2019-10-10 17:57:29 +02:00
f8f52c4587
Fix for viewport in classDiagram and stateDiagram renndering
2019-10-09 21:15:17 +02:00
54e6e2f66e
#945 Some bug fixes and draft docs
2019-10-09 20:05:24 +02:00
fe1e09f06b
Merge branch 'feature/945_state_diagrams'
2019-10-09 18:16:32 +02:00
f180510fbb
Merge pull request #983 from knsv/feature/Issue-949_Add_cardinality_support
...
Feature/issue 949 add cardinality support
2019-10-08 23:06:17 +02:00
687e74de9b
fixed members order
2019-10-08 22:59:59 +02:00
35ddf9235f
#949 Added rendering of cardinality for class diagrams
2019-10-08 21:43:58 +02:00
554189908d
Merge pull request #970 from mearns/issue-530-hexagon
...
Add hex shape for flow charts
2019-10-08 21:43:10 +02:00
54dbbd154c
#949 Added utility function for calculating cardinality position
2019-10-08 21:42:49 +02:00
a9224015e0
Merge pull request #964 from volkanunsal/master
...
Add useMaxWidth to flowRenderer
2019-10-08 21:33:50 +02:00
1cba50266e
#755 Linting fixes + merge
2019-10-08 14:25:29 +02:00
ae7852d9b9
Merge branch 'master' into feature/755_handling_br_in_sequence_diagram
2019-10-08 14:18:55 +02:00
6b4a8325ae
Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop
2019-10-08 12:49:52 +02:00
ebede9b910
#945 Log removal
2019-10-06 16:06:15 +02:00
b12791d3e0
#945 Divider lines for concurrency, full width when in a composit state
2019-10-06 15:53:34 +02:00
ce0b0fa0c8
#945 Divider lines for concurrency
2019-10-06 15:44:31 +02:00
dce09586cd
#945 Support for forks and joins
2019-10-06 14:11:17 +02:00
4f1186a610
#945 Support for notes, better width and handling of +/-
2019-10-06 11:35:46 +02:00
1cb52a602a
#945 Support for notes
2019-10-06 10:52:37 +02:00
c9fe948b90
#530 Finished basic unit tests for flow shapes
2019-10-05 13:48:20 -04:00
cc731fe3c4
#530 Pull shape functions out to shorten functions
2019-10-05 09:38:03 -04:00
9da61ad562
added some documentation
2019-10-05 12:38:29 +02:00
3b731282e3
#945Renabling support for descriptions
2019-10-05 12:15:14 +02:00
cfc14ade2a
#945 Some more cleanup focusing on stateDb
2019-10-05 10:02:58 +02:00
d4306e61c2
#945 Some cleanup
2019-10-05 09:02:20 +02:00
dcbcbf40a0
#530 Started adding some tests around how flowchart shapes are rendered in SVG
2019-10-04 22:38:27 -04:00
9a0a5ca804
#530 Add some unit tests for flowRenderer.addVertices
2019-10-04 22:03:20 -04:00
20b2866631
#530 Further encapsulation of common code
2019-10-04 21:21:00 -04:00
612df99c34
added tests + alt syntax
2019-10-04 23:49:58 +02:00
912e850db4
added grammar
2019-10-04 21:49:02 +02:00
96735dd543
Added rendering for annotations
2019-10-04 21:09:49 +02:00
65cbfbdb40
#945 Tweaking
2019-10-03 19:54:07 +02:00
7865fd4f02
#945 Rendering of composite state in a box
2019-10-03 19:08:15 +02:00
c9f84ccae5
#530 Testing Coverage
2019-10-03 06:41:36 -04:00
01fd54dd6f
#530 Encapsulate some redudant flow shape code
2019-10-02 22:51:12 -04:00
e1446ce38a
#530 Add unit test for hex nodes
2019-10-02 22:44:56 -04:00
550f91aa68
#530 Better shaping of hexagon
...
The "corner" triangles are a fixed ratio to the height,
so the triangles will always be mathemtically similar.
2019-10-02 22:36:02 -04:00
b300a4decb
#530 Fit hexagon to width and height
...
The hexagon shape in flow chart now fits
the width and height independently, so it can better fit
large content without taking up too much space.
2019-10-02 22:23:30 -04:00
51e902cd36
Added the hex shape to the renderer, and support for it in the flow parser.
...
Need to work on properly sizing it.
2019-10-02 22:11:02 -04:00
f9f8785aef
#945 Recursive object from parsing and stateDb
2019-10-02 19:32:13 +02:00
0abeaa4dc2
Merge branch 'feature/945_state_diagrams' into develop
2019-10-02 19:17:38 +02:00
9ca077b3dc
Add some test coverage for getBranchesAsObjArray
2019-10-01 22:29:07 -04:00
351dd3728e
#848 - Add Unit Test
2019-10-01 22:03:43 -04:00
054901cb79
Fixes #848 - Use more secure PRNG
...
Math.random() is not cryptogaphically secure, but the crypto-random-string
package provides what is needed with a cryptographically secure pseudo-random
number generator.
2019-10-01 21:29:42 -04:00
94afcfb6f9
#945 Rendering of state descriptions
2019-09-29 15:50:43 +02:00
682faa4f9d
Add useMaxWidth to flowRenderer
2019-09-29 09:31:41 -04:00
3cffd1e3ed
#945 Rendering of labels and new label positioning algorithm
2019-09-28 13:31:10 +02:00
095233e6cf
Flowchart parsing issue with CRLF #894
2019-09-27 01:05:25 +02:00
13baa43081
#945 Rendering from diagram data
2019-09-25 21:29:32 +02:00
fad76ad534
#945 Rendering of start & end node
2019-09-25 21:01:21 +02:00
6110640fc2
Merge pull request #940
...
Use https in githu urls
2019-09-23 09:44:20 -04:00
6c243488fa
revert to http
2019-09-23 12:06:22 +02:00
4f218435e3
revert to http
2019-09-23 12:05:13 +02:00
7ca13fd163
revert to http
2019-09-23 12:04:39 +02:00
2306534248
#945 Handling of dimples state definitions
2019-09-22 03:30:36 -07:00
2f0248e6d5
#945 Handling of note statements
2019-09-22 02:38:04 -07:00
3a8564de92
#945 Handling of fork statements
2019-09-21 23:19:03 -07:00
1aa8b9b804
#945 Handling recursive logn descriptions for states with quotes
2019-09-21 11:31:09 -07:00
921d5464a1
#945 Handling recursive logn descriptions for states with quotes
2019-09-21 09:12:02 -07:00
9993b90a20
#945 Handling recursive state statements
2019-09-21 08:54:18 -07:00
6f054519e7
#945 Handling simple state statements
2019-09-21 08:50:32 -07:00
51bf4a4c5c
#945 Parsing happy case and scale/hide statements
2019-09-21 08:19:55 -07:00
be2e467583
Release 8.3.1. Reseting the flow parser between parsings
2019-09-19 15:00:21 -07:00
f39e120952
#941 Fix for issue with directions iin flowchart
2019-09-19 13:56:41 -07:00
f30f607b0c
feat(https): use https in SVGs
2019-09-19 20:53:42 +02:00
d8397f146b
#937 Handling direction keywords in node ids
2019-09-18 12:56:24 -07:00
e192454f54
Correctly document htmlLabels as true by default
...
The "mermaidAPI configuration defaults" section in the documentation
listed `htmlLabels` as `false`, but the real default is `true`, as
seen in the code and elsewhere in the documentation.
2019-09-18 13:05:08 +02:00
7e5802e799
#931 Last code standard fixes
2019-09-12 12:59:13 -07:00
0e8164d805
#931 Compliacne with code standard
2019-09-12 12:58:57 -07:00
f9b30bdb43
#931 Reformatting for compliacne with code standard
2019-09-12 12:58:32 -07:00
34de31195f
#931 Aligning with code standard
2019-09-12 12:58:04 -07:00
cf05a8d8fa
#931 Updating code to align witn new code standard
2019-09-12 12:57:36 -07:00
a2e3f3d900
#931 Reformatting code for gitGraph
2019-09-12 12:56:54 -07:00
e67b8c86d6
#931 Aligning code standard
2019-09-12 12:55:31 -07:00
e14922f15c
#931 Aligning code standard
2019-09-12 12:55:20 -07:00
ad5669b523
#931 Aligning code standard
2019-09-12 12:55:10 -07:00
f2a6ba80b5
#931 Aligning code standard
2019-09-12 12:54:59 -07:00
398d66bda9
#22 Update SCSS for pie chart specific title class
2019-09-11 21:39:39 +02:00
42fc23cff2
#22 Basic Pie Chart
2019-09-11 21:20:28 +02:00
ec7324e12e
Restore documention written in autoigenerated file
2019-09-11 20:03:22 +02:00
e37f5a6eb2
#926 Applying the color styling on the label instead of the node
2019-09-08 02:56:06 -07:00
21aa8c5f15
#922 Fix for click binding on nodes with ids starting with a number
2019-09-03 11:31:47 -07:00
2cb54293f8
Lint fixes
2019-09-01 02:18:00 -07:00
5610185050
#918 Removed som logging
2019-09-01 00:45:24 -07:00
699bd61045
#918 Fix for issue with nodes starting with a number in a subgraph
2019-09-01 00:44:48 -07:00
c43d58d3c9
#916 Allow chaining of vertice in flowcharts
2019-08-28 20:25:54 +02:00
c6efddee87
#755 lint fixes
2019-08-28 20:13:37 +02:00
f6377e6125
#755
2019-08-28 20:09:45 +02:00
4ae48f4284
#915 Reviving the possibility to use underscore in text in vertices
2019-08-28 17:34:57 +02:00
a48a306fe8
#914 Fix for issue identifying node wehen the id of the node starts with a digit
2019-08-27 12:16:11 -07:00
06a91d8564
#835 Backwords compatible syntax for associating classes with nodes/vertices
2019-08-26 20:10:44 +02:00
a3142aad69
Adding some test pages
2019-08-20 20:07:12 +02:00
980749536b
Fix for issue with bindFunctions being called when there are none.
2019-08-20 18:42:19 +02:00
Christian Klemm