mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,153 Commits 158 Branches 138 Tags 344 MiB
Commit Graph

1153 Commits

Author SHA1 Message Date
Adam Wulf 24600355c8 Merge remote-tracking branch 'origin/master' into flow/trapezoid 2019-06-25 22:36:13 -05:00
Adam Wulf db2a21cea1 updated flow parser 2019-06-25 22:30:28 -05:00
Knut Sveidqvist 95967151ae Release 8.1.0 2019-06-25 10:24:57 +02:00
Knut Sveidqvist f2137e4cdd
Merge pull request #861 from Arthaey/remove-console-log 
Remove console.log in classDB.
 2019-06-25 10:14:31 +02:00
Arthaey bba6bb6255 Remove console.log in classDB. 2019-06-23 19:56:50 -07:00
Knut Sveidqvist 7d7bc9782b
Merge pull request #795 from DanShai/fix-class-diagram 
fix class diagram mermaid
 2019-06-16 08:24:03 +02:00
Knut Sveidqvist 5667694652 info diagram to show version of mermaid, bugfixes for gantt chart 2019-06-15 14:29:26 +02:00
Knut Sveidqvist 4cb0b9174b Added info diagram to show the version pf mermaid, buig fixes for gannt diagrams 2019-06-15 14:28:13 +02:00
Knut Sveidqvist 7493031d11 Small doc change 2019-06-15 09:38:02 +02:00
Dan Shai e64d2dcada fixed class diagram hopefuly no conflict 2019-06-14 17:29:40 +03:00
Dan Shai f057bd1e89 fixed class diagram 2nd pr 2019-06-14 08:01:51 +03:00
Dan Shai 1e7e719dbf fixed class diagram 2nd pr 2019-06-14 07:37:16 +03:00
Dan Shai 5b6e9747b7 fixed class diagram 2nd pr 2019-06-14 01:22:46 +03:00
Knut Sveidqvist 803c12877c git push origin masterMerge branch 'ivan-danilov-linkStyle-list-support' 2019-06-11 08:35:59 -07:00
Knut Sveidqvist db5be3c28a Resolving som conflicts from merge 2019-06-11 08:35:46 -07:00
Knut Sveidqvist 434a033411 Resolved an name change issue fom a merge 2019-06-11 08:22:55 -07:00
Knut Sveidqvist fd2ee3e109 Merge branch 'jsyang-patch-1' 2019-06-11 08:20:35 -07:00
Knut Sveidqvist 0816591cf9 Resolved some merge conflicts 2019-06-11 08:20:12 -07:00
Knut Sveidqvist 836d02d0b9
Merge pull request #828 from stanhu/sh-fix-dotted-lines-flowchart 
Fix dotted lines not appearing in flowcharts when HTML labels disabled
 2019-06-11 17:13:51 +02:00
Knut Sveidqvist b951d506d9
Merge pull request #832 from vaniship/master 
fix draw function can only call once
 2019-06-11 17:13:00 +02:00
Knut Sveidqvist 333a13269c git push origin master 
Merge branch 'abzicht-master'
 2019-06-09 12:41:05 -07:00
Knut Sveidqvist e0a70bd352 Merge of latest changesin to pr #804 2019-06-09 12:40:37 -07:00
Knut Sveidqvist fe913ec10f
Merge pull request #705 from Vrixyz/602-cardinality-not-showing 
wip: class diagram  cardinality display
 2019-06-09 11:22:03 -07:00
Knut Sveidqvist 50899b845d Merge branch 'gijswijs-gantt-milestones' 2019-06-09 10:55:58 -07:00
Knut Sveidqvist 3e6396cc4b Merged in recent updates 2019-06-09 10:53:46 -07:00
Knut Sveidqvist a8d9b269ff Fixed reference in test file 2019-06-09 07:07:57 -07:00
Knut Sveidqvist df7dc21893 Merge branch 'no-bloat' 2019-06-09 07:00:29 -07:00
Knut Sveidqvist 750c74eea7 Merge branch 'master' of github.com:knsv/mermaid 2019-06-09 06:51:41 -07:00
Knut Sveidqvist 2f7da8b577 Added test of usage via webpack to the e2e tests 2019-06-09 06:49:40 -07:00
Knut Sveidqvist e2dba9e9b8
Added job listing 2019-06-08 09:09:44 +02:00
Knut Sveidqvist c79fcf7ad5
Update README.md 2019-06-07 15:23:24 +02:00
Knut Sveidqvist c6abc43ca5
Merge pull request #851 from knsv/dependabot/npm_and_yarn/sshpk-1.16.1 
Bump sshpk from 1.13.1 to 1.16.1
 2019-06-04 21:04:00 +02:00
dependabot[bot] 2c1913af23
Bump sshpk from 1.13.1 to 1.16.1 
Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.13.1 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.13.1...v1.16.1)
 2019-06-04 19:01:24 +00:00
Fabio Spampinato ed3d15501a Aligned “lodash” version with other dependencies, so that it gets deduplicated 2019-06-04 03:52:01 +02:00
Fabio Spampinato fef85cf259 Importing only specific modules from "lodash" 2019-06-04 03:32:56 +02:00
Fabio Spampinato 00be016979 Avoiding publishing the “src” folder to NPM 2019-06-04 03:17:14 +02:00
Fabio Spampinato 9290aa2b61 Replaced “moment” with “moment-mini" 2019-06-04 03:14:35 +02:00
Knut Sveidqvist 977491ef8d Merge branch 'master' of github.com:knsv/mermaid 2019-06-01 19:21:59 +02:00
Knut Sveidqvist 86fcbf9c5e Added e2e tests and snapshot files 2019-06-01 19:21:15 +02:00
Knut Sveidqvist e081e4c9c6 Fixed som dependencies 2019-05-31 14:59:23 +02:00
Knut Sveidqvist 357e738983 Adding image snapshots for graphs 2019-05-31 14:20:43 +02:00
Knut Sveidqvist 7242a98adb Moving jest config out of package.json to facilitate different jest configurations for unit tests and e2e tests 2019-05-30 19:31:41 +02:00
Knut Sveidqvist 6974892a11 Added jest, jest-puppeteer and jest-image-snapshot for e2e tests 2019-05-30 19:27:27 +02:00
Knut Sveidqvist ee0cb8793f
Merge pull request #791 from flying-sheep/svg-links 
SVG link rendering
 2019-05-28 23:18:39 +02:00
Knut Sveidqvist 0cfd3c7e02
Merge pull request #749 from monsterkrampe/issue-748-make-mermaid-class-diagrams-usable-in-stackedit 
Make Class Diagrams usable in Stackedit and Live Editor
 2019-05-28 22:32:36 +02:00
Knut Sveidqvist 23693bd57e
Merge pull request #845 from Qix-/style-subgraph 
Support styling of subgraphs
 2019-05-28 22:22:45 +02:00
Knut Sveidqvist d742211797
Merge pull request #837 from jnnnnn/master 
fix dark theme loop labels not visible
 2019-05-28 22:16:22 +02:00
Knut Sveidqvist 9191663a1a
Merge pull request #792 from jopapo/master 
Added exclude weekdays to definition
 2019-05-28 22:12:18 +02:00
Knut Sveidqvist b3dd2a4282
Merge pull request #810 from 0xflotus/patch-1 
fixed diagrams
 2019-05-28 22:01:58 +02:00
Josh Junon f51596eb61 Support styling of subgraphs 2019-05-24 17:08:45 +02:00