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
Knut Sveidqvist
75ca802b62
Merge branch 'develop' into update-class-diagram
2024-10-29 10:40:39 +01:00
yari-dewalt
b315d70af5
Merge branch 'develop' into update-class-diagram and fix conflicts
2024-10-28 10:32:19 -07:00
autofix-ci[bot]
848be3d129
[autofix.ci] apply automated fixes
2024-10-28 14:33:47 +00:00
Knut Sveidqvist
7401cb8f6a
Merge branch 'develop' into knsv/5342-kanban
2024-10-28 14:22:10 +01:00
Alois Klink
93239b5f34
Merge commit 'f8746bee0454b01378726d04f9c65bbc3974eb3a' into merge-refactor/improving-rendering-shape-types
...
See https://github.com/mermaid-js/mermaid/pull/5974
Conflicts:
docs/config/setup/interfaces/mermaid.RenderResult.md
packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts
2024-10-28 21:03:19 +09:00
autofix-ci[bot]
606ecf8990
[autofix.ci] apply automated fixes
2024-10-17 17:42:10 +00:00
Knut Sveidqvist
991d403d7f
Typescript fixes
2024-10-10 09:47:52 -07: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
Ashish Jain
401590c010
Merge from Upstream new-shapes branch
2024-09-20 12:31:07 +02:00
autofix-ci[bot]
f849c36942
[autofix.ci] apply automated fixes
2024-09-20 10:18:15 +00:00
Sidharth Vinod
dc642fb5bc
Build docs
2024-09-12 15:23:11 +05:30
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
Ashish Jain
7ef296a9cf
Merge from upstream newShapes branch
2024-09-11 14:41:52 +02: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
saurabhg772244
82cc473801
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into knsv/new-shapes
2024-09-09 19:37:59 +05:30
Sidharth Vinod
638be1992d
Merge remote-tracking branch 'upstream/develop' into neo-new-shapes
...
* upstream/develop: (27 commits)
[autofix.ci] apply automated fixes
fix: Return type, make config non optional
[autofix.ci] apply automated fixes
Create red-beans-cross.md
chore(deps): update dependency eslint-plugin-jsdoc to v50
remove tsconfig compiler option paths
linting
replace mermaid/dist with relative paths
chore: add git command and set safe dir
chore: Fix check
feat: Preview release
feat: Return parsed config from `mermaid.parse`
Version Packages
Adding changeset
Cleanup of test-file
Updated cypress test for self-loops
Fix for issues with self loops
docs: Fix SMW link
add blog post - architecture diagrams
more , linting
...
2024-09-09 18:30:31 +05:30
autofix-ci[bot]
d053284536
[autofix.ci] apply automated fixes
2024-09-09 12:11:29 +00:00
Sidharth Vinod
303f1f4545
Merge branch 'develop' into sidv/returnConfig
...
* develop:
chore(deps): update dependency eslint-plugin-jsdoc to v50
chore: add git command and set safe dir
Version Packages
Adding changeset
Cleanup of test-file
Updated cypress test for self-loops
Fix for issues with self loops
rebuild docs
add another maybe-undefined operator elk
pass linter
fix import
make rendering-util/types a real ts file
2024-09-09 17:19:28 +05:30
Ashish Jain
0ade03c4de
Merge from develop
2024-09-09 11:15:42 +02:00
saurabhg772244
ec29f749af
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into saurabh/image-shape
2024-09-09 11:24:28 +05:30
Sidharth Vinod
64abf29ea8
feat: Return parsed config from mermaid.parse
2024-09-06 23:05:30 +05:30
Ashish Jain
11bb1a4a17
Merge from upstream
2024-09-03 11:55:46 +02:00
Ashish Jain
8e0bb994bb
Merge from develop
2024-09-03 11:15:24 +02:00
Nicholas Bollweg
426d311faa
Merge branch 'develop' into gh-5747-rendering-util-types
2024-09-02 16:41:55 -04:00
Sidharth Vinod
0edfab1048
feat: Lazy load icons
...
Co-authored-by: Alois Klink <alois@aloisklink.com >
2024-09-02 19:51:14 +05:30
Nicholas Bollweg
73f8d70b86
rebuild docs
2024-08-30 09:21:11 -05:00
autofix-ci[bot]
249e18314a
[autofix.ci] apply automated fixes
2024-08-29 09:36:26 +00:00
autofix-ci[bot]
eaae85c6f8
[autofix.ci] apply automated fixes
2024-08-29 08:38:25 +00:00
Sidharth Vinod
d51ea942e1
Merge branch 'develop' into sidv/architecture
...
* develop:
test: Skip architecture diagram
[autofix.ci] apply automated fixes
fix: Update diagram keyword
2024-08-29 14:03:20 +05:30
autofix-ci[bot]
5309d21588
[autofix.ci] apply automated fixes
2024-08-29 07:13:36 +00:00
Sidharth Vinod
bed6c5dd0c
chore: Move icons to architecture
...
We are planning to release an icons library separately. Till we figure out the APIs for those, all external surface for icons are removed, to avoid making a breaking change when the new library comes.
2024-08-28 21:04:21 +05:30
Ashish Jain
30d4632a0b
Prettier lint fixes
2024-08-28 14:50:31 +02:00
Ashish Jain
bd5a9cc21e
Merge from Upstream
2024-08-28 14:33:13 +02:00
Ashish Jain
600247df79
Merge from develop
2024-08-28 14:29:03 +02:00
Knut Sveidqvist
eee1be474a
Merge branch 'develop' into 5367/architecture-diagram
2024-08-28 13:50:05 +02:00
Ashish Jain
dc2ecc9f19
fix mermiad version placeholder
2024-08-27 15:12:49 +02:00
Ashish Jain
75f755b823
Merge from develop
2024-08-27 13:41:12 +02:00
autofix-ci[bot]
5744c8614a
[autofix.ci] apply automated fixes
2024-08-26 14:02:56 +00:00
Ashish Jain
3dc0af3159
Merge from release
2024-08-22 14:45:47 +02:00
Sidharth Vinod
225115ad07
Fix docs
2024-08-22 16:19:49 +05:30
autofix-ci[bot]
792a62438f
[autofix.ci] apply automated fixes
2024-08-21 15:35:41 +00:00
NicolasNewman
73e16d0857
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into 5367/architecture-diagram
2024-08-21 10:28:57 -05:00
autofix-ci[bot]
8ffd198d8b
[autofix.ci] apply automated fixes
2024-08-21 12:16:35 +00:00
