Commit Graph

13 Commits

Author SHA1 Message Date
omkarht
9c89d3401a Merge branch 'neo-new-shapes' of https://github.com/Mermaid-Chart/alana-mermaid into redux-theme 2025-01-23 14:58:48 +05:30
Ashish Jain
e6d45da81e Merge from upstream mermaid OS develop 2025-01-15 12:58:13 +01:00
Knut Sveidqvist
323b07a2e4 Typescript fix and updating documentation 2024-12-18 11:56:48 +01:00
Ashish Jain
861599245d Merge from upstream mermaid os 11.4.0 develop 2024-11-07 13:58:42 +01:00
autofix-ci[bot]
b02294376a [autofix.ci] apply automated fixes 2024-10-30 14:05:05 +00:00
Alois Klink
91ed9bb9c2 Merge commit '848be3d1297b833c4e8b2e25fabafec4d7c4db02' into merge-fix/make-parse-error-on-invalid-shape
Pulls PR https://github.com/mermaid-js/mermaid/pull/6002 into Alana.

Fixes a semantic merge conflict in
- `docs/config/setup/interfaces/mermaid.LayoutData.md`

See: https://github.com/mermaid-js/mermaid/pull/6002
2024-10-30 22:31:31 +09:00
autofix-ci[bot]
848be3d129 [autofix.ci] apply automated fixes 2024-10-28 14:33:47 +00:00
Ashish Jain
c73f8d0990 Merge from upstream mermaid os develop 2024-10-09 11:19:40 +02:00
autofix-ci[bot]
11fb806992 [autofix.ci] apply automated fixes 2024-10-08 15:03:03 +00:00
autofix-ci[bot]
f849c36942 [autofix.ci] apply automated fixes 2024-09-20 10:18:15 +00:00
saurabhg772244
06aa72ec16 Merge branch 'knsv/new-shapes' of https://github.com/mermaid-js/mermaid into saurabh/image-shape 2024-09-09 22:43:08 +05:30
Nicholas Bollweg
73f8d70b86 rebuild docs 2024-08-30 09:21:11 -05:00
ashishjain0512
dd7b071a94 Update docs 2024-07-15 11:13:38 +00:00