GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity
2,729 Commits 180 Branches 159 Tags
Commit Graph

2729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Knut Sveidqvist
87f12c7d5a Updated with a small example of a custom theme 2020-07-31 16:04:12 +02:00
Knut Sveidqvist
e9e9b13df0 Added themeVariable references and som adjustments in base theme calculations. 2020-07-31 15:05:51 +02:00
Neil Cuzon
dccb23bb80
Update theming.md 2020-07-30 13:50:39 -07:00
Knut Sveidqvist
f87c56af5c
Merge pull request #1593 from mermaid-js/1590_theme_finalizations 
1590 theme finalizations
 2020-07-30 19:57:33 +02:00
Knut Sveidqvist
5565aab488 #1590 Theme base tweaked for custom theming 2020-07-30 19:18:18 +02:00
Knut Sveidqvist
dbe6b9dacb #1590 Themes tweaked 2020-07-30 15:28:46 +02:00
Knut Sveidqvist
dd866718b9 Removed console statements 2020-07-30 10:16:29 +02:00
Knut Sveidqvist
116c616561
Merge pull request #1591 from mermaid-js/dependabot/npm_and_yarn/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3
 2020-07-30 10:01:33 +02:00
dependabot[bot]
084e3df8f7
Bump elliptic from 6.5.2 to 6.5.3 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-30 07:50:31 +00:00
Knut Sveidqvist
36e421eb5f
Merge pull request #1586 from mermaid-js/1542_take_two 
1542 take two
 2020-07-30 08:58:56 +02:00
Knut Sveidqvist
a5b01c3f6f #1542 Adding gantt to showcases 2020-07-30 08:34:41 +02:00
Knut Sveidqvist
f1836c281c #1542 Fix for secirity config 2020-07-30 08:20:27 +02:00
GDFaber
4e3bdf0925
Merge pull request #1587 from GDFaber/documentation/fix_flowchart_style_example 
Flowchart documentation: Fix code example for styling nodes
 2020-07-30 01:31:28 +02:00
Marc Faber
b17475f013 #1366 Flowchart documentation: Fix code example for styling nodes 2020-07-30 01:18:58 +02:00
Knut Sveidqvist
ecea0f90d4 #1542 Handling of config 2020-07-29 22:19:23 +02:00
Knut Sveidqvist
a4bf85b1b6 #1542 Making sure config and directives works for overriding theme variables using initialize call or directives + tests 2020-07-29 18:38:59 +02:00
Knut Sveidqvist
d215d31349
Merge pull request #1585 from GDFaber/feature/1460_add_link_target_to_flowchart_click 
Add link target option to flowchart click
 2020-07-29 15:13:35 +02:00
Neil Cuzon
e4e24399d9
Update theming.md 2020-07-28 19:10:14 -07:00
Neil Cuzon
8f9d132ed6
Update theming.md 2020-07-28 19:06:34 -07:00
Neil Cuzon
e651511c35
Update theming.md 2020-07-28 19:01:01 -07:00
Neil Cuzon
2ecda17618
Update theming.md 2020-07-28 18:56:17 -07:00
Neil Cuzon
db03b5b102
Update theming.md 2020-07-28 18:28:52 -07:00
Neil Cuzon
9fd9a7bc10
Update 8.6.0_docs.md 2020-07-28 16:42:08 -07:00
Justin Greywolf
eda9faf956
Merge pull request #23 from mermaid-js/develop 
bring up to date
 2020-07-28 09:44:50 -07:00
Knut Sveidqvist
cf70678188
Merge branch 'develop' into feature/1460_add_link_target_to_flowchart_click 2020-07-28 13:21:31 +02:00
Knut Sveidqvist
b23988c947
Merge pull request #1582 from cmmoran/develop 
Directive support for many diagrams, config bugfix
 2020-07-28 13:17:35 +02:00
chris moran
06f6e75d5a
Class diagram parsing 
Fixed a class diagram parsing issue
 2020-07-28 07:00:04 -04:00
chris moran
c9854b35e2
Fixed flowchart parsing (broken tests - grammar changes were not 100% correct) 2020-07-28 05:48:26 -04:00
Marc Faber
71e4ada39a Trigger tests once more 2020-07-28 11:09:54 +02:00
Marc Faber
d04d8c3a1d #1460 Add link target option to flowchart click 2020-07-28 10:49:54 +02:00
chris moran
283faf7a2f
Fixes 
GraphObjects.md: [ and ] should be escaped in text (they're links otherwise)
flow.jison: fixed a parsing issue when the direction is omitted (defaults to 'TB')
stateRenderer-v2: was silently failing due to a try/catch in the parse function. (intentional?) removed to show errorHandler
mermaidAPI: removed unnecessary call to updateRendererConfigs since reinitialize does this
 2020-07-28 04:45:22 -04:00
chris moran
0299ff0a79
Added directive support to state diagrams 
Fixed an issue with markerUnits: (default is 'strokeWidth' not 0
 2020-07-27 19:44:45 -04:00
chris moran
4ee65822aa
Merge remote-tracking branch 'carlosblanco/feature/1228-support-dashes-in-actor-names-in-sequence-diagrams' into develop 2020-07-27 15:05:57 -04:00
chris moran
e7ca6c16ff
Tweaked PIE (got rid of some parsing conflicts) 2020-07-27 14:15:38 -04:00
chris moran
771bf78576
Fixed parsers to use the correct type name in close_directive 
Added directive support to pie
(Refactored pie parsing to be a bit more clear)
Added more unit tests to pie
 2020-07-27 13:24:23 -04:00
chris moran
b9fa2f4125
Added directive parsing to gannt 
Ensured tests pass
 2020-07-27 10:16:41 -04:00