Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support git graph diagrams in mermaid #344

Merged
merged 43 commits into from
Apr 28, 2016
Merged

Support git graph diagrams in mermaid #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
8084d80
WIP - very basic grammar
raghur Mar 26, 2016
dbd2855
first couple of tests for the half baked parser
raghur Mar 26, 2016
d937a3c
support orientation, commit msg, branch checkout
raghur Mar 27, 2016
f8f0454
add another test for checkout
raghur Mar 27, 2016
7b0e251
refactor fns in ast
raghur Mar 27, 2016
422d78c
basic reset command
raghur Mar 27, 2016
462c3d3
handle fast forward merges
raghur Mar 27, 2016
2fecb4d
handle case when merge is a noop
raghur Mar 27, 2016
92be61d
make logger print object instead of string concatentation
raghur Mar 27, 2016
2d99ccf
Handle merge commit with two parents
raghur Mar 27, 2016
d3caa9b
handle merge commits in history walk
raghur Mar 27, 2016
8befe91
WIP - pretty print commit on console
raghur Mar 27, 2016
5cb44d5
logger improvements - allow multiple args
raghur Mar 28, 2016
038062b
fix bug in tracking parent commits
raghur Mar 28, 2016
44dc30c
add pretty print function
raghur Mar 28, 2016
e17b35a
WIP-hook up a renderer
raghur Mar 29, 2016
4b91dbf
gitgraph.jison - handle LF & CRLF as line endings
raghur Mar 29, 2016
2fee6e6
WIP - scaffolding for rendering gitgraph.
raghur Mar 29, 2016
65140f6
WIP - able to draw circles now.
raghur Mar 29, 2016
413c6e1
WIP - Bug - shows only 5 of 6 nodes with test file.
raghur Mar 30, 2016
c2bc331
WIP - basic arrows.
raghur Mar 30, 2016
43ab44d
fix LR layout - node position and arrow direction.
raghur Mar 30, 2016
9cb9407
working but ugly
raghur Mar 31, 2016
c6494f9
draw bezier curves - still butt ugly
raghur Mar 31, 2016
0d6d848
WIP - code simplified. Draw arrows later. still ugly
raghur Mar 31, 2016
942bd02
handle multiple branches; handle unmerged branches
raghur Mar 31, 2016
d8805ae
WIP - prettier curves.
raghur Apr 1, 2016
a92e116
remove magic nos in renderer
raghur Apr 1, 2016
59ef2b0
Options are working.
raghur Apr 1, 2016
5dcd3e6
Apply commit and branch labels using foreignObjects.
raghur Apr 2, 2016
89307d3
foreignObject works. labels work! Yeah!
raghur Apr 2, 2016
0538048
add case block for mermaid api parser.
raghur Apr 4, 2016
6032e05
fix eslint issues.
raghur Apr 25, 2016
6c28c55
Update node label distance.
raghur Apr 25, 2016
719ee2e
fix more eslint issues
raghur Apr 25, 2016
6ff536f
fix eslintrc so eslint doesn't barf - duplicated keys
raghur Apr 25, 2016
a5a3bc8
fix logging output in prettyprint
raghur Apr 26, 2016
6a674a0
add support for BT rendering
raghur Apr 26, 2016
4e26b8e
Support different colors for each branch
raghur Apr 27, 2016
1d8d42a
Show commit msg if available in BT orientation
raghur Apr 27, 2016
b634439
infer svg height, width from # of nodes
raghur Apr 27, 2016
6521cc8
formatting clean up
raghur Apr 28, 2016
75c9deb
fix branching lines
raghur Apr 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
"no-lone-blocks": 0,
"no-lonely-if": 0,
"no-loop-func": 0,
"no-mixed-requires": [0, false],
"no-mixed-spaces-and-tabs": [2, false],
"linebreak-style": [0, "unix"],
"no-multi-spaces": 0,
Expand Down Expand Up @@ -125,7 +124,6 @@
"no-undef-init": 0,
"no-undefined": 0,
"no-unexpected-multiline": 0,
"no-underscore-dangle": 0,
"no-unneeded-ternary": 0,
"no-unreachable": 2,
"no-unused-expressions": 0,
Expand Down Expand Up @@ -160,7 +158,6 @@
"default-case": 0,
"dot-location": 0,
"dot-notation": [0, { "allowKeywords": true }],
"eol-last": 0,
"eqeqeq": 0,
"func-names": 0,
"func-style": [0, "declaration"],
Expand Down
Loading