marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-23 09:20:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,426 Commits 211 Branches 187 Tags
5b6c5412cd82af1f461d92d1f53363b0716d6d4c
Commit Graph

12426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
saurabhg772244
e83a95d3ed Updated icon shape for background colour and icon colour 2024-09-13 23:22:14 +05:30
Sidharth Vinod
e0c2b832a9 Bump version 2024-09-13 23:18:20 +05:30
Sidharth Vinod
4cbb0004be fix: Remove changes to parse 2024-09-13 20:54:59 +05:30
Sidharth Vinod
19e79fda73 feat: Add title to parseResult 2024-09-13 19:49:24 +05:30
Knut Sveidqvist
44561f57d3 Moving case check to parsing 2024-09-13 14:18:46 +02:00
Knut Sveidqvist
4c26fe224b Adding case check 2024-09-13 14:02:11 +02:00
Ashish Jain
61af74609a Updated shape aliases 2024-09-13 12:58:28 +02:00
saurabhg772244
9f2f3bd780 Updated type 2024-09-13 15:41:53 +05:30
Knut Sveidqvist
38bcbcdd0a Merge branch 'knsv/new-shapes' of github.com:mermaid-js/mermaid into knsv/new-shapes 2024-09-13 11:25:05 +02:00
Knut Sveidqvist
d8c340d9c5 Throwing error for invalid shape 2024-09-13 11:23:28 +02:00
saurabhg772244
8456d7b100 Updated insertNode to pass optional config 2024-09-13 14:11:13 +05:30
Knut Sveidqvist
05989d06fa Fix for issue with incorrect calculations of which edge a line intersects with 2024-09-13 08:37:07 +02:00
Sidharth Vinod
71889fd135 chore: Remove type from ParseResult 2024-09-13 12:00:05 +05:30
Knut Sveidqvist
2fa044d484 Merge branch 'knsv-new-shapes-amp-n-at' into knsv/new-shapes 2024-09-12 16:59:49 +02:00
Knut Sveidqvist
4162a25425 Fix for amp and adjusted tests 2024-09-12 16:58:52 +02:00
René Lombard
e26a38b619 Reverted teh CONTRIBUTING.md 2024-09-12 14:12:38 +02:00
René Lombard
92aa2859a0 Removed comment from classDiagram.jison 2024-09-12 12:42:53 +02:00
René Lombard
1d8f524913 Manually updated the classchart 2024-09-12 12:40:19 +02:00
René Lombard
59991b70a1 Reverted pnpm-lock 2024-09-12 12:28:33 +02:00
René Lombard
a6b877676e Reverted pnpm-lock 2024-09-12 12:23:10 +02:00
ReneLombard
3c49c00f2b Update package.json 2024-09-12 12:19:35 +02:00
ReneLombard
c97716e780 Update CONTRIBUTING.md 2024-09-12 12:17:58 +02:00
Knut Sveidqvist
355e218837 Merge branch 'knsv/new-shapes' into knsv-new-shapes-amp-n-at 2024-09-12 12:17:42 +02:00
Sidharth Vinod
eca19efa32 Merge branch 'knsv/new-shapes' of https://github.com/mermaid-js/mermaid into sidv/configReturn 
* 'knsv/new-shapes' of https://github.com/mermaid-js/mermaid:
 2024-09-12 15:47:20 +05:30
René Lombard
a3145a32e7 Updated the downloads.html 2024-09-12 12:17:03 +02:00
Sidharth Vinod
4841b7d3d9 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into sidv/configReturn 
* 'develop' of https://github.com/mermaid-js/mermaid:
  #5787 Fix for issue with labels in firefox
 2024-09-12 15:41:31 +05:30
Knut Sveidqvist
8b6fb94835 WIP 2024-09-12 12:10:41 +02:00
Ashish Jain
83ea81d975 Merge from develop 2024-09-12 12:08:09 +02:00
Sidharth Vinod
dd01f3d52c revert import changes 2024-09-12 15:33:03 +05:30
Sidharth Vinod
dc642fb5bc Build docs 2024-09-12 15:23:11 +05:30
René Lombard
aae9db92ee Merge branch 'bug/5487-add-support-for-nested-classes' of https://github.com/ReneLombard/mermaid into bug/5487-add-support-for-nested-classes 2024-09-12 11:52:00 +02:00
René Lombard
6c5b7ce9f4 Updated the changelog 2024-09-12 11:51:38 +02:00
Knut Sveidqvist
8bb70ea493 Removing the ending @ sign in the shape data 2024-09-12 11:49:21 +02:00
Sidharth Vinod
ef428dc555 Merge branch 'neo-new-shapes' of https://github.com/Mermaid-Chart/alana-mermaid into sidv/configReturn 
* 'neo-new-shapes' of https://github.com/Mermaid-Chart/alana-mermaid: (45 commits)
  updated styles, testcases and fixed html labels for image shape
  MC-1733 Reset layout
  updated ImageSqaure shape
  updated styles
  updated pos changes
  fixed html labels for icon shape
  updated test cases
  Added rounded icon shape
  Updated circle icon
  updated image shape
  Updated labels for shapes
  updated icon square and icon
  MC-1733 Reset layout
  Updated logic for vertex label
  Updated test cases
  Update .changeset/rude-meals-invite.md
  changesets
  added neo-fication and shape-resize for linedCylinder shape
  added neo-fication for curvedTrapezoid shape
  Version Packages
  ...
 2024-09-12 15:19:21 +05:30
ReneLombard
bff9f65c88 Merge branch 'develop' into bug/5487-add-support-for-nested-classes 2024-09-12 11:46:51 +02:00
René Lombard
88607e8aa0 Merge branch 'bug/5487-add-support-for-nested-classes' of https://github.com/ReneLombard/mermaid into bug/5487-add-support-for-nested-classes 2024-09-12 11:31:21 +02:00
Ashish Jain
17c6ed6303 Merge pull request #5856 from mermaid-js/5787_firefox_label_width 
#5787 Fix for issue with labels in firefox
 2024-09-12 11:31:20 +02:00
Knut Sveidqvist
bfd8c63daa #5787 Fix for issue with labels in firefox 2024-09-12 11:05:32 +02:00
Ashish Jain
d964893a5d Merge branch 'knsv/new-shapes' of github.com:mermaid-js/mermaid into neo-new-shapes 2024-09-12 10:48:18 +02:00
René Lombard
6de7f1b088 Updated the package.json files 2024-09-11 15:57:13 +02:00
omkarht
3359d87115 updated styles, testcases and fixed html labels for image shape 2024-09-11 19:00:02 +05:30
ReneLombard
e8fdc965a2 Update downloads.htm 2024-09-11 15:04:06 +02:00
Ashish Jain
7ef296a9cf Merge from upstream newShapes branch 2024-09-11 14:41:52 +02:00
Knut Sveidqvist
acd66a5eb4 MC-1733 Reset layout 2024-09-11 13:57:32 +02:00
Ashish Jain
67bcd3e0d6 Merge pull request #5844 from mermaid-js/saurabh/image-shape 
New Image and Icon shape
 2024-09-11 13:54:24 +02:00
omkarht
9421f63775 updated ImageSqaure shape 2024-09-11 17:21:38 +05:30
saurabhg772244
01bf7af360 updated styles 2024-09-11 17:12:56 +05:30
saurabhg772244
4754ed01ab updated pos changes 2024-09-11 17:04:11 +05:30
saurabhg772244
a2c262f940 fixed html labels for icon shape 2024-09-11 16:58:13 +05:30
saurabhg772244
7963ad9b20 updated test cases 2024-09-11 13:16:23 +05:30