1919 Commits

Author SHA1 Message Date
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
knsv
24d1afd40f Redering arrow heads depending on relation defined in class diagram. 2015-11-07 10:00:40 +01:00
Knut Sveidqvist
2278325822 Merge pull request #253 from gibson042/optional-terminal-newline
Make sequenceDiagram terminal newline optional
2015-11-06 20:17:19 +01:00
Richard Gibson
dbd63ff797 Make sequenceDiagram terminal newline optional
Fixes gh-229
2015-11-06 10:47:59 -05:00
Richard Gibson
26ebbf82ee Support sequenceDiagram "over" notes 2015-11-06 03:00:02 -05:00
knsv
f79577c816 Merge remote-tracking branch 'origin/master' 2015-11-06 07:23:44 +01:00
Knut Sveidqvist
ecca3588bc Merge pull request #251 from gibson042/gh-247
Properly handle "rest of line" statements
2015-11-06 07:23:23 +01:00
Richard Gibson
ec37fc897b Clean up lexer definitions 2015-11-06 00:05:16 -05:00
Richard Gibson
5666d5f298 Properly handle "rest of line" statements
Closes gh-247
2015-11-06 00:05:00 -05:00
Richard Gibson
6ac0c00e30 Add no-label test cases 2015-11-06 00:04:01 -05:00
Richard Gibson
990cab53a9 Add special-character test cases 2015-11-06 00:04:01 -05:00
Richard Gibson
18766466c6 Minor test cleanup 2015-11-06 00:04:01 -05:00
Richard Gibson
73e1957c62 Be explicit about testing semicolons 2015-11-06 00:04:00 -05:00
Richard Gibson
e0a31feaec Make testing quieter 2015-11-06 00:04:00 -05:00
Tomasz Szczęśniak-Szlagowski
ef290796e0 Fix a bug in CSS cloning error handler
Firefox throws SecurityError when `cssRules` is accessed, which exposes
this bug.

Fixes #245
2015-11-05 19:38:36 +00:00
knsv
c8fef693fa Added extension markers for classDiagrams
Added styling (forest) for classDiagrams
2015-11-04 20:38:14 +01:00
Martin Zaloudek
5d7815c98a flowRender.js - Fix fontAwesome icon insert
Missing ending tag </i> in fontAwesome icon inserting.
2015-11-04 15:46:31 +01:00
knsv
7fe5b5af7a Rendering of class diagrams with methods and members represented 2015-11-01 19:00:14 +01:00
knsv
068b7ce6a9 Simple rendering of class diagrams 2015-10-30 11:34:24 +01:00
knsv
7a58e8261f Simple rendering of class diagrams 2015-10-30 10:47:25 +01:00
knsv
01ddfea478 1st version parsing for class diagrams, parsing draft completed, starting rendering work 2015-10-29 07:49:08 +01:00
knsv
a694f61003 1st version parsing for class diagrams, fetching data from parsing 2015-10-28 08:12:47 +01:00
Tomasz Szczęśniak-Szlagowski
51d5c90c9f Add build with new ellipse syntax 2015-10-26 23:03:07 +00:00
Tomasz Szczęśniak-Szlagowski
e4d25ed9cd Add support for node(-ellipse shape-) in flow charts 2015-10-26 23:03:07 +00:00
knsv
1a60b6e412 1st version parsing for class diagrams 2015-10-26 08:03:30 +01:00
knsv
dd6495abf6 1st version parsing for class diagrams 2015-10-25 18:09:58 +01:00
knsv
35865ba70e Starting work with addition of class diagrams 2015-10-25 11:35:26 +01:00
Tomasz Szczęśniak-Szlagowski
30149df88e Allow node ids with keywords as suffixes
I've extracted alpha and punctuation characters from the huge regex and
made multiple occurences of alpha characters be recognised as a single
ALPHA token.

This way everything should work just like before, with the
difference that alpha strings will swallow keywords, ie. `spend` is
`ALPHA`, while previously it would have been `ALPHA ALPHA end`.
2015-10-24 22:25:13 +01:00