marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-21 15:09:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,419 Commits 225 Branches 188 Tags
0bf4aa3e82b646714e3d97b406eb3ac4a1d485ad
Commit Graph

196 Commits

Author SHA1 Message Date
Ashish Jain
38250af678 Merge from upstream mermaid to sync elk 0.1.7 2024-11-27 18:26:24 +01:00
Knut Sveidqvist
1e672868c4 #6088 Updated offset calculations 2024-11-27 17:05:58 +01:00
Ashish Jain
de08b8244f Merge from upstream mermaid to sync 11.4.1 2024-11-27 12:25:04 +01:00
Knut Sveidqvist
c7ae08abc3 #6080: Fix for issue with diamond intersections when using elk-layout 2024-11-25 17:15:35 +01:00
Knut Sveidqvist
d3b2c7ea18 Revert "#6080: Fix for issue with diamond intersections when using elk-layout" 
This reverts commit 255279eb22.
 2024-11-25 17:10:25 +01:00
Knut Sveidqvist
255279eb22 #6080: Fix for issue with diamond intersections when using elk-layout 2024-11-25 16:50:16 +01:00
Alois Klink
35fea81209 Merge remote-tracking branch 'origin/alana-11.4.0-megre'; commit '1388662132cc829f9820c2e9970ae04e2dd90588' into MC-2265/fix-failing-e2e-shapes-test 
Merges https://github.com/mermaid-js/mermaid/pull/6038 into
Mermaid Alana, fixing the broken E2E test.

See: https://github.com/mermaid-js/mermaid/pull/6038
See: https://mermaidchart.atlassian.net/browse/MC-2265
 2024-11-08 22:29:56 +09:00
Knut Sveidqvist
757627427b Fix for intersection issue 2024-11-08 13:47:39 +01:00
Ashish Jain
861599245d Merge from upstream mermaid os 11.4.0 develop 2024-11-07 13:58:42 +01:00
Knut Sveidqvist
73bbde8476 Update of the background-fix 2024-10-29 16:21:56 +01:00
Knut Sveidqvist
0af08276d2 #5232 Enabling handdrawn mode 2024-10-28 12:53:03 +01:00
Knut Sveidqvist
d790e353b0 #5432 Theme based text color for labels 2024-10-28 11:51:44 +01:00
Knut Sveidqvist
991d403d7f Typescript fixes 2024-10-10 09:47:52 -07:00
Knut Sveidqvist
290c678dc7 Adding ticket handling 2024-10-10 08:23:58 -07:00
Knut Sveidqvist
93f2c241b8 5432 WIP, rendering items 2024-10-06 19:22:07 +02:00
Knut Sveidqvist
fb44e769f2 5432 WIP, rendering sections 2024-10-06 18:34:24 +02:00
Knut Sveidqvist
fabdfd9ae8 5432 WIP, parsing works 2024-10-06 16:55:57 +02:00
Knut Sveidqvist
e67894fbb3 Adding config for chose edge type and adding debug option for curves. Mermaid version 11.2.0-b.3 2024-09-19 14:54:58 +02:00
Ashish Jain
48791aac13 Merge from upstream newShapes branch 2024-09-16 14:59:46 +02:00
Knut Sveidqvist
3730f1afbb Mermaid version b.10 2024-09-16 10:04:10 +02:00
Knut Sveidqvist
4162a25425 Fix for amp and adjusted tests 2024-09-12 16:58:52 +02:00
Knut Sveidqvist
8b6fb94835 WIP 2024-09-12 12:10:41 +02:00
Knut Sveidqvist
d1395d05e2 MC-1733 Reset layout 2024-09-10 13:39:13 +02:00
Ashish Jain
13b96ad6c0 Merge branch 'knsv/new-shapes' of github.com:mermaid-js/mermaid into neo-new-shapes 2024-09-06 14:59:14 +02:00
Knut Sveidqvist
6507624232 Fix for issues with self loops 2024-09-05 16:40:59 +02:00
Ashish Jain
b84617c915 Updated versions 2024-09-03 12:26:52 +02:00
Ashish Jain
ba978e86ae Merge from Upstream 2024-08-27 14:21:46 +02:00
Knut Sveidqvist
9cf562476a Tweaking the elk config and exposing elk.layered.cycleBreaking.strategy to mermaid configuration 2024-08-26 15:34:14 +02:00
Knut Sveidqvist
1483e9245e Merge remote-tracking branch 'os_repo/knsv/new-shapes' into neo-new-shapes 2024-08-26 12:17:37 +02:00
Knut Sveidqvist
47ac57be69 Removing the redundant element in the render function 2024-08-22 10:11:13 +02:00
Ashish Jain
a7b771a622 Merge from upstream new-shapes branch 2024-08-21 16:27:55 +02:00
Knut Sveidqvist
9134e1c837 #5237 Clean and fix for issue with edges to the diamond shape 2024-08-21 16:11:59 +02:00
Sidharth Vinod
50a535125e chore: Use default export 2024-08-21 15:29:08 +05:30
Knut Sveidqvist
43b038547e Merge remote-tracking branch 'os_repo/develop' into alanaV11 2024-08-13 14:08:55 +02:00
Knut Sveidqvist
7f9d4cd079 #5237 Fix for text alignment for handdrawn text using svg labels 2024-08-12 09:35:01 +02:00
Ashish Jain
58694ecd29 merge from upstream mermaid 2024-08-09 15:17:25 +02:00
Ashish Jain
d4d7ca7d65 review comment fixes 2024-08-09 15:07:09 +02:00
Ashish Jain
d7497c179e MC-1730 Fix for data-et as cluster 2024-07-08 14:52:07 +02:00
Knut Sveidqvist
4bd6e3a70c MC-1730 Selector for gradients 2024-06-18 15:58:50 +02:00
Knut Sveidqvist
ea87596363 Merge remote-tracking branch 'os_repo/5237-unified-layout-common-renderer' into alanaV11 2024-06-18 12:40:09 +02:00
Ashish Jain
406c0d869b Add support for custom cssStyle and compiledStyles for custom classDefs for flowchart 2024-06-18 11:48:24 +02:00
Knut Sveidqvist
ce7e738843 Merge remote-tracking branch 'os_repo/5237-unified-layout-common-renderer' into alanaV11 2024-06-18 11:19:56 +02:00
Knut Sveidqvist
83f2663f68 #5237 making styles take preceedence and adding test 2024-06-18 11:15:59 +02:00
Knut Sveidqvist
4838023a0b MC-1730 Latest fixes from mermaid 2024-06-13 17:02:49 +02:00
Knut Sveidqvist
ef83adb36e Merge branch '5237-unified-layout-common-renderer' of github.com:mermaid-js/mermaid into 5237-unified-layout-common-renderer 2024-06-13 14:27:16 +02:00
Knut Sveidqvist
926762a800 5237 Fixes after visual tests 2024-06-13 14:27:10 +02:00
Ashish Jain
fc17733770 #5237 Fix eslint error 2024-06-13 14:17:36 +02:00
Knut Sveidqvist
9fbad9c9c1 MC-1730 Applying look to nodes 2024-06-13 10:01:20 +02:00
Knut Sveidqvist
7c851bc849 Merge remote-tracking branch 'os_repo/5237-unified-layout-common-renderer' into alanaV11 2024-06-12 12:38:29 +02:00
Knut Sveidqvist
a35152843f #5237 Handling remaining references to useRough 2024-06-12 12:35:53 +02:00