Commit Graph

709 Commits

Author SHA1 Message Date
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
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