9122 Commits

Author SHA1 Message Date
Guy Pursey
60bb7b5b6c GitGraph: updated demo page to include top-to-bottom examples. 2023-10-31 17:24:13 +00:00
Guy Pursey
4787bb07df GitGraph: corrected object method in hasOverlappingCommits 2023-10-31 17:24:13 +00:00
Guy Pursey
33050e1812 GitGraph: Update variable names in drawArrow fn 2023-10-31 17:24:13 +00:00
Guy Pursey
6dc8e58b47 GitGraph: Refactor hasOverlappingCommits function
Changed argument names from commit1 and commit2 to
commitA and commitB respectively to prevent confusion
with seq number values.

Replaced Array filter method with array some method
so that as soon as one overlap is found, function is
finished.

Used Object.entries instead of Object.keys to reduce
number of variables needed and make function easier
to read.
2023-10-31 17:24:13 +00:00
Guy Pursey
839645f161 GitGraph: Add more example diagrams to test with. 2023-10-31 17:24:13 +00:00
Guy Pursey
d9daf19055 GitGraph: Correct commit variable in overlap check.
Originally, the function was checking if any commits were on the
same branch as `commit2`, the destination commit.

However, in order to avoid a conflict, we should only need to
check whether any commits are on the same branch as `commit 1`.

Updated and moved commenting as well.
2023-10-31 17:24:13 +00:00
Guy Pursey
f42cec282a GitGraph: Add check for direction of merge arrow to determine colour. 2023-10-31 17:24:13 +00:00
Aakansha Doshi
fff25e7e2c add spec 2023-10-31 19:39:43 +05:30
Aakansha Doshi
2a8323f951
Merge branch 'develop' into bug/4983-fix-getMessageAPI 2023-10-31 18:35:25 +05:30
Aakansha Doshi
390e22cc0b fix: getMessageAPI so it considers entity codes 2023-10-31 18:28:45 +05:30
Sebastian Holmqvist
a3ee21d7fc fix(tooltip): change position of tooltip to not cover node
Position the tooltip centered, just below the node being hovered.

