marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-21 00:09:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,443 Commits 209 Branches 187 Tags
99cb752c714a459c4d1c8d7fc9c87337f8fdd24f
Commit Graph

2443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Ling
99cb752c71 Add er.useMaxWidth config option 
This restores the option of rendering an ERD with an absolute width,
which is consistent with the approach taken with the other diagram
types.

This logic was lost in #1324, which was probably just a small oversight:

9199546dca (diff-7c38d27acbe0676d923bf19283671616L397-L409)

The option defaults to true for backwards compatibility.
 2020-07-11 18:54:26 +10:00
Chris Moran
c390e9e877 Merge pull request #1529 from cmmoran/develop 
Missed test case for allowing site owner to append to `secure` field set
 2020-07-09 06:32:16 -04:00
chris moran
dee47ec978 Missed test case for allowing site owner to append to secure field set 
Missed logic for default-appending src array values where not existing within dst array in assignWithDepth function
 2020-07-08 08:41:35 -04:00
Knut Sveidqvist
5242672efb Adding configuration docs to setup.md and bumping version to 8.6.0 2020-07-04 14:25:14 +02:00
Knut Sveidqvist
5c043dd908 Merge pull request #1525 from mermaid-js/bug/1524_message_text_vertical_pos 
Bug/1524 message text vertical pos
 2020-07-04 12:46:24 +02:00
Knut Sveidqvist
19ed03c44c #1524 Updated tests 2020-07-04 12:35:34 +02:00
Knut Sveidqvist
32b2ee8cab 2020-07-04 11:13:54 +02:00
Knut Sveidqvist
7e9ab546eb Fix for broken build, issue with config use in flowcahart and gantt diagram 2020-07-02 22:34:13 +02:00
Knut Sveidqvist
2af1f9a9d3 Fix for broken build, issue with config use in flowcahart and gantt diagram 2020-07-02 22:27:03 +02:00
Knut Sveidqvist
b6d6d3c980 Merge pull request #1523 from mermaid-js/feature/1483_long_messages 
Directives, sequenceDiagram refactor, config normalization, many tweaks
 2020-07-02 18:39:25 +02:00
Knut Sveidqvist
c655cfaca8 Merge branch 'develop' into feature/1483_long_messages 2020-07-02 18:38:37 +02:00
Knut Sveidqvist
b3a465dbca Merge branch 'develop' into feature/1483_long_messages 2020-07-02 18:25:49 +02:00
Knut Sveidqvist
33d3bc53b4 Merge pull request #1519 from cmmoran/develop 
Utils - memoize, calculateTextDimensions (and friends), assignWithDepth, etc
 2020-07-02 17:01:24 +02:00
Knut Sveidqvist
be9da3928b Updated mermaidAPI.md from PR 2020-07-02 16:59:09 +02:00
Knut Sveidqvist
a9fd557c4e Merge branch 'NeilCuzon-patch-8' into develop 2020-07-02 16:57:00 +02:00
Knut Sveidqvist
faac22f6ed Lint fix 2020-07-02 16:56:30 +02:00
Chris Moran
35a47093ab Merge pull request #1522 from cmmoran/feature/1483_long_messages 
Fixed dark theme (sequenceDiagram) sequenceNumbers color
 2020-07-01 07:59:17 -04:00
chris moran
01a2d90e38 sequence numbers for dark mode should probably be black since the circle is the contrast color 2020-07-01 07:53:03 -04:00
Chris Moran
1cc2e74a03 Merge pull request #1521 from cmmoran/feature/1483_long_messages 
added hasBreaks and splitBreaks to common.js
 2020-07-01 07:44:37 -04:00
chris moran
ca86ab71f2 added hasBreaks and splitBreaks to common.js 
updated parseMessage to set wrap: true when breaks are detected
 2020-07-01 07:41:44 -04:00
Chris Moran
ee425d278c Merge pull request #1520 from mermaid-js/develop 
Merging changes from develop into feature/1483_long_messages
 2020-07-01 06:34:48 -04:00
chris moran
1c3c2b6a74 utils refactor 
- memoize to poor-man-cache properly-ish
- wrapLabel, calculateTextDimensions (and friends) moved to utils for all to enjoy
- drawSimpleText getTextObj moved to utils to support the functions listed above
- assignWithDepth - Object.assign but depth-ier
- random - for crypto random numbers
 2020-07-01 06:20:53 -04:00
Chris Moran
9952f7734a Merge pull request #1518 from cmmoran/feature/1483_long_messages 
Feature/1483 long messages
 2020-07-01 05:36:11 -04:00
chris moran
2ffb2988bf One small refactor to fix activation starty 
Ensure a minimum amount of space between wrapped / non-wrapped title text and the next element
 2020-07-01 05:34:53 -04:00
