GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-21 06:53:17 +08:00
Code Issues Projects Releases Wiki Activity
8,866 Commits 185 Branches 159 Tags
Commit Graph

8866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guy Pursey
b0b276898a GitGraph: fixed an e2e branch for vertical branch 
Fix for error spotted by @mathbraga
 2023-10-31 17:24:13 +00:00
Guy Pursey
25a678caec GitGraph: added e2e tests for multiple branches from one commit 2023-10-31 17:24:13 +00:00
Guy Pursey
3e18e76d31 GitGraph: removed check of branch with main from arrow reroute fn 
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.

This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
 2023-10-31 17:24:13 +00:00
Guy Pursey
3ba33c8b75 GitGraph: added more to demos 2023-10-31 17:24:13 +00:00
Guy Pursey
7c87df7cf6 GitGraph: rename overlap check to shouldRerouteArrow 
The function also now does an additional check to see
if source branch in overlap check is on main.

As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
 2023-10-31 17:24:13 +00:00
Guy Pursey
dba7197fc6 GitGraph: simplified overlapping check fn 2023-10-31 17:24:13 +00:00
Guy Pursey
902a9dd42b GitGraph: added and updated demos to align with some of e2e testing 2023-10-31 17:24:13 +00:00
Guy Pursey
461a293d71 GitGraph: refactored overlapping fn for efficiency/performance 
On previous rewrite, I had created new functions within the
overlapping functions but these were being recreated on each
iteration of Object.some(). I moved them outside this for
clarity and so they're not recreated each iteration.
 2023-10-31 17:24:13 +00:00
Guy Pursey
9f8457d249 GitGraph: Rewrote overlap fn to make main branch exception to rule. 2023-10-31 17:24:13 +00:00
Guy Pursey
8c43d2273f GitGraph: added destination branch check into overlapping fn. 2023-10-31 17:24:13 +00:00
Guy Pursey
69ec4a0359 GitGraph: Added cherry-pick and merge demos for to GitGraph. 2023-10-31 17:24:13 +00:00
Guy Pursey
9469f759a9 GitGraph: Moved overlapping commit arrow colour inside conditional 2023-10-31 17:24:13 +00:00
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
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
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
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
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
35b364c4ea Merge branch 'release/10.5.1' 2023-10-20 14:32:32 +02:00
Knut Sveidqvist
b70959daa7 Version 10.5.1 v10.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
dependabot[bot]
0e328823b9
Bump @babel/traverse from 7.22.10 to 7.23.2 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.10 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-17 11:08:38 +00:00
Sidharth Vinod
33a5fc459d
Merge pull request #4945 from mermaid-js/renovate/patch-all-patch 
chore(deps): update all patch dependencies (patch)
 2023-10-17 10:56:23 +00:00
renovate[bot]
e4350f80fe
chore(deps): update all patch dependencies 2023-10-16 19:52:01 +00: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
Marcel Ribeiro-Dantas
9080f1f354
Revert typo fix 2023-10-12 01:33:25 -03:00