marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-22 00:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,372 Commits 209 Branches 187 Tags
e98ab130cc3be1b73f58cd989ddc2331cfe1aa8b
Commit Graph

1514 Commits

Author SHA1 Message Date
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
Sidharth Vinod
6e0fe03552 chore: move handDrawnSeed to mermaidUrl function 2024-10-04 01:31:20 +05:30
Sidharth Vinod
e5a28de26e fix: Hard code handDrawnSeed 2024-10-04 00:44:08 +05:30
Sidharth Vinod
02cf111995 Merge pull request #5825 from mermaid-js/knsv/new-shapes 
New Flowchart Shapes (with new syntax)
 2024-10-03 17:03:20 +05:30
René Lombard
c5bcd2f22c Reworked code comments 2024-10-02 16:31:21 +02:00
Ashish Jain
1d8c4fd279 merge from upstream 2024-10-02 14:36:41 +02:00
Ashish Jain
1e8cd63645 fix broken e2e for new & old shapes 2024-10-02 13:30:28 +02:00
Ashish Jain
3860a99951 limit the test cases for only two direction 2024-10-02 11:28:43 +02:00
Ashish Jain
f1674b8b04 fix for min size for more shapes 2024-10-01 23:45:32 +02:00
Ashish Jain
eb346e1c51 fix for min size for several shapes 2024-10-01 21:35:30 +02:00
Ashish Jain
d2dfb639c8 fix for min size for several shapes 2024-10-01 18:52:26 +02:00
Knut Sveidqvist
bda3bfd2a7 test html file 2024-10-01 14:50:20 +02:00
Per Brolin
221d59cbfc Fix problem with circle 2024-09-30 10:26:00 +02:00
Per Brolin
8fa8fd6abd WIP. Updated size-testet 2024-09-29 20:36:36 +02:00
Ashish Jain
b99e080337 suport dynamic resizing of rect shape 2024-09-27 10:24:29 +02:00
Knut Sveidqvist
390025c085 Fix for sizing of Stadium 2024-09-26 19:55:32 +02:00
Knut Sveidqvist
b0abb44928 Fix for width calculations in Rect 2024-09-26 19:41:35 +02:00
Knut Sveidqvist
0afd83a0c3 Adding size-tester for checking size calculations with fixed sizes 2024-09-26 18:26:49 +02:00
yari-dewalt
f031abcec2 Support lollipop interface feature 2024-09-23 12:19:22 -07:00