Commit Graph

639 Commits

Author SHA1 Message Date
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
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 d6363e908d Fix for issue with rednering in IE as described in #303 2016-03-12 11:28:14 +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
Knut Sveidqvist 6c621f243d Merge pull request #312 from ashsearle/master
Support leading comments for sequenceDiagrams
2016-03-04 07:16:02 +01:00
Ash Searle 9cedbea2cf Support leading comments for sequenceDiagrams 2016-03-02 17:26:21 +00:00
Knut Sveidqvist 2168cce020 Merge pull request #309 from ashsearle/master
Show a little lenience for white-space around names
2016-02-29 07:55:48 +01:00
Ash Searle 7858186ecd Show a little lenience for white-space around names 2016-02-28 18:44:14 +00:00
Knut Sveidqvist d2e9918e5f Merge pull request #307 from maxArturo/add-to-downstream-projs
Update list of downstream projects
2016-02-27 16:21:10 +01:00
Max Arturo AS 9a7b498818 Update list of downstream projects
Add [Previm](https://github.com/kannokanno/previm), allows live viewing of mermaid diagrams + .md from vim
2016-02-24 11:27:24 -06:00
Knut Sveidqvist 3ff23b3c45 Merge pull request #300 from LarryKlugerDS/master
Issue 299: Sequence diagram Loops: changing boxMargin spoils the "loop" notation
2016-02-10 16:51:16 +01:00
LarryKlugerDS 0f7dda9dfc #296 Further edit of build instructions 2016-02-10 09:10:15 +02:00
LarryKlugerDS eef6eb93f8 Issue #296 -- better build instructions 2016-02-10 09:08:19 +02: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
Knut Sveidqvist 193ee657e6 Merge pull request #298 from LarryKlugerDS/master
Issue 297 - src/mermaid.js generates bad code
2016-02-10 07:22:17 +01:00
LarryKlugerDS b5a030c78d Issue 297 - src/mermaid.js generates bad code 2016-02-10 08:16:03 +02:00
Knut Sveidqvist 5e447e8938 Merge pull request #295 from LarryKlugerDS/master
Updated instructions for running tests
2016-02-09 19:14:41 +01:00
Knut Sveidqvist b495a7d834 Merge pull request #288 from tylerlong/master
Add Markdown Plus to Downstream projects
2016-02-09 19:13:56 +01:00
LarryKlugerDS 9aa4a79d6e Updated instructions for running tests 2016-02-09 20:11:10 +02:00
Tyler Long cabd0769a8 Add Markdown Plus to Downstream projects
Markdown Plus is a markdown editor with extra features. The frontend is open source under MIT license. It provides apps for OS X and Windows for purchase.
2016-02-02 09:39:50 +08:00
Knut Sveidqvist 803916c99b Merge pull request #286 from raghur/master
Quote phantomPath so that it doesn't fail on window
2016-02-01 20:31:17 +01:00
Raghu 54433ee555 Quote phantomPath so that it doesn't fail on window
Quote phantomPath so that it doesn't fail on windows when path has spaces. Fixes #236
2016-02-01 11:02:01 +05:30
Knut Sveidqvist 6ee298dc7d New release 2016-01-27 15:02:41 +01:00
knsv 9bd140ce42 Fix for issue windows builds as described in #284 2016-01-26 18:03:58 +01: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
Knut Sveidqvist ab38e17936 Merge pull request #267 from Anoia/master
gh-50 Allow styling of edge labels in css
2015-12-08 22:45:45 +01:00
esther.machata 52fcd18e6a gh-50 Allow styling of edge labels in css 2015-12-08 17:26:17 +01:00
Knut Sveidqvist 9fb980ab2c Merge pull request #265 from gibson042/sequenceDiagram-alias
Allow sequenceDiagram participant aliasing
2015-12-06 13:42:53 +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 425a83c0da Fix for issue #259 2015-11-22 18:55:37 +01: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 64b0517bac Added missing karma dependencies 2015-11-21 12:20:37 +01:00
knsv f52fa46326 Added missing karma dependencies 2015-11-21 11:58:16 +01:00