marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-30 10:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
530 Commits 228 Branches 190 Tags
c2bc3317c3ff8e687101628b711f09efc22f815f
Commit Graph

530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raghu Rajagopalan
c2bc3317c3 WIP - basic arrows. 2016-04-25 11:36:36 +05:30
Raghu Rajagopalan
413c6e12f5 WIP - Bug - shows only 5 of 6 nodes with test file. 2016-04-25 11:36:36 +05:30
Raghu Rajagopalan
65140f6b3f WIP - able to draw circles now. 2016-04-25 11:36:36 +05:30
Raghu Rajagopalan
2fee6e62aa WIP - scaffolding for rendering gitgraph. 2016-04-25 11:36:36 +05:30
Raghu Rajagopalan
4b91dbfed6 gitgraph.jison - handle LF & CRLF as line endings 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
e17b35a96a WIP-hook up a renderer 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
44dc30c02c add pretty print function 2016-04-25 11:35:44 +05:30
Raghu Rajagopalan
038062b3c3 fix bug in tracking parent commits 2016-04-25 11:35:44 +05:30
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
d585121bdb Merge pull request #338 from ssbarnea/master 
Build and test execution changes
 2016-03-29 20:00:34 +02:00
Knut Sveidqvist
9e496175d9 Merge pull request #331 from Jmuccigr/master 
Reformatting of css files
 2016-03-29 19:59:00 +02:00
Sorin Sbarnea
e6fcc2b3e3 Added LTS and current STABLE versions of nodejs to Travis test matrix. 2016-03-29 14:16:25 +01:00
Sorin Sbarnea
f748969186 Removed dist/ directory from source as is not supposed to be tracked here. 2016-03-29 14:15:48 +01:00
Sorin Sbarnea
4750769c63 Configured travis to use an osx_image which has nvm preinstalled. 2016-03-29 12:54:58 +01:00
Sorin Sbarnea
8c5c2b0fe1 Attempt to convince Travis to install the missing nvm 2016-03-29 12:49:17 +01:00
Sorin Sbarnea
1b04dbf7f9 Fixed .gitignore 2016-03-29 12:41:57 +01:00
Sorin Sbarnea
97e208f081 Enabled OS X build on Travis. 2016-03-29 12:37:46 +01:00
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
John Muccigrosso
b69010d83b Merge pull request #2 from Jmuccigr/patch-2 
Reformat with no changes to content.
 2016-03-21 19:16:14 -04:00
John Muccigrosso
2e3bc443ff Merge pull request #1 from Jmuccigr/patch-1 
Reformat with no changes to content.
 2016-03-21 19:15:14 -04:00
John Muccigrosso
d2e3517c78 Reformat with no changes to content. 2016-03-21 19:11:38 -04:00
John Muccigrosso
e930c5a30c Reformat with no changes to content. 2016-03-21 19:10:33 -04:00
Knut Sveidqvist
fb500ace8a Merge pull request #320 from bronsoja/seq-diagram-title-support 
(WIP) Sequence Diagram Title Support
 2016-03-16 19:40:59 +01:00
Josh Bronson
4f9a2a8083 Update dist files 2016-03-14 18:09:27 -04: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
d070029856 activations doc 2016-03-12 19:54:09 +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
7404de6776 fix bad spacing 2016-03-12 13:24:53 -05: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