marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-18 06:49:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,117 Commits 207 Branches 185 Tags
a93f37a3fc0c515ac25661f0554e513d5081aa24
Commit Graph

94 Commits

Author SHA1 Message Date
ashishj
7068f6c08a #3238 Added test cases 2022-08-30 18:32:06 +02:00
ashishj
d2aaf6aad9 #3238 Merge from 'develop' 2022-08-30 18:11:10 +02:00
ashishj
e542339ed1 Merge branch 'develop' into 3238_Gitgraph_merge_commits 2022-08-30 17:44:02 +02:00
ashishj
2229a307a1 #3238 Enhancing the merge commit functionality 2022-08-30 17:42:42 +02:00
Alois Klink
b2f5ba3ee8 feat(git): allow custom merge commit ids 
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.

This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
 2022-08-25 23:42:39 +01:00
Lorin Thwaits
6635d4bc97 Grammatical touch-ups 2022-08-19 21:27:13 +01:00
Muhammad Faisal Bin Arba'in
846531363e PR comments 2022-08-01 19:41:53 +08:00
Muhammad Faisal Bin Arba'in
91e369a840 rename const name 2022-08-01 19:41:53 +08:00
Muhammad Faisal Bin Arba'in
81ff4416dc rotate class id when branch more than 8 2022-08-01 19:41:53 +08:00
Knut Sveidqvist
4c30e03f1e Using diagram api to add gitGraph 2022-07-18 16:00:03 +02:00
Knut Sveidqvist
1675174b2a Fix for flowcharts 2022-07-04 12:37:50 +02:00
Ashish Jain
1f4c1c3a6c Merge pull request #3140 from mermaid-js/#3095-Gitgrph-Font-Size 
#3095 Added support for commit & tag label font size
 2022-06-28 19:11:16 +02:00
yutotnh
ca909edbed fix: Typo for documents and comments 2022-06-22 12:39:10 +09:00
ashishj
e29c3d6125 #3095 Added support for commit & tag label font size 2022-06-14 20:36:26 +02:00
ashishj
c147404d1c #3080 Added support for cherry pick commits 2022-06-07 20:32:43 +02:00
ashishj
1851e81794 #3080 Adding rotated commit label functionality 2022-06-07 18:45:07 +02:00
Knut Sveidqvist
2ab1e162ea #3074 Cleanup and fixes for issues with accessibility for gantt and journey diagrams 2022-05-24 18:20:05 +02:00
Knut Sveidqvist
a3878528c6 #3050 Renaming setTitle to setAccTitle 2022-05-17 20:23:45 +02:00
ashishj
91d5c7ed71 #3046 Fixed liniting issue 2022-05-17 19:28:23 +02:00
ashishj
85062ac570 #3046 Add support for cyclic themeVariable rotation for more than 8 branches 2022-05-17 19:15:50 +02:00
Yash-Singh1
bc58c8e03c chore: reduce excessive logs in unit tests 2022-05-10 17:09:42 -07:00
ashishj
3ef7d6fbc6 Added support to change the position of the main branch 2022-05-06 19:37:32 +02:00
Knut Sveidqvist
3b94850084 Merge branch 'develop' into 2732_accesible_charts 2022-05-06 18:10:23 +02:00
Knut Sveidqvist
d8682cfb5f #2732 rendering the title and descr fields for the gitGraph 2022-05-06 17:40:40 +02:00
Yuriy Husnay
d740fa5acf add support for branch ordering 2022-05-04 18:04:41 +03:00
Knut Sveidqvist
fdd7af9089 Adding acc to gitGrapg parser 2022-04-30 16:06:53 +02:00
Hans Petersen
3fcc43efdd Sequence autonumbering and Git fix options parsing 2022-04-28 14:25:25 +02:00
Ashish Jain
a3e6d3cd76 Merge pull request #2954 from husa/feature/2936-gitgraph-pathed-branch-name 
GitGraph: add support for "pathed" branches. fix #2936
 2022-04-21 20:11:39 +02:00
Yuriy Husnay
3f812326a6 gitgraph #2934 support tags for merge commits 2022-04-19 18:02:41 +03:00
Yuriy Husnay
99a8c0d152 fix #2936 add support for "pathed" branches 
allow "/" in branch names
 2022-04-19 17:42:02 +03:00
ashishj
8b29fbe98e Updating Gitgraph docs 2022-04-07 20:13:15 +02:00
Knut Sveidqvist
87b56bdd9a #1252 Adding confuration options and some cleanup, swicth of graphType from git to gitGraph 2022-04-07 18:22:06 +02:00
ashishj
57ac111d05 Added commit types in renderer 2022-03-31 20:52:27 +02:00
ashishj
51e9a6b3aa Added sanitization for gitGraph 2022-03-31 20:12:06 +02:00
Knut Sveidqvist
3ccf027f42 Removing random label for merge commits 2022-03-31 20:06:31 +02:00
ashishj
12c63ff007 Finalizing GitGraph with directives, theming & docs 2022-03-31 19:37:36 +02:00
Knut Sveidqvist
22aca7b3ee #1252 Adding background on commit labels 2022-03-25 08:56:22 +01:00
Knut Sveidqvist
c0335cf5fb #1252 Adding support for tags 2022-03-24 20:25:22 +01:00
Ashish Jain
a9194d4eaa Added test cases for error handling 2022-03-17 20:40:35 +01:00
Knut Sveidqvist
4023be1e84 Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented 2022-03-17 20:07:30 +01:00
Knut Sveidqvist
b78b371025 Added theming support for gitgraph 2022-03-17 20:07:27 +01:00
Ashish Jain
501e62894b Added gitGraph jest test cases 2022-03-17 19:07:57 +01:00
Ashish Jain
c1dead1187 Added branch, merge and checkout error handling scenarios 2022-03-17 19:06:31 +01:00
Ashish Jain
01970d2bbd fix broken rendering for math error 2022-03-17 19:05:19 +01:00
Ashish Jain
243f2b28cd fix for gitGraph (:) and spaces (new line) issue 2022-03-17 19:04:37 +01:00
Knut Sveidqvist
0a8a0790cf Renedring fix in an edge case 2022-03-17 17:35:45 +01:00
Ashish Jain
7bd9286a9b fix checkout if branch already exist 2022-03-10 20:08:26 +01:00
Knut Sveidqvist
781b239d0d Lint fixes 2022-03-10 19:58:56 +01:00
Knut Sveidqvist
2b3f99d0e9 Draft handling of occupied lanes 2022-03-10 19:54:19 +01:00
Knut Sveidqvist
4ff3b23da5 feat: adding highlight and reverse commit types and some pathfinding 2022-03-10 19:34:49 +01:00