marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-02 11:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,438 Commits 230 Branches 190 Tags
9114f65dbe792754c241abbfed9653f031eaaff7
Commit Graph

1532 Commits

Author SHA1 Message Date
Ashish Jain
6d73220348 Merge branch 'develop' of github.com:mermaid-js/mermaid into neo-new-shapes 2025-01-15 13:46:01 +01:00
Ashish Jain
1d9c2aab8d #6186 Fix for flowchart new syntax with link 2025-01-15 13:45:04 +01:00
Ashish Jain
e6d45da81e Merge from upstream mermaid OS develop 2025-01-15 12:58:13 +01:00
Ashish Jain
7809b5a93f #6186 Fixes the flowchaart node metadata syntax bugs 2025-01-14 14:07:25 +01:00
Knut Sveidqvist
9b00f1f2fb #5574 Adding support for edge ids and animations 2024-12-17 14:56:18 +01:00
Ashish Jain
38250af678 Merge from upstream mermaid to sync elk 0.1.7 2024-11-27 18:26:24 +01:00
Ashish Jain
64554a6c60 Merge pull request #6092 from mermaid-js/master 
Merge back master to develop
 2024-11-27 18:24:31 +01:00
Knut Sveidqvist
1e672868c4 #6088 Updated offset calculations 2024-11-27 17:05:58 +01:00
Sidharth Vinod
bff32827b5 Merge pull request #6064 from NicolasNewman/5952/architecture-extreme-height 
Fix: edge case causing extreme height in Architecture Diagrams
 2024-11-27 17:18:41 +05:30
Ashish Jain
de08b8244f Merge from upstream mermaid to sync 11.4.1 2024-11-27 12:25:04 +01:00
Ashish Jain
0dff4ca438 chore: broken link clean up. Enable flowchart elk tests 2024-11-27 09:49:26 +01:00
Knut Sveidqvist
37538310d3 Added cypress test 2024-11-25 17:15:59 +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
Nicolas Newman
082de76eef Merge branch 'mermaid-js:develop' into 5952/architecture-extreme-height 2024-11-16 09:55:48 -06:00
NicolasNewman
570ae78b15 cicd(#5952): added test case for diagram that instigated the issue 2024-11-15 10:28:50 -06:00
yari-dewalt
1598ac713f Update testing html files 2024-11-14 10:35:03 -08: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
Alois Klink
c7171fa7b1 test(e2e): fix state diagram useMaxWidth tests 
These tests assume that we're using `look: classic, theme: default`,
otherwise the widths are off.

However, since
3dc66a64c (MC-1730 Making neo the default theme, 2024-08-06),
`neo` is now the default look and theme in Alana Mermaid.

Fixes: 3dc66a64c7
 2024-11-07 22:13:21 +09: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
75ca802b62 Merge branch 'develop' into update-class-diagram 2024-10-29 10:40:39 +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
56cc3728c5 End to end tests and docs 2024-10-25 15:40:58 +02:00
Knut Sveidqvist
fb86e5c689 Merge branch 'develop' into knsv/5342-kanban 2024-10-25 14:56:46 +02:00
yari-dewalt
be3da0b39d Update testing file 2024-10-21 15:37:41 -07:00
yari-dewalt
b7d66bb975 Add elk and handDrawn specific test files 2024-10-18 10:12:09 -07:00
yari-dewalt
cf2c7f7f8c Update tests 2024-10-17 08:58:49 -07:00
Yari DeWalt
86c7532f46 Merge branch 'develop' into update-class-diagram 2024-10-16 09:43:58 -07: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
saurabhg772244
2509511135 Fixed neo look for color icons 2024-10-09 16:50:46 +05:30
Ashish Jain
c73f8d0990 Merge from upstream mermaid os develop 2024-10-09 11:19:40 +02:00
saurabhg772244
8df2729bd4 Merge branch 'saurabh/icon-shape-style-fix' of https://github.com/mermaid-js/mermaid into saurabh/icon-shape-style-fix 2024-10-09 12:16:05 +05:30
saurabhg772244
a001619464 Move MIT license just before icon definition 2024-10-09 12:15:23 +05:30
Saurabh Gore
3c5a19d297 Merge branch 'develop' into saurabh/icon-shape-style-fix 2024-10-09 11:12:56 +05:30
saurabhg772244
9bac464442 Use tropical-fish icon with MIT license in e2e tests 2024-10-09 10:41:37 +05:30
Yari DeWalt
d424a4473a Merge branch 'develop' into update-class-diagram 2024-10-08 07:58:15 -07:00
Sidharth Vinod
1b51fbfcca Revert "chore: Split newshape test" 
This reverts commit 1b12ac133e.
 2024-10-08 13:36:16 +05:30
Sidharth Vinod
1b12ac133e chore: Split newshape test 2024-10-07 18:30:05 +05:30
saurabhg772244
d3308232e8 updated test case for icon shape 2024-10-07 16:11:31 +05:30
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
Sidharth Vinod
2401eea725 Merge branch 'develop' into sidv/parallelCypress 2024-10-04 14:43:49 +05:30
Sidharth Vinod
ddf18dd233 chore: Disable architecture diagram test 2024-10-04 14:25:45 +05:30
Sidharth Vinod
b777c12094 chore: Add timings file 2024-10-04 02:29:43 +05:30