marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-03 20:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,697 Commits 232 Branches 190 Tags
efe38b842549a0d12d8952add12756f21a384af6
Commit Graph

5161 Commits

Author SHA1 Message Date
Sidharth Vinod
00f5700320 Merge pull request #6898 from mermaid-js/user-defined-layout-detection 
feat: Add getUserDefinedConfig to merge init config and directives
 2025-08-26 09:17:40 +00:00
darshanr0107
50127f3ffe fix: review comments related to getUserDefinedConfig tests 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-26 13:17:38 +05:30
darshanr0107
4760ed8893 fix: add unit tests for getUserDefinedConfig across different scenarios 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-25 19:13:58 +05:30
darshanr0107
31ecf31c2e refactor: remove layout-specific checks and create generic function 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-25 18:26:03 +05:30
darshanr0107
8322a63598 feat: add helper to differentiate user-defined layout from default 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-25 16:17:04 +05:30
omkarht
075e1b5e1f Merge branch 'develop' into docs/flowchart-image-node-doc-fix 2025-08-25 15:47:23 +05:30
omkarht
045699de10 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into 6638-sequence-diagram-additional-messages 2025-08-25 15:14:50 +05:30
omkarht
3c9bd7be29 Merge branch 'develop' into docs/flowchart-image-node-doc-fix 2025-08-25 12:58:52 +05:30
omkarht
95d48e3497 Merge branch 'develop' into 6637-add-new-participant-types-to-sequence-diagrams 2025-08-25 12:42:03 +05:30
Maria Stellini
202172135d Revert "Merge remote-tracking branch 'origin/master' into docs/xychart-plotcolorpalette-example" 
This reverts commit b94ab243a8, reversing
changes made to 11c8848e1f.
 2025-08-24 20:05:38 +02:00
Maria Stellini
b94ab243a8 Merge remote-tracking branch 'origin/master' into docs/xychart-plotcolorpalette-example 2025-08-24 20:03:27 +02:00
autofix-ci[bot]
11c8848e1f [autofix.ci] apply automated fixes 2025-08-24 17:49:14 +00:00
Maria Stellini
231fcc700f xychart: repositioned the colours section 2025-08-24 19:31:57 +02:00
Maria Stellini
8ba7520acc docs: Update 1 file 2025-08-24 19:20:02 +02:00
darshanr0107
e0a5a2489d fix: tidy tree layout tests 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-22 19:19:19 +05:30
darshanr0107
bd400a5130 chore: cleanup unused parameters , reuse existing types 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-22 19:09:38 +05:30
darshanr0107
d35f84f337 chore: fix review feedback in tidy-tree and mindmap (types, cleanup) 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-22 18:15:17 +05:30
omkarht
1988d24227 fix: fixed reverse arrows placing for autonumber 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-22 16:46:49 +05:30
github-actions[bot]
8813cf2c94 Version Packages 2025-08-22 09:03:57 +00:00
omkarht
39f90debe7 Merge branch 'develop' into 6638-sequence-diagram-additional-messages 2025-08-22 13:03:01 +05:30
darshanr0107
8dadb853a0 fix: failing unit test 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-22 12:36:56 +05:30
Shubham P
29886b8dd4 Merge pull request #6886 from mermaid-js/6721/Bidirectional-arrows--render-incorrectly-with-autonumber-in-sequence-diagrams 
6721: Correct rendering of bidirectional arrows with auto number
 2025-08-21 15:57:22 +00:00
