Commit Graph

303 Commits

Author SHA1 Message Date
Knut Sveidqvist d8da24804f #1724 Adding fontawesome to edge labels 2020-10-15 19:29:37 +02:00
Knut Sveidqvist c2c5cc45fa Merge remote-tracking branch 'refs/remotes/origin/1726_graphDef_linkStyle'
Conflicts:
	cypress/platform/knsv.html
2020-10-15 19:04:48 +02:00
Knut Sveidqvist 7404e436d2 #1726 Handling think lines 2020-10-15 19:00:35 +02:00
Knut Sveidqvist 4812437519 2020-10-15 18:42:58 +02:00
Knut Sveidqvist 6df9bf36e5 Work in progress 2020-10-15 17:49:39 +02:00
Knut Sveidqvist f108099623 2020-10-15 17:37:16 +02:00
Knut Sveidqvist 582a045457 #1704 Test and lint 2020-10-07 20:43:52 +02:00
Knut Sveidqvist 4b2d98129e #1704 handling of subgraph data 2020-10-07 20:43:31 +02:00
Ashish Jain 93bf8d7414 #1696 Fix for custom cssClass test cases for classDiagram 2020-09-23 20:16:06 +02:00
Ashish Jain c04dac65ac #1693 Added support for custom cssClass and styling to classDiagram-v2 2020-09-23 19:27:09 +02:00
Ashish Jain a26c9fca1e #1676 Fix for additonal usecases for flowchart 2020-09-16 21:53:17 +02:00
Knut Sveidqvist 2a6372cabe #1676 Handling vertices starting with a number 2020-09-16 20:09:02 +02:00
Knut Sveidqvist c8c4554299 #1676 Adding click support and tooltip support for flowchart 2020-09-12 10:56:23 +02:00
Knut Sveidqvist 9d8c867de8 #1676 Adding click support to the new rendering engine and classDiagram-v2 2020-09-10 20:58:16 +02:00
Ashish Jain 28c01f6476 Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two 2020-09-09 18:43:53 +02:00
Knut Sveidqvist 4f8e242dac 2020-09-06 22:34:13 +02:00
Knut Sveidqvist 9106c6ad52 #1602 Update of handling of nested subgraphs 2020-09-02 20:34:24 +02:00
Knut Sveidqvist a82c53dd2e Not moving the label away from assigned position 2020-08-29 16:11:42 +02:00
Knut Sveidqvist 0cbd002667 #1607 Using correct config when to decide about sanitizing text 2020-08-23 20:02:51 +02:00
Knut Sveidqvist 6b23c71bb5 Use courier in all rendering tests 2020-08-16 21:49:36 +02:00
Knut Sveidqvist ba6d73fc17 Debug of fonts in percy renderings 2020-08-16 13:01:45 +02:00
Knut Sveidqvist 888b1fb021 #1613 #1495 Adding support for edge length to flowchart (beta) 2020-08-16 08:45:44 +02:00
Knut Sveidqvist 129b3f9004 Cherry pick of config changes 2020-08-14 07:34:42 +02:00
Knut Sveidqvist 677c6d9f89 Release 8.7.0 2020-08-09 14:02:57 +02:00
Knut Sveidqvist 87f12c7d5a Updated with a small example of a custom theme 2020-07-31 16:04:12 +02:00
Knut Sveidqvist e9e9b13df0 Added themeVariable references and som adjustments in base theme calculations. 2020-07-31 15:05:51 +02:00
Knut Sveidqvist 5565aab488 #1590 Theme base tweaked for custom theming 2020-07-30 19:18:18 +02:00
Knut Sveidqvist a5b01c3f6f #1542 Adding gantt to showcases 2020-07-30 08:34:41 +02:00
Knut Sveidqvist ecea0f90d4 #1542 Handling of config 2020-07-29 22:19:23 +02:00
Knut Sveidqvist a4bf85b1b6 #1542 Making sure config and directives works for overriding theme variables using initialize call or directives + tests 2020-07-29 18:38:59 +02:00
Knut Sveidqvist f0ed170b04 #1542 Setting up base theme for custom theming 2020-07-27 11:51:20 +02:00
Knut Sveidqvist 5a7d770a58 #1542 Setting up base theme for custom theming 2020-07-27 10:01:34 +02:00
Knut Sveidqvist 01d7a33230 Merge branch 'master' into develop 2020-07-26 22:37:10 +02:00
Knut Sveidqvist 95b7e4f9ad Theme tweaks 2020-07-26 14:09:48 +02:00
Knut Sveidqvist 8dd0fe3c40 Adding showcases 2020-07-26 11:50:36 +02:00
Knut Sveidqvist b1f0797a1f Updated test 2020-07-26 08:20:45 +02:00
Knut Sveidqvist 62acc18e7d Merge of cherry pick 2020-07-26 08:03:56 +02:00
Knut Sveidqvist 06d80032fe #1578 Fetching updated configuration before use 2020-07-26 08:00:43 +02:00
Ashish Jain 71af9741cc Correct positioning for class title 2020-07-22 21:25:01 +02:00
Ashish Jain c9d4cac3ff Merge branch 'develop' into feature/Issue-1465_Class_migration 2020-07-22 19:33:20 +02:00
Ashish Jain a2932a0393 Merge branch 'master' into develop 2020-07-22 19:30:55 +02:00
Ashish Jain 24e470a099 Merge branch 'develop' into feature/Issue-1465_Class_migration 2020-07-22 18:23:47 +02:00
Ashish Jain 8e72ddde32 #1552 Update current.html for cardinality test 2020-07-22 18:20:31 +02:00
Ashish Jain abe23250c4 Adjusting initial classDiagram shape rendering 2020-07-21 15:25:16 +02:00
Knut Sveidqvist 211d6f4005 2020-07-21 11:15:42 +02:00
Knut Sveidqvist 936d5821f9 Merge 2020-07-18 20:12:10 +02:00
Knut Sveidqvist 08064c4243 #1542 Adding khroma for color manipulations 2020-07-18 15:15:50 +02:00
Knut Sveidqvist e8af778962 #1542 Updated test 2020-07-18 13:52:51 +02:00
Knut Sveidqvist 062126c43d Test page for directives 2020-07-17 12:44:42 +02:00
Knut Sveidqvist f9667cd80f #1542 Test page using directoives to switch theme 2020-07-17 12:34:33 +02:00
Knut Sveidqvist 65c2f58a66 #1542 Test page using directoives to switch theme 2020-07-17 09:31:42 +02:00
Knut Sveidqvist 030b945828 #1542 Theme variables setup 2020-07-17 09:16:39 +02:00
Knut Sveidqvist fd4240b774 #1542 Setting theme options as the regular options 2020-07-16 23:39:38 +02:00
Knut Sveidqvist 8c0e022b44 Template for dynamic styles in place 2020-07-16 20:27:42 +02:00
Knut Sveidqvist da8e75f98a Merge from master with doc updates 2020-07-16 12:27:03 +02:00
Knut Sveidqvist bbc9532444 #1454 Adding showcase diagrams rendered with the different themes 2020-07-15 14:02:19 +02:00
Knut Sveidqvist 3a9306a9c2 #1485 Setting proper font settings in the root css 2020-07-15 12:12:57 +02:00
Knut Sveidqvist 686ee1e349 Relase 8.6.0 2020-07-13 16:39:52 +02:00
Knut Sveidqvist dc2f9c304d Font fix for rendering tests - back to noto font 2020-07-12 15:25:01 +02:00
Knut Sveidqvist 462d5c3b12 Font fix for rendering tests 2020-07-12 14:56:27 +02:00
Knut Sveidqvist 39e90a20da Font fix for rendering tests 2020-07-12 12:21:17 +02:00
Knut Sveidqvist 32b2ee8cab 2020-07-04 11:13:54 +02:00
Ashish Jain b190a0eaba Added support for classDiagram relation arrow markers 2020-06-24 21:45:19 +02:00
Ashish Jain 85d4f2843e Initial commit for classDiagram v2 2020-06-24 19:34:12 +02:00
Knut Sveidqvist b3f9bbe50f
Merge branch 'develop' into 1474_missplaced_transitions 2020-06-19 11:38:30 +02:00
Knut Sveidqvist e37c7e58cf
Merge pull request #1479 from chewnoill/chewy/cleanup-after-failed-render
cleanup helper dom elements before rendering
2020-06-19 11:29:46 +02:00
Knut Sveidqvist a4d96b032e Diagram showing sequence diagram with long message text 2020-06-19 11:01:54 +02:00
Knut Sveidqvist 44d5009538 Revert of PR #1482 2020-06-19 10:52:20 +02:00
will cohen d3d15b79fb cleanup helper dom elements before rendering 2020-06-17 17:54:01 -04:00
Knut Sveidqvist c95257f32c #1474 Adding some tests 2020-06-17 18:28:49 +02:00
Knut Sveidqvist f0162557c5 #1474 Handling transitions 2020-06-17 18:16:24 +02:00
Knut Sveidqvist a251029546 #§473 Font update for e2e tests 2020-06-15 22:42:33 +02:00
Knut Sveidqvist b5d457daa9 Testcommit 2020-06-15 22:26:11 +02:00
Knut Sveidqvist bd0210cdce 1473 Updated config handling 2020-06-15 01:11:56 +02:00
Knut Sveidqvist 6559cfd0e1 #1466 Handling line styles using the new rendering engine 2020-06-13 13:12:33 +02:00
Knut Sveidqvist 85a8feec9d Also fix for error handling when setting mermaid.parseError 2020-06-06 12:42:35 +02:00
Knut Sveidqvist b76e833ea5 #1436 Correcting intersection calculations for circles 2020-05-30 18:04:46 +02:00
Knut Sveidqvist 3bdb9f289f Merge branch 'master' into develop 2020-05-30 17:11:23 +02:00
Knut Sveidqvist 8603cf89b0 #1418 Fix for descriptions in states 2020-05-27 22:18:59 +02:00
Knut Sveidqvist 4ea6c98f43 #1418 Adding support for htmlLabels in stateDiagram (v2) 2020-05-27 20:41:59 +02:00
Knut Sveidqvist 39bdf261c6 2020-05-27 19:38:30 +02:00
Knut Sveidqvist 9da027cf74 Fix for intersect issues for start/end state 2020-05-17 09:34:56 +02:00
Knut Sveidqvist c21b61bbd2 Bug fixes in new functionality, intersections not taken into account in nodes used by new graph engine. Graph flowchart not usable when integrating using mermaid.core. Incorrect flwochart docs 2020-05-16 19:58:22 +02:00
Knut Sveidqvist 9a3ec31191 #1386 Adding support for click events and links 2020-05-06 18:51:12 +02:00
Knut Sveidqvist a20e6086cc #1386 Adding subroutine support for new rendering engine 2020-05-03 21:52:44 +02:00
Knut Sveidqvist 67aed51742 #1382 Fix for lost parentage for nodes in deep structure 2020-05-01 19:18:07 +02:00
Knut Sveidqvist 397f57accb
Merge pull request #1334 from russellgeraghty/feature/user-journey
Feature/user journey
2020-04-26 17:17:33 +02:00
Knut Sveidqvist 507582f40b #1295 Bugfix for descriptions 2020-04-26 16:01:17 +02:00
Knut Sveidqvist fd37edc53f #1295 Adding support for forks and joins 2020-04-26 10:07:25 +02:00
Knut Sveidqvist 5662c06a33 #1295 Adding support for multiline descriptions for states 2020-04-26 09:47:47 +02:00
Knut Sveidqvist 0aede618ec #1295 Adding support for multiline descriptions for states 2020-04-25 17:01:20 +02:00
Knut Sveidqvist 59f3d2a11e #1295 Fix for edges in subgraphs and handling of concurrent states in statediagram-v2 2020-04-22 20:03:41 +02:00
Russell Geraghty 249a14f84a Merge remote-tracking branch 'upstream/develop' into feature/user-journey 2020-04-17 07:30:53 +01:00
Knut Sveidqvist c3f2e8dde1 #1295 Render fix for flowchart, correct marker handling and some cleanup 2020-04-16 19:44:11 +02:00
Knut Sveidqvist 704d56d193 #1295 Updates mermaid-graphlib 2020-04-13 16:25:10 +02:00
Knut Sveidqvist 22e17172dd #1295 Recursive rendering, draft 2020-04-11 17:16:01 +02:00
Knut Sveidqvist 8455db6fae #1295 Moving graph operations into mermaid-graplib and adding tests 2020-04-10 07:27:04 +02:00
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
Knut Sveidqvist 933cc333cc #1295 Backwards compatability 2020-03-30 22:08:48 +02:00
Knut Sveidqvist 240077ffe8 #1295 Adding note support to state diagrams 2020-03-29 14:20:49 +02: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 17f06564a2 #1295 Added the flowchart shapes 2020-03-18 22:08:19 +01: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
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 c43f791b29 #1223 Removing/updating some logging, adding current.html to .gitignore 2020-01-29 20:44:15 +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 4ad354a561 #1216 Fix for issue when mermaid freezes the browser tab due to large diagrams 2020-01-25 13:35:11 +01:00
Knut Sveidqvist 33916cfbd3 Adding interaction tests for gantt callbacks with arguments 2020-01-01 12:03:29 -08: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 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 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
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 eec45dfff9 Merge branch 'release/8.4.3' 2019-12-01 07:52:44 +01:00
Knut Sveidqvist e9aa037230 Removed loggin 2019-11-27 20:15:21 +01:00
Knut Sveidqvist f6028b63b6 #1078 Using the configuration of the arrowMarkerAbsolute 2019-11-20 19:06:46 +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
MATSUDA Takashi f7a3c42da1 e2e support multiple diagram 2019-11-05 17:54:52 +09: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 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 fe1e09f06b Merge branch 'feature/945_state_diagrams' 2019-10-09 18:16:32 +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
Knut Sveidqvist 244be86207 E2e test of interaction in graphs 2019-09-18 19:42:19 +02:00
Knut Sveidqvist 9f87ab4941 #927 Adding support for cypress and Percy 2019-09-11 18:53:05 +02:00