296 Commits

Author SHA1 Message Date
Raghu Rajagopalan
5cb44d55ff logger improvements - allow multiple args 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
8befe916fb WIP - pretty print commit on console 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
d3caa9b97d handle merge commits in history walk 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
2d99ccfcda Handle merge commit with two parents 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
92be61dc48 make logger print object instead of string concatentation 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
2fecb4d945 handle case when merge is a noop 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
462c3d3a6c handle fast forward merges 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
422d78cbcd basic reset command 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
7b0e2513bd refactor fns in ast 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
f8f0454f33 add another test for checkout 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
d937a3c552 support orientation, commit msg, branch checkout 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
dbd2855bfc first couple of tests for the half baked parser 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
8084d80d64 WIP - very basic grammar 2016-04-25 11:35:44 +05:30
Knut Sveidqvist
2de974f71d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	dist/mermaid.js
#	dist/mermaid.min.js
#	dist/mermaid.slim.js
#	dist/mermaid.slim.min.js
#	dist/mermaidAPI.js
#	dist/mermaidAPI.min.js
#	dist/mermaidAPI.slim.js
#	dist/mermaidAPI.slim.min.js
2016-03-23 20:35:34 +01:00
Knut Sveidqvist
bda1aaa5db Draft fix for issue #304 2016-03-23 20:34:44 +01:00
Josh Bronson
2acaef67b1 Support title in parser, add to renderer, with naive positioning logic 2016-03-14 17:51:03 -04:00
Knut Sveidqvist
1ad9e75a86 Merge pull request #318 from ciekawy/activation_draft
activations doc + few fixes
2016-03-14 07:20:15 +01:00
Knut Sveidqvist
e9c6db4d8c Merge pull request #317 from crodriguez1a/feature/dark-theme
Dark theme for better contrast on darker backgrounds
2016-03-14 07:14:37 +01:00
Szymon Stasik
68b65ba5d4 adjust activation after message to self 2016-03-12 19:40:45 +01:00
Szymon Stasik
c3f840126c fix loop/block bounds with activations through them 2016-03-12 19:33:35 +01:00
Carlos Rodriguez
d763fffd7a some clean up, fix mix.html 404 2016-03-12 13:23:31 -05:00
Szymon Stasik
0435509952 fix message to self with activation 2016-03-12 18:39:49 +01:00
Carlos Rodriguez
bba1050e5e Use mix as test file instead 2016-03-12 12:36:37 -05:00
Carlos Rodriguez
28f9e6f17b Starting with gantt theme 2016-03-12 12:00:47 -05:00
Knut Sveidqvist
b3d147b97a Merge pull request #316 from ciekawy/activation_draft
Activations
2016-03-12 16:41:43 +01:00
Szymon Stasik
3f85391bde better align activation box start 2016-03-12 15:50:11 +01:00
Szymon Stasik
513c35d0ef handle one line arrow activation notation 2016-03-12 15:27:37 +01:00
Szymon Stasik
499a2582e6 fix deactivating proper actor from activation stack 2016-03-12 13:58:22 +01:00
knsv
325d0dd075 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	dist/mermaid.js
2016-03-12 11:24:22 +01:00
knsv
2c90034d39 Fix for issue with rednering in IE as described in #303 2016-03-12 11:23:57 +01:00
Szymon Stasik
614e9f4b87 draw activation boxes 2016-03-11 16:44:45 +01:00
Szymon Stasik
2452532557 draft of activation boxes handling 2016-03-08 10:40:52 +01:00
Ash Searle
9cedbea2cf Support leading comments for sequenceDiagrams 2016-03-02 17:26:21 +00:00
Ash Searle
7858186ecd Show a little lenience for white-space around names 2016-02-28 18:44:14 +00:00
LarryKlugerDS
31f78d1aa9 Issue 299: Sequence diagram Loops: changing boxMargin spoils the "loop" notation
In Sequence diagrams, a loop section draws a box with the word "loop"
in the top left corner. This is all good. In addition, the title of the
loop is in the center of the box, near the top of the box.

To add a bit of margin between the Loop title and the line at the top
of the box, change the configuration field boxMargin

Problem: by error, the boxMargin is also used for positioning the
"loop" label. SInce the loop label is in a fixed small place, changing
boxMargin causes the word "loop" to move out of its box.
2016-02-10 08:33:12 +02:00
LarryKlugerDS
b5a030c78d Issue 297 - src/mermaid.js generates bad code 2016-02-10 08:16:03 +02:00
knsv
f005c72669 Fix for issue #281, support for Chrome v 48 2016-01-25 18:59:03 +01:00
knsv
d56af022c1 Fix for issue #262 2015-12-27 15:57:11 +01:00
knsv
cc8c5aecaf Fix for issue #271 2015-12-27 14:18:21 +01:00
knsv
8c8f5928f5 Changes to build environment for windows compatability 2015-12-26 10:59:44 +01:00
esther.machata
52fcd18e6a gh-50 Allow styling of edge labels in css 2015-12-08 17:26:17 +01:00
Richard Gibson
b42939796c Allow sequenceDiagram participant aliasing
Fixes gh-263
2015-12-06 05:53:08 -05:00
Richard Gibson
69ce29841d Test for sequenceDiagram participant aliasing 2015-12-06 05:51:02 -05:00
knsv
a9f4f8e06c Fix for issue #259 2015-11-22 18:53:09 +01:00
knsv
989ff03e43 Set version to 0.5.6
Removed logging
One more iteration in handling of parser API
2015-11-22 18:10:38 +01:00
knsv
51858c02eb Fix for issues #249. Adding configuration option for when to use absolute references for arrow heads. Default is off.
Jasmine tests running in browser via karma.
2015-11-21 11:51:15 +01:00
knsv
4eb38e4cfd Fix for issues #239 and #257. 2015-11-15 15:06:24 +01:00
knsv
774ebfe671 Version change of babelify 2015-11-11 18:37:53 +01:00
knsv
6e2534aa77 Labels for relations between classes in classdiagrams 2015-11-11 16:19:06 +01:00
knsv
ad4e0a2ad5 Labels for relations between classes in classdiagrams 2015-11-11 13:16:38 +01:00