GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
2,314 Commits 182 Branches 159 Tags
Commit Graph

2314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toan
6e13718cbd naming the link/connector edgeLabel and edgePath to let easy query and custom. 2020-06-11 11:42:14 +07:00
Knut Sveidqvist
2bb6922e7f
Merge pull request #1446 from jgreywolf/1378-AdditionalQualifiersBugWithMultipleArguments 
1378 additional qualifiers bug with multiple arguments
 2020-06-10 18:57:40 +02:00
Justin Greywolf
67e167427c 1378-Added additional test 2020-06-09 14:54:08 -07:00
Justin Greywolf
969a4e7ba5 1378-refine legacy member parsing to cover additional cases 2020-06-09 14:25:03 -07:00
GDFaber
a5aa38ce3c
Merge pull request #1459 from ameech/patch-1 
Fixed Typo
 2020-06-09 04:34:01 +02:00
Justin Greywolf
0495103635 Fix regex and Fix incorrect test 2020-06-08 19:21:33 -07:00
Justin Greywolf
ae6b75b62a Removed additional unintended change 2020-06-08 18:47:36 -07:00
Justin Greywolf
9091d686ed 1378-Update regex to match multiple parameters 
removing node version changes
 2020-06-08 18:42:29 -07:00
Justin Greywolf
47b5d7a2df 1378-accept multiple parameters with methods 
sec
 2020-06-08 18:42:29 -07:00
Justin Greywolf
6298a7a357
Merge pull request #22 from mermaid-js/develop 
merge from base fork
 2020-06-08 18:42:10 -07:00
Adam Meech
45c63e2b82
Fixed Typo 2020-06-08 17:14:46 -05:00
Knut Sveidqvist
7c4bff567b Merge branch 'master' into develop 2020-06-07 11:08:26 +02:00
Knut Sveidqvist
df2a5e97f8
Update index.html 2020-06-07 11:06:07 +02:00
Knut Sveidqvist
e9e5c75dec 8.5.2 Release build 8.5.2 2020-06-07 10:39:21 +02:00
Knut Sveidqvist
21e4387a39 Merge branch 'release/8.5.2' 2020-06-07 10:35:57 +02:00
Knut Sveidqvist
67ef829e04 Bump of version 2020-06-07 10:24:49 +02:00
Knut Sveidqvist
8b2b9713ce
Merge pull request #1451 from mermaid-js/dependabot/npm_and_yarn/websocket-extensions-0.1.4 
Bump websocket-extensions from 0.1.3 to 0.1.4
 2020-06-07 10:22:25 +02:00
Ashish Jain
b7f998094f
Merge pull request #1450 from mermaid-js/feature/1447_return_svg_at_syntax_error 
Feature/1447 return svg at syntax error
 2020-06-06 19:41:32 +02:00
dependabot[bot]
c324200f70
Bump websocket-extensions from 0.1.3 to 0.1.4 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-06 17:20:32 +00:00
Knut Sveidqvist
db3377e170 Lint fixes 2020-06-06 12:53:19 +02:00
Knut Sveidqvist
85a8feec9d Also fix for error handling when setting mermaid.parseError 2020-06-06 12:42:35 +02:00
Knut Sveidqvist
22b0ddfb42
Merge pull request #1439 from GDFaber/feature/build_and_publish_dev_and_prod_code 
Build development and production code in one go and include it into the repository
 2020-06-02 18:59:28 +02:00
Marc Faber
1cc94f8353 Add js and map files in dist folder to repository 2020-06-01 15:23:46 +02:00
Marc Faber
7d2a7d24a6 Remove entries in git ignore file 2020-06-01 15:16:41 +02:00
Marc Faber
73056f5620 Build development and production code in one go and include it into the repository 2020-06-01 14:44:53 +02:00
Knut Sveidqvist
2c271acfe9
Merge pull request #1438 from mermaid-js/1436_intersection_with_circles 
1436 intersection with circles
 2020-05-30 18:54:30 +02:00
Knut Sveidqvist
b76e833ea5 #1436 Correcting intersection calculations for circles 2020-05-30 18:04:46 +02:00
Knut Sveidqvist
3bdb9f289f Merge branch 'master' into develop 2020-05-30 17:11:23 +02:00
Justin Greywolf
97b8684e1a
Merge pull request #21 from mermaid-js/develop 
merge from base
 2020-05-27 14:57:39 -07:00
Knut Sveidqvist
8958b2aa1b
Merge pull request #1432 from mermaid-js/1418_html_labels_rendering_engine 
1418 html labels rendering engine
 2020-05-27 22:34:26 +02:00
Knut Sveidqvist
cf0fb69153 #1418 Lint fixes 2020-05-27 22:23:53 +02:00
Knut Sveidqvist
8603cf89b0 #1418 Fix for descriptions in states 2020-05-27 22:18:59 +02:00
Knut Sveidqvist
39ef0107ad #1418 Fix for titles in stateDiagram clusters 2020-05-27 21:47:07 +02:00
Knut Sveidqvist
63d7b63f42 #1418 Fix fr background in notes when using htmlLabels 2020-05-27 21:20:18 +02:00
Knut Sveidqvist
4ea6c98f43 #1418 Adding support for htmlLabels in stateDiagram (v2) 2020-05-27 20:41:59 +02:00
Knut Sveidqvist
39bdf261c6 2020-05-27 19:38:30 +02:00
Knut Sveidqvist
cb3e13e9e5
Merge pull request #1430 from yonasb/develop 
Add Azure Devops native support to integrations list
 2020-05-27 19:30:46 +02:00
Knut Sveidqvist
7a7e8fe741
Merge pull request #1425 from spopida/bug/1415_erd_empty_label_not_working 
Ensure empty quoted relationship labels are accepted in ER diagrams
 2020-05-27 19:30:21 +02:00
Yonas
4a9e691747
Merge pull request #1 from yonasb/docs/add-azure-integration 
Add Azure Devops native support to integrations list
 2020-05-27 10:09:37 -07:00
Yonas
4026c57834
Add Azure Devops to integrations list 2020-05-27 10:05:43 -07:00
Adrian Hall
f1c05bc909 Ensure empty quoted relationship labels are accepted in ER diagrams 2020-05-23 13:33:44 +01:00
Knut Sveidqvist
18d3b3545d
Merge pull request #1422 from kevinkhill/patch-1 
Update flowchart.md
 2020-05-22 09:37:48 +02:00
Knut Sveidqvist
a03d9fba10
Merge pull request #1419 from korycins/patch-1 
Fix config param name. Drop duplicated field in css example.
 2020-05-22 09:36:24 +02:00
Knut Sveidqvist
ef24020b14
Merge pull request #1411 from ivan-danilov/sequence-over-notes-position-fix 
Fixed SequenceDiagram over note horizontal position
 2020-05-22 09:33:54 +02:00
Kevin Hill
d16d969799
Update flowchart.md 2020-05-21 04:33:58 -07:00
Maciej Korycinski
232f1fda6d
Fix config param name. Drop duplicated field in css example. 2020-05-19 11:09:08 +02:00
Knut Sveidqvist
c1fd7fdad0
Updated version of mermaid in the docs 
8.5.1
 2020-05-17 10:29:55 +02:00
Knut Sveidqvist
9470a4f1ed Release 8.5.1, bumped version in package.json 8.5.1 2020-05-17 10:04:09 +02:00
Knut Sveidqvist
9da027cf74 Fix for intersect issues for start/end state 2020-05-17 09:34:56 +02:00
Knut Sveidqvist
45e9988700 Lint fix 2020-05-16 21:59:13 +02:00