Alois Klink
2bc5b6d2fa docs(flowchart): fix image node documentation 2025-08-21 19:26:54 +05:30
darshanr0107
d4c76968e9 fix: correct rendering of bidirectional arrows with autonumber 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-21 19:09:39 +05:30
omkarht
5a05540a5f Merge branch 'develop' of https://github.com/mermaid-js/mermaid into 6638-sequence-diagram-additional-messages 2025-08-21 16:09:18 +05:30
darshanr0107
9ec989e633 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into 6784-edge-label-color-mismatch 2025-08-21 12:06:04 +05:30
darshanr0107
61d9143acb fix: cose-bilkent as the default layout for mindmaps 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-20 21:00:27 +05:30
darshanr0107
6377d6f64d fix: increase padding for circle shape in mindmap 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-20 16:28:55 +05:30
darshanr0107
1b0bc05fc2 fix: edge issue in tidy tree layout 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-20 15:54:44 +05:30
darshanr0107
45edeb9307 fix: undo changes in tidy tree layout file that were breaking CI 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-20 15:08:48 +05:30
阿菜 Cai
c0e2d4a23b Merge branch 'develop' into chore/upgrade/unocss-iconify 2025-08-20 14:48:58 +08:00
darshanr0107
e9011567bd fix: edge intersection issue in tidy tree layout 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-20 12:01:10 +05:30
darshanr0107
ecad9cee6c fix: label styles in bang shape 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-19 19:08:57 +05:30
darshanr0107
1e8a9f76a9 fix: padding issues in bang, rounded rect, sqaure shapes 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-19 18:56:00 +05:30
omkarht
2b58df9665 fix: refactored documentation 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-19 14:53:08 +05:30
darshanr0107
c75566ddc3 fix: adjust rounded rectangle styling to resolve Argos snapshot failure 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-19 13:59:20 +05:30
omkarht
7bdcf93412 Merge branch 'develop' into 6637-add-new-participant-types-to-sequence-diagrams 2025-08-19 13:54:32 +05:30
omkarht
d86e46b705 fix: refactored test cases 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-19 13:44:11 +05:30
github-actions[bot]
d4c058bd56 Version Packages 2025-08-19 08:02:22 +00:00
Sidharth Vinod
b638a0a9c1 temp: Remove peerDeps from examples 2025-08-19 13:29:58 +05:30
Sidharth Vinod
fd9aa36c77 chore: Update peerDependencies for examples 2025-08-19 13:22:32 +05:30
Sidharth Vinod
e448c53b53 Merge pull request #6876 from mermaid-js/develop 
Pre Release
 2025-08-18 19:47:51 +05:30
omkarht
71e09bcaef fix: refactored code and adjusted shape, shape label 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-18 18:21:41 +05:30
Sidharth Vinod
cad144734d chore: ignore redmine.org in linkchecker 2025-08-18 17:55:32 +05:30
Sidharth Vinod
fc2c32603d fix: Config handling 
Co-authored-by: Saurabh Gore <saurabh@mermaidchart.com>
 2025-08-18 17:26:01 +05:30
Sidharth Vinod
803e2e14be Merge remote-tracking branch 'upstream/develop' into advisory-fix-1 
* upstream/develop: (68 commits)
  fix: sanitize addHtmlLabel in createLabel
  docs(integrations): update Tiki to Tiki Wiki CMS Groupware community in list cms/ecm to avoid confusion
  updated lock file
  #6856 Exposing elk configuration forceNodeModelOrder and considerModelOrder to the mermaid configuration
  chore: Modify changeset
  Update .changeset/strong-laws-confess.md
  fix: fallback to raw text instead of rendering empty boxes when `htmlLabels: false`
  chore: Modify changeset
  [autofix.ci] apply automated fixes
  test: Add E2E test for unsupported markdown
  Create strong-laws-confess.md
  fix: Remove data loss when unsupported markdown is encountered
  Apply suggestion from @sidharthv96
  Add changeset and integration test
  chore: update E2E timings
  Make elk not force model order, but strongly consider it instead
  chore(deps): update peter-evans/create-pull-request digest to 1310d7d
  added changeset
  Fix border style for hand drawn shapes
  test: Verify label is sanitized
  ...
 2025-08-18 16:59:44 +05:30
Sidharth Vinod
685516a85e Merge commit from fork 
fix: Sanitize KATEX blocks
 2025-08-18 16:57:11 +05:30
Sidharth Vinod
880f7454a3 fix: sanitize addHtmlLabel in createLabel 
Co-authored-by: Chris Grieger <chris@scolp.de>
 2025-08-18 16:53:20 +05:30
darshanr0107
7e9577dffd fix: remove border for mindmap rounded rect shape 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
 2025-08-18 13:16:35 +05:30
omkarht
cba659d097 Merge branch 'develop' into 6637-add-new-participant-types-to-sequence-diagrams 2025-08-18 12:16:44 +05:30