Update packages/mermaid/src/diagrams/flowchart/flowDb.js

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-31 12:51:47 +01:00
Sebastian Holmqvist
8f2a5064cb fix(tooltip): remove redundant scroll offset
window.scrollY is already account for which means document.body.scrollTop incorrectly offsets the tooltip vertically.
The same is not true for horizontal position.
2023-10-31 08:38:19 +01:00
Sidharth Vinod
77667b94d3
Merge pull request #4975 from mermaid-js/add-docusaurus
Docs: add Docusaurus to "Integrations - Community" page
2023-10-31 06:42:09 +00:00
Sidharth Vinod
b85a48f7f7
Merge pull request #4976 from mermaid-js/renovate/patch-all-patch
chore(deps): update all patch dependencies (patch)
2023-10-31 06:40:19 +00:00
Sidharth Vinod
34f1db399f
Merge pull request #4979 from karthxk07/develop
Update README.md
2023-10-31 06:40:05 +00:00
renovate[bot]
e8a04faa36
chore(deps): update all patch dependencies 2023-10-31 06:13:41 +00:00
Sidharth Vinod
d714ecb4d7
Merge pull request #4994 from alex-titarenko/docs/add-noteshub-tool
docs: Add NotesHub to integrations-community page
2023-10-31 06:06:59 +00:00
Sidharth Vinod
54ca3e789f
Merge pull request #4991 from sadikkuzu/patch-1
Fix typo in build-docs.yml
2023-10-31 06:03:26 +00:00
Alex Titarenko
cb06962c85 Update integrations-community.md 2023-10-27 20:27:16 -07:00
Alex Titarenko
e98aa55577 docs: upate the list of tools with native support of mermaid 2023-10-27 18:58:30 -07:00
SADIK KUZU
672a0edc59
Fix typo in build-docs.yml 2023-10-27 12:22:14 +03:00
Harshit Anand | Frontend Developer | ReactJS
3394541b41
Merge branch 'develop' into bug/4716_fix_target_blank_getting_sanitized 2023-10-26 14:57:15 +05:30
Harshit Anand
54ab3fc3b2 fix: added an e2e test case for classdiagram with anchor tag 2023-10-26 14:55:04 +05:30
Sahil Nagpure
36a727d44e
Merge branch 'develop' into patch-1 2023-10-26 11:44:46 +05:30
Harshit Anand
06d2ba8398 fix: added two unit tests to check for the secured anchor tag 2023-10-25 21:17:53 +05:30
Knut Sveidqvist
5f117fc2b2 Merge branch 'master' into develop 2023-10-25 13:36:10 +02:00
Knut Sveidqvist
d7ec9e7b0d Merge branch 'release/10.6.0' 2023-10-25 13:35:58 +02:00
Knut Sveidqvist
29942c04dc Updated mermaid version v10.6.0 2023-10-25 11:07:12 +02:00
Knut Sveidqvist
fc28c1da63 Limiting the number of edges that are allowed in the flowchart 2023-10-25 11:06:37 +02:00
Karthik
ff4d68fd55
Update README.md 2023-10-25 14:11:38 +05:30
Sahil Nagpure
9637b0c187
Merge branch 'develop' into patch-1 2023-10-25 12:24:03 +05:30
RounakJoshi09
5834818ebe Linting Issue Fixed 2023-10-23 21:57:38 +05:30
RounakJoshi09
7f1e0ab422
Updated gitgraph.md 2023-10-23 21:14:38 +05:30
RounakJoshi09
b461efab5d Merge branch 'bug/#4497_unable-to-cherrypick-merge-commit' of https://github.com/RounakJoshi09/mermaid into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-23 21:09:43 +05:30
RounakJoshi09
ca96c0f45f Linting Issue Fixed 2023-10-23 21:06:51 +05:30
RounakJoshi09
122e5929bc
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-23 20:40:02 +05:30
RounakJoshi09
b0cfdcc22f Documentation Modified New Ex Added 2023-10-23 20:34:54 +05:30
Harshit Anand
7960f94eba fix: shifted dompurify.addhook functions inside removescript 2023-10-23 16:09:51 +05:30
Harshit Anand
3f486ac0e1 Merge branch 'bug/4716_fix_target_blank_getting_sanitized' of https://github.com/REVERB283/mermaid into bug/4716_fix_target_blank_getting_sanitized 2023-10-23 12:25:53 +05:30
Harshit Anand
b36cdaceca Merge branch 'develop' of https://github.com/mermaid-js/mermaid into bug/4716_fix_target_blank_getting_sanitized 2023-10-23 12:24:22 +05:30
Harshit Anand
3b8c48dd26 fix: added type Element to the node used in callback in the dompurify.addhook 2023-10-23 12:23:08 +05:30
Harshit Anand
af73818c90 Merge branch 'bug/4716_fix_target_blank_getting_sanitized' of https://github.com/REVERB283/mermaid into bug/4716_fix_target_blank_getting_sanitized 2023-10-23 12:08:09 +05:30
Harshit Anand | Frontend Developer | ReactJS
77e700832f
Merge branch 'develop' into bug/4716_fix_target_blank_getting_sanitized 2023-10-23 12:04:53 +05:30
Harshit Anand
111e067df5 fix: added type Element to the node used in callback in the addhook function 2023-10-23 12:03:57 +05:30
Karthik
880d0ebb50
Update README.md 2023-10-23 11:38:52 +05:30
huynhicode
b268bd21e1 Update docs 2023-10-22 21:23:47 +00:00
steph
bc247b1d46 add docusaurus to community integrations 2023-10-22 14:18:41 -07:00
Alois Klink
3957575b6e
Merge pull request #4970 from remcohaszing/rename-rehype-mermaid
Replace rehype-mermaidjs with rehype-mermaid
2023-10-22 20:05:10 +00:00
Alois Klink
9daed6ba27
Merge pull request #4951 from mermaid-js/dependabot/npm_and_yarn/babel/traverse-7.23.2
Bump @babel/traverse from 7.22.10 to 7.23.2
2023-10-22 20:00:19 +00:00
RounakJoshi09
58e9e5658b e2e test case added 2023-10-22 21:12:04 +05:30