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

2353 Commits

Author SHA1 Message Date
Chris Moran e6df4f24f4
Merge remote-tracking branch 'origin/develop' into develop 2020-06-17 06:05:00 -04:00
Chris d4b733ff16
Merge pull request #5 from mermaid-js/develop 
Merging upstream develop
 2020-06-17 06:04:04 -04:00
Knut Sveidqvist e4b63a68fd
Merge pull request #1477 from mermaid-js/1473_default_config 
1473 default config
 2020-06-16 08:07:18 +02:00
Knut Sveidqvist a251029546 #§473 Font update for e2e tests 2020-06-15 22:42:33 +02:00
Knut Sveidqvist b5d457daa9 Testcommit 2020-06-15 22:26:11 +02:00
Knut Sveidqvist 603f2a2154 1473 Using setConfig instead of initialize from mermaid in some cases 2020-06-15 21:55:20 +02:00
GDFaber 4f40c96d19
Merge pull request #1475 from NKjoep/develop 
fix: Update cli link in the Readme
 2020-06-15 16:13:10 +02:00
Andrea D d7fc658bae fix: Update cli link in the Readme 2020-06-15 14:11:54 +02:00
Knut Sveidqvist 08dd2bd93d 1473 Class diagrams 2020-06-15 08:03:13 +02:00
Knut Sveidqvist 10b8a33b55 1473 Updated config handling, removed a logger 2020-06-15 01:12:25 +02:00
Knut Sveidqvist bd0210cdce 1473 Updated config handling 2020-06-15 01:11:56 +02:00
Knut Sveidqvist 5677523800 1473 Setting default config 2020-06-14 23:37:08 +02:00
Knut Sveidqvist 2150933368 Setting default config 2020-06-14 22:50:45 +02:00
Chris Moran fd7dbaf0a7
Merge branch 'mermaid-js-develop' into develop 2020-06-14 14:14:28 -04:00
Knut Sveidqvist d145310447
Merge pull request #1472 from chrismoran-bkt/develop 
Fixed theme rendering for note text on non-dark themes.
 2020-06-14 19:52:56 +02:00
Chris Moran 9d413680d9
Fixed a rendering issue introduced while trying to fix dark mode. This should fix the rendering of note text for all current themes. 2020-06-14 13:42:25 -04:00
Chris Moran 0e85c814e1
Merge branch 'mermaid-js-develop' into develop 2020-06-14 13:03:13 -04:00
Knut Sveidqvist 3589bb9597 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2020-06-14 18:41:31 +02:00
Knut Sveidqvist 10b06eda91 #1458 Adding directives section in the docs 2020-06-14 18:41:27 +02:00
Knut Sveidqvist 145d337db9
Merge pull request #1458 from chrismoran-bkt/develop 
Auto-wrap, inline config, initialization, dark theme tweaks, etc
 2020-06-14 18:26:32 +02:00
Chris Moran 1d59ae24c6
Merge branch 'mermaid-js-develop' into develop 2020-06-14 11:40:35 -04:00
Chris Moran 6309dd1350
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into mermaid-js-develop 2020-06-14 11:40:15 -04:00
Chris Moran 0ae001ed6d
Fixed issue with idea-multimarkdown. 
- JavaFX does not support lookbehind
 - (?) It also appears that named regex groups are also unsupported for both mermaid and javafx

Update:
 - Fixed an issue where setLogLevel did not properly handle 'named' log levels
 - Backwards compatibility should be preserved, any/all %%{...}%% directives will be correctly processed by the grammar and properly ignored for any/all graph types that do not support them.

 - Multiline directives will render an error (as they should) if they are not accounted for in the .jison grammar
 2020-06-14 11:34:39 -04:00
Knut Sveidqvist bb8efadb98
Merge pull request #1470 from vantoan8x/click_event_support_keypath_function 
Chart Node click event support key-path value for function callback
 2020-06-14 14:25:46 +02:00
Chris Moran 620c894929
Fixed issue causing idea-multimarkdown headaches: util changes. Reworking them. 2020-06-14 06:53:22 -04:00
GDFaber 18d2a7fe4d
Merge pull request #1467 from CollierCZ/patch-1 
docs: update gantt docs
 2020-06-14 00:30:52 +02:00
Knut Sveidqvist 78e74cda28
Merge pull request #1469 from mermaid-js/1466_linetypes_in_beta_renderer 
1466 linetypes in beta renderer
 2020-06-13 23:10:46 +02:00
Knut Sveidqvist cc9c69c931 #1466 Fixing notes for state diagrams (beta) 2020-06-13 13:44:45 +02:00
Knut Sveidqvist 6559cfd0e1 #1466 Handling line styles using the new rendering engine 2020-06-13 13:12:33 +02:00
Toan 28dcc781b4 Chart Node click event support key-path value for function callback 2020-06-13 17:41:52 +07:00
Aaron Collier 09f10d2d7e
docs: update gantt docs 
Added descriptions of title and section statements and how to style todayMarker.
 2020-06-12 11:44:01 +02:00
Knut Sveidqvist 8492503d4f
Merge pull request #1464 from vantoan8x/bug/fix_tooltip_position_when_scroll 
when window scroll, the tooltip show incorrect position coz its missing window.scrollXY
 2020-06-11 21:56:27 +02:00
Knut Sveidqvist c48b9b34e9
Merge pull request #1463 from vantoan8x/develop 
Naming the link/connector edgeLabel and edgePath to let easy query and custom.
 2020-06-11 21:55:57 +02:00
Chris Moran 04b4da0c75
## Work in progress. 
Implemented directives per PR review comment:

%%{directive: json-encoded-arg-string}%%

example:

%%{init: { 'logLevel': 0, 'theme': 'dark' }}%%

Also changed wrap and config to directives:

%%{wrap}%%
%%{config: { 'fontSize': 18 }}%%
 2020-06-11 15:35:00 -04:00
Toan 276b171d93 when window scroll, the tooltip show incorrect position coz its missing offset of window.scrollXY 2020-06-11 16:04:39 +07:00
Toan 44675739a1 when window scroll, the tooltip show incorrect position coz its missing offset of window.scrollXY 2020-06-11 16:01:36 +07:00
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
Chris Moran dba617a7fe
Merge branch 'mermaid-js-develop' into develop 2020-06-08 15:00:52 -04:00
Chris Moran 4a253a7760
Merged with mainline develop 2020-06-08 14:58:42 -04:00
Chris Moran bd11663e0a
Added auto wrap option (and grammar) for sequenceDiagrams 
Added inline config and init(ialization) grammar
Added reinitialize functionality to mermaidAPI (not to be confused with initialize)
Added actorFontWeight, noteFontWeight, messageFontWeight, wrapEnabled, wrapPadding
Added wrapLabel and breakWord functions to intelligently wrap text based on a pixel-based width instead of column-based
  - The implementation is largely from Carys Mills: https://medium.com/@CarysMills/wrapping-svg-text-without-svg-2-ecbfb58f7ba4
  - Made slight modifications for mermaid-js
Fixed dark theme color inconsistencies for sequence diagrams
Removed !important from sequence scss as this prevents any client overrides
Fixed various invalid css values in sequence scss which prevented proper rendering of various elements
Added detectInit to utils for initialization json detection
Updated detectType to support the existence or absence of the intialization configuration
Updated calculateTextWidth to include fontWeight
 2020-06-08 14:48:03 -04:00