Commit Graph

9014 Commits

Author SHA1 Message Date
Sidharth Vinod
051260e9a8 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop
* 'develop' of https://github.com/mermaid-js/mermaid:
  docs: fixed typo
2023-11-09 14:04:33 +05:30
Sidharth Vinod
3cf0a2b290 Merge pull request #4893 from 0xflotus/patch-1
docs: fixed typo
2023-11-09 14:04:17 +05:30
Sidharth Vinod
adfb60e045 fix typo 2023-11-09 14:03:38 +05:30
Sidharth Vinod
ac595eb96c Merge pull request #4947 from SusheelThapa/patch
Chore: Typo fixed in multiple files
2023-11-09 14:03:05 +05:30
Sidharth Vinod
79bae62ce0 Merge pull request #4973 from SahilNagpure07/patch-1
docs: Update classDiagram.md
2023-11-09 13:57:36 +05:30
Sidharth Vinod
3038ce5864 Merge pull request #5021 from nashtechlabs/docs/patch-1
Add new Atlassian integrations
2023-11-09 13:56:19 +05:30
Sidharth Vinod
c8a826dfce Merge pull request #5012 from StefonSimmons/patch-1
Update index.md
2023-11-09 13:51:27 +05:30
Sidharth Vinod
4286372a9c Merge pull request #4924 from raiman264/bug/4905_fix_code_block_unreadable_text
bug: #4905 change shiki theme to github-light
2023-11-09 13:50:45 +05:30
Sidharth Vinod
0075538431 fix linting 2023-11-09 13:49:42 +05:30
Braulio Ruiz
8db9700807 fix: set proper shiki theme for light and dark modes 2023-11-09 13:36:44 +05:30
Braulio Ruiz
1fa8de2771 fix: change shiki theme to github-light 2023-11-09 13:36:44 +05:30
nashtechlabs
fadae38bec Merge branch 'develop' into docs/patch-1 2023-11-09 05:34:57 +07:00
Sidharth Vinod
d1fba9c567 Merge pull request #4824 from JackuB/patch-1
Docs: add Mermaid for Slack integration
2023-11-08 20:58:40 +00:00
Sidharth Vinod
c2e26baf4d Merge pull request #4930 from Mister-Hope/patch-2
feat(gantt): update styles
2023-11-08 20:42:53 +00:00
nashtechlabs
f6b1e049f1 Merge branch 'develop' into docs/patch-1 2023-11-08 15:56:22 +07:00
Alois Klink
f487dcd57b Merge commit 'b61ea4b8aa2f5d38ad6af828ed0620a589ec5786'
This fixes the link to xyChart in the docs on the `master` branch.
2023-11-08 08:42:05 +00:00
Alois Klink
71478f5a64 Merge pull request #5014 from Abrifq/patch-2
Update XYChart's nav link in the docs template
2023-11-08 08:22:30 +00:00
dev1
c9ace33cf1 Add new Atlassian integrations 2023-11-08 14:39:06 +07:00
Alois Klink
4ecf7806cd Merge pull request #4959 from mermaid-js/update-latest-news
Docs: update latest news
2023-11-07 16:10:07 +00:00
Steph
c117447bb3 add latest blog post 2023-11-07 00:54:32 -08:00
Steph
1f7aec7405 Merge branch 'master' into update-latest-news 2023-11-07 00:50:51 -08:00
Sidharth Vinod
30646d80f1 Merge pull request #5015 from mermaid-js/renovate/patch-all-patch
chore(deps): update all patch dependencies (patch)
2023-11-07 07:23:10 +00:00
renovate[bot]
6e74e91b5d chore(deps): update all patch dependencies 2023-11-07 05:11:34 +00:00
Sidharth Vinod
eb4bd314b6 Merge pull request #5002 from ad1992/bug/4983-fix-getMessageAPI
fix: getMessageAPI so it considers entity codes
2023-11-07 05:04:53 +00:00
Alois Klink
7a3ce3e337 Merge pull request #5018 from mermaid-js/master
Sync `master` branch to `develop`
2023-11-06 14:48:55 +00:00
Alois Klink
d1045ed644 Merge remote-tracking branch 'origin/release/10.6.1' 2023-11-06 14:29:58 +00:00
Aakansha Doshi
396ea3cec2 Update demos/sequence.html 2023-11-06 19:55:53 +05:30
Aakansha Doshi
51d076a83b Merge branch 'develop' into bug/4946-fix-svg-order-sequence-participant 2023-11-06 19:54:32 +05:30
Alois Klink
65daab2aaf chore: release v10.6.1
Fixes
=====

