568 Commits

Author SHA1 Message Date
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
Richard Gibson
c62061090a CLI: Propagate exit code from lib (i.e., phantomjs) 2015-11-05 15:50:59 -05:00
Tomasz Szczęśniak-Szlagowski
0f689c2ea1 Commit built files 2015-11-05 19:40:42 +00: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
knsv
a9ac654040 Class diagram example 2015-11-04 16:36:19 +01:00
Knut Sveidqvist
17be68f5d9 Merge pull request #244 from ma-zal/master
flowRender.js - Fix FontAwesome icon insert
2015-11-04 16:21:18 +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
eec89e0442 Merge remote-tracking branch 'origin/master' 2015-10-30 10:47:51 +01:00
knsv
7a58e8261f Simple rendering of class diagrams 2015-10-30 10:47:25 +01:00
Knut Sveidqvist
eec0aced7f Merge pull request #240 from r-a-v-a-s/patch-1
updated links in README.md
2015-10-30 08:47:27 +01:00
ravas
74eb2e4493 updated links in README.md 2015-10-29 23:06:36 -07: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
Knut Sveidqvist
d3a025acd6 Merge pull request #237 from spect88/ellipse-syntax
Ellipse syntax
2015-10-27 07:23:40 +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
Knut Sveidqvist
cee267193f Merge pull request #235 from spect88/fix-keyword-suffix
Allow keywords as suffixes of node ids
2015-10-25 07:38:14 +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
Tomasz Szczęśniak-Szlagowski
841aea9d97 Add changes in generated files after jison update 2015-10-24 21:33:19 +01:00
knsv
d68323d7bb Using the latest jison in build 2015-10-24 20:45:42 +02:00
knsv
a583daf712 Using the latest jison in build 2015-10-24 20:33:52 +02:00
knsv
cf1912523b Using the latest jison in build 2015-10-24 20:27:54 +02:00
knsv
eecd56d6e0 Fix for issue #229, poor handling of activities in a gantt diagram where one activities follows a yet undefined activity. 2015-10-24 12:44:47 +02:00
Knut Sveidqvist
1cd1423780 Merge pull request #230 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-10-23 20:13:16 +02:00
The Gitter Badger
68812b0f04 Add Gitter badge 2015-10-23 18:12:08 +00:00
knsv
c9d29c16e2 New release 0.5.5 2015-10-21 21:14:41 +02:00
Knut Sveidqvist
185233c971 Merge pull request #228 from tylerlong/master
Fix a typo: crosshead --> arrowhead
2015-10-21 16:19:00 +02:00
Tyler Long
ca42976c62 Merge pull request #1 from tylerlong/tylerlong-patch-1
Fix a typo: crosshead --> arrowhead
2015-10-21 03:08:29 -07:00
Tyler Long
9ff2b35ae0 Fix a typo: crosshead --> arrowhead
Fix https://github.com/knsv/mermaid/issues/227
2015-10-21 18:07:51 +08:00
knsv
ecb12ae2a8 New release 0.5.4 2015-10-19 22:08:17 +02:00
knsv
b43e695da2 Fix for issue #204, added width option to the CLI. Default value for width is 1200.
Added logger using es6 syntax
2015-10-19 21:36:55 +02:00
knsv
57b731842b Fixed uglify command 2015-10-17 15:21:34 +02:00
knsv
a8ef091cd6 Fixed uglify command 2015-10-17 15:12:59 +02:00
knsv
315923d1d3 Modernization of build environment, better linting, adjustment after stricter static rules, cleanup of package.json 2015-10-17 12:46:36 +02:00
knsv
632a564158 Modernization, better linting, adjustment after stricter static rules 2015-10-17 10:39:20 +02:00
knsv
8365fcc2f9 Modernization, better linting, adjustment after stricter static rules 2015-10-17 10:38:05 +02:00
knsv
2417741283 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.slim.js
#	dist/mermaidAPI.slim.min.js
#	package.json
2015-10-15 07:21:30 +02:00
Knut Sveidqvist
e0033965bc Merge pull request #224 from spect88/fix-end-substring
Allow `end` as a substring of vertex id
2015-10-15 07:16:59 +02:00
Knut Sveidqvist
ae73583d53 Merge pull request #223 from spect88/remove-duplicate-dependencies
Remove duplicate npm dependencies: d3 and he
2015-10-15 07:14:49 +02:00
Tomasz Szczęśniak-Szlagowski
b87764ed94 Allow end as a substring of vertex id
Jison adds \b (word boundary) to literal string patterns by default.
It does so, because it doesn't follow traditional match-longest
approach, but does match-first instead. Without including word
boundaries, it'd be hard to distinguish between a keyword and
identifier.

The pattern for `end` keyword is not a simple string literal - it
swallows trailing whitespace, so we have to add \b manually.

This partially fixes #184 - at least now `end` behaves the same as other
keywords: it can be used as a prefix and infix, but not as a suffix.

To solve this issue completely, ALPHA pattern would have to match
multiple letters, which is a much bigger change.
2015-10-15 00:31:18 +01:00
Tomasz Szczęśniak-Szlagowski
7e9e9cc98c Remove duplicate npm dependencies: d3 and he
These are already defined as dependencies (same versions), so there's
no point keeping them as devDependencies. npm complains about that.
2015-10-14 21:52:41 +01:00
knsv
658ed3d790 Modernization of build environment. Less gulp, more npm. Eslint. 2015-10-12 07:37:02 +02:00
knsv
ed65e6df3b Draft of font-awesome support as described in issue #49. 2015-10-07 18:35:30 +02:00