215e930da4
#1295 Markers implmented, the gereric pattern and diagram specific for flowcharts.
2020-03-16 07:55:02 +01:00
5b74d75011
#1295 Arrow head start
2020-03-14 18:13:34 +01:00
9266eaef16
#1295 Small fix for import
2020-03-14 17:49:02 +01:00
963a0ce6ef
#1295 Edges between subgraphs
2020-03-14 17:38:35 +01:00
5f5e453fb3
Small for for merge issue
2020-03-14 08:56:47 +01:00
35ea4d1a00
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-03-14 08:44:49 +01:00
10583610bd
Lint fixes
2020-03-14 08:36:49 +01:00
ad288be2ee
1295 Lint fixes
2020-03-14 08:24:45 +01:00
1e498eccb6
Change rendering algorithm
2020-03-11 22:17:11 +00:00
da048cbc7b
1295 Handling labels of clusters
2020-03-11 20:25:55 +01:00
7bd5529bb7
1295 Support for subgraphs with wide labels
2020-03-11 19:52:57 +01:00
1b64af143e
#1295 Drawing edges between nodes
2020-03-11 17:36:30 +01:00
bab4649a1e
Use markers with rounded crows feet
2020-03-10 13:48:53 +00:00
29b6e00071
clean up for eslint
2020-03-09 12:36:43 +00:00
9aacc85a16
Working experimental version using markers
2020-03-08 22:22:33 +00:00
aa32d454c9
#1295 First draft of generic renderer applied to flowcharts.
2020-03-08 09:49:41 +01:00
061045016f
Minor tidy up of prototype code
2020-03-07 11:05:56 +00:00
25e2d78311
#1295 Start renderer
2020-03-04 20:35:59 +01:00
1e2d014ac9
Basic rendering for ER diagrams
2020-03-03 21:44:18 +00:00
6985391437
Minor clean up for eslint
2020-03-02 11:46:07 +00:00
e90f58a0a7
Merge branch 'develop' into feature/117_er_diagram
2020-03-02 10:48:32 +00:00
0555fca5d8
Initial parsing logic for ER diagrams
2020-03-02 10:03:55 +00:00
94ace2348f
Revert "Multiline comments"
2020-02-29 21:32:20 +01:00
de11dc43ab
Merge pull request #1285 from mermaid-js/bug/1269_fix_label_background_on_safari
...
Bug/1269 fix label background on safari
2020-02-29 15:49:23 +01:00
756927b6f8
#1269 Fix for build issue - lint
2020-02-29 15:39:21 +01:00
e62027b73c
Multiline comments
2020-02-27 00:02:25 +01:00
0ee9c69ddf
#1269 Work around for inaccurate bounding box results in Safari. Fix for multiple lines
2020-02-26 20:53:08 +01:00
dd5e6c18d5
#1269 Work around for inaccurate bounding box results in Safari.
2020-02-26 20:01:53 +01:00
8758bd57ca
Merge pull request #1274 from GDFaber/bug/apply_default_class_to_flowchart_nodes
...
Fix applying default class to flowchart nodes
2020-02-25 19:20:52 +01:00
d67e49400f
#684 Fix applying default class to flowchart nodes
2020-02-24 01:31:39 +01:00
6d74c5663f
1169- break out getRows
...
Moved getRows function from `state/stateRenderer.js` and `state/shapes.js` into `common/common.js`. Broke out section into small one line functions for replacing line breaks, then moved the `sanitize` function from `utils.js` to this new module as there is shared functionality
2020-02-21 13:49:05 -08:00
89c1853977
#1261 Removed calls to console.log
2020-02-21 09:50:04 +01:00
f8137ea7c1
#1257 Adding the autonumber keyword + tests and docs
2020-02-16 15:26:08 +01:00
00d2a1fe9f
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:42:13 +01:00
18d0d435c6
Merge pull request #1241 from jgreywolf/1240-ClassDiagramRefactor
...
1240 class diagram refactor
2020-02-05 19:42:01 +01:00
f298c154e2
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-02-05 19:40:18 +01:00
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
a0e7789d50
#962 added color setting for default link style
2020-02-04 22:07:10 +01:00
c825b37cc6
1240-refactor for class renderer
...
prep for future functionality work
2020-02-03 16:04:59 -08:00
2dd4aa31e5
#962 moved "style from array" function to utils.js, added unit test
2020-02-04 00:24:50 +01:00
c95adfaf74
#962 Set text color for flowchart link labels according to linkStyle definitions
2020-02-02 22:59:59 +01:00
963a0fcd77
Merge branch 'develop' into 1179-SupportGenericTypesForMembers
2020-01-29 21:08:31 +01:00
c43f791b29
#1223 Removing/updating some logging, adding current.html to .gitignore
2020-01-29 20:44:15 +01:00
4709195a1d
#1223 Adding support for multiple transitions to a node from another node
2020-01-29 19:57:59 +01:00
0082c23a90
#1217 Better matchingof words beginning with as as matching token AS in stateDiagram's state definition.
2020-01-29 19:05:51 +01:00
d571c7e08e
Merge pull request #1225 from jgreywolf/1058-ClassDiagramScaling
...
1058 class diagram scaling
2020-01-27 20:14:39 +01:00
5ea6bd5980
Merge branch 'develop' into bug/1218_fix_link_click_events
2020-01-27 20:06:00 +01:00
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
0921007d92
1058-Set diagram dimensions appropriately
...
Make sure height and width are set so that all of the diagram is displayed
2020-01-27 10:27:05 -08:00
c7b46f4fba
#1218 Fix anchor and script support in link click events
2020-01-26 16:56:42 +01:00
4ad354a561
#1216 Fix for issue when mermaid freezes the browser tab due to large diagrams
2020-01-25 13:35:11 +01:00
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
d2d4a24229
#487 Set text color for flowchart nodes according to style definitions
2020-01-24 01:24:47 +01:00
c38f053294
#1212 Class definition is not applied to flowchart nodes with links
2020-01-19 18:10:14 +01:00
921d274579
Merge pull request #1208 from mermaid-js/feature/Issue-1206_Parsing_Crashing_Browser_In_Class_Diagram
...
Feature/issue 1206 parsing crashing browser in class diagram
2020-01-15 20:55:21 +01:00
99469f8404
#1206 Added test case to verify parsing fails to allow EOF until first '{' is closed
2020-01-15 20:34:41 +01:00
417d2c0336
#1206 Added test case to verify parsing fails to allow another '{' until first one is closed
2020-01-15 20:33:23 +01:00
2a3de1a090
#1206 Updated the classDiagram JISON to not allow EOF or another '{' until first one is closed
2020-01-15 20:29:13 +01:00
d9318c5af3
#1205 Adding parsing exception for then an inactive participant is inactivated
2020-01-15 20:27:31 +01:00
0e02cf5c86
Merge pull request #1195 from fgrandel/bug/1193_allow_multiple_relations
...
fix(#1193 ): render multiple relations
2020-01-15 09:29:02 -08:00
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
c564a843fa
Merge pull request #1202 from GDFaber/bug/1200_unify_regex_for_br_tags
...
Unify regex for finding <br> tags throughout mermaid
2020-01-15 16:53:06 +01:00
efa810da91
Merge pull request #1199 from GDFaber/bug/fix_mermaidAPI_configuration_example_in_the_docs
...
Fix mermaidAPI configuration example in the docs
2020-01-15 16:50:11 +01:00
c0e1c90497
Merge pull request #1198 from GDFaber/bug/add_docs_and_defaults_for_node_spacing
...
Add docs and default values for node spacing in mermaidAPI
2020-01-15 16:48:58 +01:00
b1bfdec473
#1196 Keep flowchart node label text (if already defined) when a style is applied
2020-01-14 23:37:30 +01:00
244f423baf
Merge pull request #1194 from fgrandel/bug/1192_relation_cut_off
...
fix(#1192 ): relation got cut off
2020-01-14 09:35:00 -08:00
5493fadc9e
#1200 Unify regex for finding <br> tags throughout mermaid
2020-01-13 22:04:47 +01:00
36f9eca33e
Example 2 is not shown in mermaidAPI configuration section of the docs
2020-01-12 14:38:57 +01:00
4dd90e56b1
Add docs and default values for node spacing in mermaidAPI
2020-01-12 14:09:24 +01:00
fa1331ffd5
Fix after removing other code
2020-01-10 10:24:04 -08:00
57b5b9a7a6
Added conditional to fallback to old style
2020-01-10 09:50:21 -08:00
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
0af5e0b795
Address code style issues
2020-01-10 09:50:21 -08:00
d7771eb4b6
1119 Add ability to define return type for methods
...
Updated ClassRenderer to check for `[]` to indicate return type for method. Small refactor to split out logic for determining method display text and style. Updated documentation
2020-01-10 09:50:21 -08:00
75890f88fa
fix( #1193 ): render multiple relations
2020-01-09 17:00:34 +01:00
9a6b07e1e1
fix( #1192 ): relation got cut off
2020-01-09 16:24:47 +01:00
ce02d1dc98
Merge pull request #1190 from mermaid-js/Issue-1092_Mangled_Multiple_Class_Diagrams
...
#1092 Fix for mangling of multiple classDiagrams
2020-01-08 21:05:42 +01:00
48c345a403
#1092 Fix for mangling of multiple classDiagrams
2020-01-08 20:48:57 +01:00
ffbf9f265f
#1182 : remove "newDagreD3" switch from the flowchart renderer
2020-01-08 20:27:33 +01:00
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
1cfd93640c
#743 handle multiline section titles in gantt diagrams
2020-01-08 13:50:58 +01:00
b3934c9788
#1152 add node spacing to flowchart configuration
2020-01-05 22:03:53 +01:00
37ae863443
Merge pull request #1170 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-05 12:07:34 +01:00
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
38097c9095
code style
2020-01-02 11:27:56 -08:00
7f31e624ca
Addressing code style issues
2020-01-02 11:24:06 -08:00
e6fbfcb1e8
1064 Adding tooltip and function calls to click evens in class diagrams
2020-01-02 11:06:29 -08:00
190353785e
#1146 Added jest test for dash line (dependecy) parsing
2020-01-02 19:51:25 +01:00
f2a5d92398
#1146 Added stroke-dasharray style for Dependency relation
2020-01-02 19:29:17 +01:00
b14c768fa2
#1146 Fix for dashed line (Dependency) support for classDiagram
2020-01-02 19:25:31 +01:00
4e6aad5115
#834 Using & as a separator for the multiple nodes
2020-01-02 18:52:50 +01:00
7bd1408de0
Merge pull request #1165 from jgreywolf/1064-ClickEventInClassDiagram
...
1064 click event in class diagram
2020-01-02 08:10:48 -08:00
d63eb396e1
Fix code style issues
2020-01-02 07:59:36 -08:00
a1626927cc
Merge pull request #1136 from keenanjt33/feature/921_callback_params
...
Gantt: Add support for callback with parameters
2020-01-01 00:29:00 -08:00
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
2db8075e3f
Merge pull request #1163 from GDFaber/bug/891_make_link_clickable_on_the_entire_node
...
Bug/Clicking on a link only works directly on the node text
2019-12-31 07:58:47 -08:00
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
d5e9f2e23e
Merge pull request #1156 from gene1wood/extend_br_tag_regex
...
Extend the `br` tag regex
2019-12-31 07:56:21 -08:00
bc59d015e6
#1154 Flow diagram DB shape request
2019-12-31 16:30:03 +01:00
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
Knut Sveidqvist