marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-18 14:59:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,156 Commits 209 Branches 187 Tags
41f3f9fb322eca07cf947b2b542f14a6e3ccd487
Commit Graph

9156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matheus B
41f3f9fb32 Fix linter issues 2023-12-22 21:48:19 -03:00
Matheus B
46583cf4eb Merge branch 'develop' into feature/5114_add_parallel_commit_config 2023-12-22 21:32:20 -03:00
Matheus B
eb3e924c44 Add tests for gitGraph with parallel commits 2023-12-22 21:11:50 -03:00
Matheus B
222c46e7f0 Implement support for parallel commits config 2023-12-22 21:08:15 -03:00
Matheus B
00ac6ccb37 Add parallelCommits config option for gitGraphs 2023-12-22 20:42:24 -03:00
Justin Greywolf
60280361b0 Merge pull request #5111 from mermaid-js/2408-support-style-for-class 
Added functionality to support style keyword
 2023-12-20 15:10:14 +00:00
Justin Greywolf
2b4940d67d Merge branch '2408-support-style-for-class' of https://github.com/mermaid-js/mermaid into 2408-support-style-for-class 2023-12-18 06:27:30 -08:00
Justin Greywolf
c5220bd92d Fixed parser/tests 2023-12-18 06:27:10 -08:00
jgreywolf
7ec5bdcca4 Update docs 2023-12-14 14:52:40 +00:00
Justin Greywolf
1babceb63c Update classDiagram.md 2023-12-14 06:48:13 -08:00
Justin Greywolf
237518ba3b Update classDiagram.md 2023-12-14 06:47:37 -08:00
Justin Greywolf
a71bdbd2bb Merge branch 'develop' into 2408-support-style-for-class 2023-12-11 04:56:11 -08:00
jgreywolf
70b4a374cd Update docs 2023-12-11 12:48:49 +00:00
Justin Greywolf
668bf327d5 Update packages/mermaid/src/diagrams/class/classDb.ts 
Co-authored-by: Alois Klink <alois@mermaidchart.com>
 2023-12-11 04:45:48 -08:00
Justin Greywolf
3dce04e0a9 Update packages/mermaid/src/docs/syntax/classDiagram.md 
Co-authored-by: Alois Klink <alois@mermaidchart.com>
 2023-12-11 04:45:16 -08:00
Justin Greywolf
24957f44df Update packages/mermaid/src/diagrams/class/classDb.ts 
Co-authored-by: Alois Klink <alois@mermaidchart.com>
 2023-12-11 04:44:53 -08:00
Sidharth Vinod
6e64556326 Merge pull request #5130 from mermaid-js/update-generics-documentation 
Update generics docs
 2023-12-11 04:55:43 +00:00
Sidharth Vinod
b7fa22d80c Merge pull request #5131 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-12-11 04:54:48 +00:00
renovate[bot]
f1a10d11c3 chore(deps): update all minor dependencies 2023-12-11 01:09:36 +00:00
Justin Greywolf
5a26edf6c0 Update generics docs 2023-12-10 17:01:36 -08:00
jgreywolf
b92b344844 Update docs 2023-12-10 21:28:26 +00:00
Justin Greywolf
b51ca4fb15 Address potential undefined 2023-12-10 13:25:16 -08:00
Justin Greywolf
3bb005b973 Merge branch 'develop' into 2408-support-style-for-class 2023-12-10 13:18:58 -08:00
Sidharth Vinod
9f061c5eba Merge pull request #5086 from mermaid-js/sidv/5042_maxEdges 
feat #5042: Add `flowchart.maxEdges` config.
 2023-12-10 16:39:57 +00:00
