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,780 Commits 182 Branches 159 Tags
Commit Graph

2780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashish Jain
95677e601a Merge branch '1614_fontFamily' of https://github.com/knsv/mermaid into 1542_take_two 2020-08-13 20:39:39 +02:00
Knut Sveidqvist
32457e83f0 Fix for broken build 2020-08-13 20:23:57 +02:00
Ashish Jain
2519486a02 Merge branch '1614_fontFamily' of https://github.com/knsv/mermaid into 1542_take_two 2020-08-13 20:09:13 +02:00
Ashish Jain
bec3cc437d Fix for interface rendering and positioning 2020-08-13 20:08:09 +02:00
Knut Sveidqvist
525a32f9f0 2020-08-13 20:03:42 +02:00
Ashish Jain
36f8f1902c Removing hard coding with dynamic values for cardinalities 2020-08-13 19:41:33 +02:00
Knut Sveidqvist
bde7b1a828 Html labels set to false in tests 2020-08-13 19:19:19 +02:00
Ashish Jain
9891b383e7 Adding classDiagram-v2 test cases 2020-08-13 18:52:04 +02:00
Ashish Jain
28bc87b873 Merge branch 'develop' into 1542_take_two 2020-08-13 18:27:37 +02:00
Knut Sveidqvist
9223173ef2 Merge branch 'master' into develop 2020-08-13 18:25:04 +02:00
Knut Sveidqvist
50a0c93cce Updated theming docs 2020-08-09 14:22:54 +02:00
Knut Sveidqvist
e06cf70615 Using mermaid 8.7.0 in docs 2020-08-09 14:05:10 +02:00
Knut Sveidqvist
4c38b1a776 Merge branch 'release/8.7.0' 8.7.0 2020-08-09 14:03:20 +02:00
Knut Sveidqvist
677c6d9f89 Release 8.7.0 2020-08-09 14:02:57 +02:00
Knut Sveidqvist
2743681392 Merge branch 'develop' into release/8.7.0 2020-08-09 13:36:09 +02:00
Knut Sveidqvist
aacf84f78a Some documentation updates 2020-08-09 07:45:37 +02:00
Knut Sveidqvist
77541102af Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-08-08 10:59:59 +02:00
Knut Sveidqvist
b337cf9f95
Merge pull request #1605 from jgreywolf/1594-CommentsInClassDiagramNotWorking 
1594 comments in class diagram not working
 2020-08-08 07:44:01 +02:00
Justin Greywolf
f914cb0248 1594-Comment in class diagrams not working 
Slight modification to comment regex to ensure that all lines were being looked at, not just the first one
 2020-08-07 12:08:34 -07:00
Justin Greywolf
c93828569b
Merge pull request #25 from mermaid-js/develop 
Merge from mermaid
 2020-08-07 08:27:21 -07:00
Ashish Jain
61993a032a Initial implementation for cardinality position. 2020-08-07 14:52:42 +02:00
Knut Sveidqvist
b99c14b910
Merge pull request #1599 from jgreywolf/1181-AssignCssClass 
1181 assign css class
 2020-08-05 20:40:07 +02:00
Knut Sveidqvist
8aa0185cb8
Remiving dist from .gitignore 
This due to downstreams libraries that depend on them. We should address this as I agree that dist should be ignored. For now I removed it.
 2020-08-05 18:27:30 +02:00
Knut Sveidqvist
2a1161bff4
Merge pull request #1600 from ryenus/patch-1 
update mermaid-cli repo url
 2020-08-05 18:00:04 +02:00
ryenus
067b495212
update mermaid-cli repo url 
new url: https://github.com/mermaid-js/mermaid-cli
 2020-08-05 05:46:48 +08:00
Justin Greywolf
894369cc73 stop tracking files in dist 2020-08-04 12:08:21 -07:00
Justin Greywolf
9a86accc62 1181-Minor update to regex 2020-08-04 12:05:56 -07:00
Knut Sveidqvist
77be268a70
Merge pull request #1596 from NeilCuzon/develop 
Changes to ReadMe.md, Addition of versionUpdates.md for version tracking.
 2020-08-04 20:08:44 +02:00
Justin Greywolf
1f051d7a9f 1181-Css for class diagrams 
Initial change for supporting custom CSS for use with classDiagrams.
updated `LABEL` regex for specificity
 2020-08-03 12:47:50 -07:00
Justin Greywolf
652b6ae7d2 Update gitignore for dist folder 2020-08-03 12:47:32 -07:00
Justin Greywolf
57a5b09328
Merge pull request #24 from mermaid-js/develop 
merge from mermaid-js:develop
 2020-08-03 12:43:26 -07:00
Neil Cuzon
9b806f2690
Update config.js 2020-08-01 17:19:26 -07:00
Neil Cuzon
1b56a8b696
Update theming.md 2020-07-31 23:45:56 -07:00
Neil Cuzon
5a5d2c770c
Update _sidebar.md 2020-07-31 22:54:47 -07:00
Neil Cuzon
a5d06bde03
Update theming.md 2020-07-31 21:22:18 -07:00
Neil Cuzon
15103ac7fb
Update theming.md 2020-07-31 21:20:55 -07:00
Neil Cuzon
439e735d4b
Update README.md 2020-07-31 21:20:28 -07:00
Neil Cuzon
7f5df308ad
Update README.md 2020-07-31 21:20:26 -07:00
Neil Cuzon
2f97baadc6
Update README.md 2020-07-31 21:16:33 -07:00
Neil Cuzon
c2863156cd
Update versionUpdates.md 2020-07-31 21:12:31 -07:00
Neil Cuzon
75762d64c6
Update theming.md 2020-07-31 21:10:43 -07:00
Neil Cuzon
8209cffcd0
Update versionUpdates.md 2020-07-31 21:10:04 -07:00
Neil Cuzon
70976460ff
Update _sidebar.md 2020-07-31 20:59:27 -07:00
Neil Cuzon
954155b090
Update theming.md 2020-07-31 20:52:06 -07:00
Neil Cuzon
5265bc20f1
Update theming.md 2020-07-31 20:49:35 -07:00
Neil Cuzon
af60a4d407
Update README.md 2020-07-31 19:54:46 -07:00
Neil Cuzon
c9a6dc4fab
Update README.md 2020-07-31 19:14:07 -07:00
Neil Cuzon
9c647dc57a
Update README.md 2020-07-31 17:00:57 -07:00
Knut Sveidqvist
52e688df9b Version bump 2020-07-31 17:07:50 +02:00
Knut Sveidqvist
87f12c7d5a Updated with a small example of a custom theme 2020-07-31 16:04:12 +02:00