chris moran
fda1d7c4c5 Merge remote-tracking branch 'upstream/feature/1483_long_messages' into feature/1483_long_messages 2020-07-01 04:49:15 -04:00
Chris Moran
19519ac74e Merge pull request #1 from mermaid-js/develop 
Merge upstream
 2020-07-01 04:47:47 -04:00
Chris Moran
eb3f62fd90 Merge pull request #1517 from cmmoran/feature/1483_long_messages 
Feature/1483 long messages
 2020-07-01 04:46:27 -04:00
Neil Cuzon
891b362e7d Update mermaidAPI.js 
-Added tables into the comments from mermaidAPI.md, to reflect documentation that I had added through a previous PR, #1509
-as per @knsv 's directions, added comments here.

-also found a list of parameters, who's documentation do not come out in the markdown file. I left them alone, but will be raising a separate issue, for others to review.
 2020-07-01 01:35:25 -07:00
chris moran
cbb69bd3cb () => is not the same as function() {} smh 
Fixed a few of the text rendering issues
 2020-07-01 04:34:29 -04:00
Knut Sveidqvist
200a3e5e8c Merge pull request #1498 from mermaid-js/feature/1424_dark_mode_in_docs 
Feature/1424 dark mode in docs
 2020-06-30 16:54:06 +02:00
Knut Sveidqvist
0fab2dc24f Merge pull request #1499 from maiconschmitz/patch-1 
Update README.md
 2020-06-30 16:34:34 +02:00
Knut Sveidqvist
a48654f195 Merge pull request #1503 from NeilCuzon/patch-4 
Update sequenceDiagram.md
 2020-06-30 16:31:20 +02:00
chris moran
174b098724 loop/opt/alt/etc titles should always wrap 2020-06-30 07:54:51 -04:00
Chris Moran
ecb4671e0d Merge pull request #1513 from cmmoran/feature/1483_long_messages 
conf.messageFont() would have a different cacheKey based on the cache…
 2020-06-30 07:21:39 -04:00
chris moran
6c6f6838ee conf.messageFont() would have a different cacheKey based on the cacheKey calculations done in this particular branch. This will be normalized with the memoize PR about to be created. 2020-06-30 07:18:28 -04:00
Chris Moran
b4414758a7 Merge pull request #1512 from cmmoran/feature/1483_long_messages 
math is hard sometimes?
 2020-06-30 06:47:50 -04:00
chris moran
5b37536ce5 math is hard sometimes? 2020-06-30 06:42:29 -04:00
Chris Moran
3365fa174d Merge pull request #1511 from cmmoran/feature/1483_long_messages 
Fixed config *font helpers
 2020-06-30 06:24:36 -04:00
chris moran
d42b95bab9 messageFont, noteFont, and actorFont getConfig() calls were not specifying the sequence object 
take into account width of message over single actor for actors' max message width
 2020-06-30 06:20:45 -04:00
Chris Moran
6a3aaf360e Merge pull request #1510 from cmmoran/feature/1483_long_messages 
Feature/1483 long messages
 2020-06-30 03:51:25 -04:00
chris moran
083d0c90e2 Merge branch 'develop' into feature/1483_long_messages 2020-06-30 03:50:04 -04:00
chris moran
fed142dad2 Merge branch 'mermaid-js-develop' into develop 2020-06-30 03:34:55 -04:00
chris moran
fcd2126330 Getting closer 2020-06-28 08:37:26 -04:00
Neil Cuzon
e5cd0ced53 Update sequenceDiagram.md 2020-06-26 22:46:09 -07:00
Chris Moran
06dad7865c Merge pull request #1502 from cmmoran/develop 
Missed `activationWidth` new configuration option for sequence diagrams
 2020-06-26 10:19:02 -04:00
chris moran
6915634729 Missed activationWidth new configuration option for sequence diagrams 2020-06-26 10:17:13 -04:00
Chris Moran
d3647e2e8a Merge pull request #1501 from cmmoran/develop 
Fixes
 2020-06-26 09:33:57 -04:00
chris moran
217bd1f4bf Fixed test cases for sequence diagrams 
Updated config to match a conversation knut and i had about the relationship between global, site, and integrator configuration
(Will update docs)
Renamed wrapEnabled to wrap
Poor man's caching for calculateTextDimensions, wrapLabel, and breakString (actually makes a huge difference)
 2020-06-26 09:26:56 -04:00
Maicon Schmitz
75fe500305 Update README.md 
Correction off CLI link, in Related projects section
 2020-06-25 11:24:45 -03:00
Knut Sveidqvist
afc779440a #1424 Setting proper loglevel for docs 2020-06-24 21:28:12 +02:00