Sidharth Vinod
d3257cef80 Merge branch 'develop' into sidv/5042_maxEdges 2023-12-07 11:01:19 +05:30
Sidharth Vinod
69f31097e7 refactor: Move maxEdges out of flowchart config. 2023-12-07 10:55:12 +05:30
Sidharth Vinod
9b34adf2c9 refactor: Move maxEdges out of flowchart config. 2023-12-07 10:49:20 +05:30
Sidharth Vinod
3b7cabee4b chore: Add maxEdges to secure list 2023-12-07 10:39:10 +05:30
Sidharth Vinod
4f9988a799 Merge pull request #5120 from Abrifq/patch-3 
Update NiceGuy.io links in integrations-community.md
 2023-12-07 10:22:30 +05:30
Abrifq
f476c25c6d Update docs 2023-12-06 23:33:21 +00:00
Arda Aydın
1d08155fb1 Update NiceGuy.io links in integrations-community.md 2023-12-07 02:30:21 +03:00
Sidharth Vinod
cc4af0cafa Merge pull request #5115 from mermaid-js/dependabot/npm_and_yarn/vite-4.4.12 
build(deps-dev): bump vite from 4.4.9 to 4.4.12
 2023-12-06 06:08:46 +00:00
dependabot[bot]
faf282b45b build(deps-dev): bump vite from 4.4.9 to 4.4.12 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.4.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 23:52:12 +00:00
Justin Greywolf
02b2d71eb3 Update packages/mermaid/src/diagrams/class/classDb.ts 
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
 2023-12-05 07:57:39 -08:00
Justin Greywolf
e25515a960 Merge branch 'develop' into 2408-support-style-for-class 2023-12-05 07:11:08 -08:00
Justin Greywolf
ca386ab597 Update docs 2023-12-05 07:10:45 -08:00
Nikolay Rozhkov
fe07e9da46 Merge pull request #5102 from mermaid-js/5100_SankeyViewbox 
fix: #5100 Add viewbox to sankey
 2023-12-05 10:14:55 +00:00
Sidharth Vinod
a9610d3ba0 Merge pull request #5109 from FutzMonitor/issue5108 
Changes to .prettierignore
 2023-12-05 04:05:23 +00:00
Justin Greywolf
1ecae7dc93 Merge branch 'develop' into 2408-support-style-for-class 2023-12-04 13:29:00 -08:00
Justin Greywolf
239fad94ee Grammar/rendering for setting style on class node 2023-12-04 13:28:31 -08:00
futzmonitor
11affc32ee Changes to .prettierignore 
1. Added 'demos/dev/**' to be ignored by Prettier.
2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
 2023-12-04 15:47:58 -05:00
Sidharth Vinod
5d56835c31 Merge pull request #5104 from aloisklink/chore/use-tsx-instead-of-ts-node-esm 
build: use `tsx` instead of `ts-node-esm`
 2023-12-04 14:48:43 +00:00
Alois Klink
4a7e4a3bcb build: use tsx instead of ts-node-esm 
`ts-node-esm` v10.9.1 is not compatible with Node.JS v18.19.0.
 2023-12-04 11:25:58 +00:00
Alois Klink
6a31ae6b4f Merge pull request #4944 from RounakJoshi09/bug/#4497_unable-to-cherrypick-merge-commit 
Bug/#4497 Unable to Cherry Pick Merge Commit Solved
 2023-12-04 09:15:03 +00:00
Sidharth Vinod
798f9f8b78 chore: Downgrade node to 18.18.2 2023-12-04 12:46:56 +05:30
Sidharth Vinod
87a0ab3438 Merge pull request #5099 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-12-04 06:32:54 +00:00
Sidharth Vinod
160c7d399a fix: #5100 Add viewbox to sankey 2023-12-04 11:36:07 +05:30
renovate[bot]
e87243c135 chore(deps): update all minor dependencies 2023-12-04 06:04:52 +00:00
Sidharth Vinod
886405b65f Merge pull request #5098 from mermaid-js/4578-generic-class-in-namespace 
Fix issue with generic class not rendering
 2023-12-04 05:59:48 +00:00
Sidharth Vinod
761fa27eea chore: Rename test 2023-12-04 11:22:09 +05:30