- Flowchart: Fix a freeze when using a `(` character in an ellipse node
v10.6.1
2023-11-06 13:57:01 +00:00
Aakansha Doshi
dff8b783b8 fix 2023-11-06 19:02:10 +05:30
Aakansha Doshi
78c1a3d980 fix 2023-11-06 18:57:47 +05:30
Aakansha Doshi
23cbf50413 fix: render the participants in same order as they are created 2023-11-06 18:47:38 +05:30
Knut Sveidqvist
7c7f3dd8be Merge pull request #5016 from aloisklink/fix/4964-fix-invalid-ellipseText-regex
fix(flow): fix invalid ellipseText regex
2023-11-06 11:16:44 +00:00
Alois Klink
172d90e731 fix(flow): fix invalid ellipseText regex
This invalid regex was causing Mermaid to freeze.
2023-11-06 10:08:12 +00:00
Aakansha Doshi
dff13439f6 review fixes 2023-11-06 12:17:43 +05:30
Arda Aydın
b61ea4b8aa Update XYChart's nav link in the docs template
The site gives 404 with xychart but navigates correctly with xyChart
2023-11-05 22:35:36 +03:00
SteffenLm
b5fd8fb7c1 fix text-decoration for abstract attibutes 2023-11-03 20:55:42 +01:00
StefonSimmons
4ba3e2cff3 Update index.md
fix typo
2023-11-03 15:51:33 -04:00
Aakansha Doshi
a818f3e3ae add comment for ts ignore 2023-11-03 13:31:21 +05:30
Aakansha Doshi
58bad981be move decodeEntities to utils 2023-11-03 13:25:26 +05:30
Aakansha Doshi
6a5b7c40bd Merge branch 'develop' into bug/4983-fix-getMessageAPI 2023-11-03 13:18:38 +05:30
Aakansha Doshi
6e6e92a1d1 review fixes 2023-11-03 13:16:30 +05:30
Steph
99244ffae5 Merge branch 'master' into update-latest-news 2023-11-02 05:05:04 -07:00
Sidharth Vinod
f5bd1e0809 Merge pull request #4997 from mermaid-js/renovate/all-minor
chore(deps): update all minor dependencies (minor)
2023-11-02 11:05:01 +00:00
renovate[bot]
0d4faef758 chore(deps): update all minor dependencies 2023-11-01 19:42:28 +00:00
Sidharth Vinod
0c5cf72235 chore: Point to correct changelog 2023-11-01 20:18:49 +05:30
Guy Pursey
57a9d7356c GitGraph: made reroute fn more readable
Pre-commit lint hook had made the use of ternaries harder to read
than I'd originally intended so I introduced an additional
variable which explains what is being checked and keeps ternaries
from becoming obscured.
2023-10-31 17:24:13 +00:00
Guy Pursey
a9c5d903c5 GitGraph: simplified branch check in arrow rerouting fn
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
2023-10-31 17:24:13 +00:00
Guy Pursey
d80e1a2662 GitGraph: added commit IDs to e2e test to remove false positives
Should stop randomised commit IDs from showing arbitrary
differences between test runs.
2023-10-31 17:24:13 +00:00
Guy Pursey
bf52e76a39 GitGraph: Moved branch curve check to within reroute check fn
Based on review by @nirname. I had originally been trying
to minimise number of new arguments being passed to
rerouting check but as the branch curve check is not used
elsewhere and is part of the same rerouting check it makes
sense for them to be together.

Position information now passed to rerouting fn instead.
2023-10-31 17:24:13 +00:00