GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
9,296 Commits 182 Branches 159 Tags
Commit Graph

2336 Commits

Author SHA1 Message Date
Guy Pursey
9469f759a9 GitGraph: Moved overlapping commit arrow colour inside conditional 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
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
renovate[bot]
e8a04faa36
chore(deps): update all patch dependencies 2023-10-31 06:13:41 +00:00
Faris
61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables 2023-10-30 13:39:09 +03:00
Alex Titarenko
e98aa55577 docs: upate the list of tools with native support of mermaid 2023-10-27 18:58:30 -07: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
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
29942c04dc Updated mermaid version 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
Sahil Nagpure
9637b0c187
Merge branch 'develop' into patch-1 2023-10-25 12:24:03 +05:30
RounakJoshi09
122e5929bc
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-23 20:40:02 +05:30
Harshit Anand
7960f94eba fix: shifted dompurify.addhook functions inside removescript 2023-10-23 16:09:51 +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
steph
bc247b1d46 add docusaurus to community integrations 2023-10-22 14:18:41 -07:00
RounakJoshi09
f92ad6307e
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-22 19:34:05 +05:30
Sahil Nagpure
f31cddee0c
Update classDiagram.md 
Fixed typo.
 2023-10-22 12:27:55 +05:30
Remco Haszing
ab9b9abdf9
Replace rehype-mermaidjs with rehype-mermaid 
The package was renamed.
 2023-10-20 16:55:01 +02:00
Knut Sveidqvist
d32c18a43c Merge branch 'master' into develop 2023-10-20 14:33:07 +02:00
Knut Sveidqvist
b70959daa7 Version 10.5.1 2023-10-20 14:30:52 +02:00
Per Brolin
aaf0b474d4 Increased version to 10.5.1 2023-10-20 14:18:07 +02:00
Knut Sveidqvist
61bc293a95 #4967 Reverting optimimization that breaks subgraphs 2023-10-20 11:12:56 +02:00
Steph
87675e687e add latest blog post 2023-10-19 11:36:46 -07:00
RounakJoshi09
827808dca3
Merge Conflict Resolved 2023-10-19 10:33:32 +05:30
RounakJoshi09
d65191f6c1
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-19 10:26:25 +05:30
RounakJoshi09
6eee8973ba 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-18 21:08:14 +05:30
RounakJoshi09
d8500f9e08 Suggested Changes FOR PR DONE 2023-10-18 20:59:55 +05:30
Anthony Damico
31ec3d1496
Update questions-and-suggestions.md 2023-10-17 10:30:29 -04:00
renovate[bot]
e4350f80fe
chore(deps): update all patch dependencies 2023-10-16 19:52:01 +00:00
Faris
3128ba73a0
chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md 
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
 2023-10-16 19:36:44 +03:00
Sidharth Vinod
7eac75c15c
Merge pull request #4928 from mribeirodantas/fix-minor-typos 
fix(typos): Fix minor typos in the source code
 2023-10-16 14:00:27 +00:00
Alois Klink
d04f4c27fc
Merge pull request #4889 from dreathed/bug/4345_bundle_current_config_consitently_in_one_file 
making consitent config imports from diagramAPI
 2023-10-15 22:54:10 +00:00
RounakJoshi09
0a0bd0ac97
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-14 07:58:09 +05:30
RounakJoshi09
4051b42b5a documentation added, Tests Fixed 2023-10-14 07:26:23 +05:30
RounakJoshi09
6e5cd2b3c2 All Unit Tests Passing 2023-10-14 05:49:51 +05:30
Harshit Anand
345e82abee fix: removed static target=_blank instaed value will fetched from the target attribute 2023-10-14 00:50:09 +05:30
RounakJoshi09
3118c7c532 Unit Test Cases Added 2023-10-13 23:49:01 +05:30
Faris Nabiev
fc0ade2985 chore(sequence): update doc for actors/participant creation/deletion fix 2023-10-13 12:07:36 +03:00
Faris Nabiev
b4f444869e fix: add imperativeState and replace sequenceDb global variables with it 2023-10-12 16:39:31 +03:00