6e5eeb7215
fix(Diagram): C4C diagram does not have a db.clear method
2022-08-09 22:22:40 -07:00
a5aef9e330
fix(Diagram): fix persisted data due to db not being cleared before parsing
2022-08-09 21:41:07 -07:00
d32c8534cb
Bugfix for empty blank lines
2022-08-09 18:39:20 +02:00
9b54feab84
Merge branch 'develop' into minmaps
2022-08-06 10:53:54 +02:00
afe343e94f
Changes after merge
2022-08-06 10:49:32 +02:00
44cb1acbb2
Fix for broken test
2022-08-04 13:16:48 +02:00
b0074bf723
Merge pull request #3222 from leon19/bugfix/incorrect-label-padding
...
fix: remove right padding when a label contains HTML entities
2022-08-04 13:06:46 +02:00
aa9149912d
Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment
2022-08-04 13:05:17 +02:00
fb6bf87161
code syntax improvment (initialize func)
2022-08-03 14:16:02 +04:00
846531363e
PR comments
2022-08-01 19:41:53 +08:00
91e369a840
rename const name
2022-08-01 19:41:53 +08:00
81ff4416dc
rotate class id when branch more than 8
2022-08-01 19:41:53 +08:00
ffe520db06
Curved edges
2022-07-29 15:06:21 +02:00
00fe5d477d
Different hanlding of icons for circles
2022-07-28 20:38:25 +02:00
ca3f4559ef
Fix
2022-07-27 19:10:06 +02:00
1a205aeccc
Adding icon support
2022-07-27 18:40:44 +02:00
82a480d924
Adding circle node type and class handling
2022-07-27 17:25:20 +02:00
2d361964ce
Better padding handling in nodes
2022-07-27 10:24:27 +02:00
03d71829c6
Adding default node form
2022-07-27 09:43:25 +02:00
c40368b0fa
fix: remove right padding when a label contains HTML entities
...
Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length
2022-07-26 21:50:36 +02:00
0b2ca29ae8
Theme support for mindmaps
2022-07-25 17:03:18 +02:00
f815bd08b7
Adjusting the width of the boxes based on the text in the boxes
2022-07-25 14:22:07 +02:00
15f1cdf3aa
Draft of edge rendering
2022-07-24 17:45:54 +02:00
8e5e212c49
Layout algorithm in place
2022-07-24 11:05:54 +02:00
7de68f0bf2
Adding text wrap and logic for placing nodes in the svg
2022-07-23 10:16:54 +02:00
6029c5371e
First take on grammar
2022-07-21 16:07:18 +02:00
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
4c30e03f1e
Using diagram api to add gitGraph
2022-07-18 16:00:03 +02:00
0d4b09a0a0
Handle legacy state diagram and start using Generic diagram in mermaidAPI
2022-07-04 22:55:11 +02:00
408c08d2a3
Fix for v2 class diagram
2022-07-04 22:41:09 +02:00
10f56129c1
Fix for legacy class diagram
2022-07-04 19:37:56 +02:00
bc6830cbdb
Handling of requirement diagrams using the generic diagram
2022-07-04 18:50:50 +02:00
c5f78077ff
Fix for broken tests
2022-07-04 18:22:36 +02:00
682a1404ca
Fixes for erDiagram, pie charts and journey diagram
2022-07-04 18:11:58 +02:00
5318ec6dbf
Handling gantt and flowchart-v2
2022-07-04 15:33:39 +02:00
490ddd9a15
Fix for tests
2022-07-04 14:25:25 +02:00
1675174b2a
Fix for flowcharts
2022-07-04 12:37:50 +02:00
48ad6e6042
Merge branch 'develop' into 3061_refactoring_and_modularisation
2022-07-04 11:38:52 +02:00
bedc9399c5
Updating c4 and sequence
2022-07-04 11:29:38 +02:00
ed29fe1aa9
Fix #3011 : Support left- and right-alignment for multi-line messages and notes
...
Previously, messages and notes that had multiple lines (via `<br>`-tags) were only displayed correctly
when using the default `center` value for the `messageAlign` and `noteAlign` configuration options.
Using `left` or `right` for the alignment options caused the text to collapse and become illegible,
as outlined in issue #3011 .
This comes as a side-effect from how the internal `valign` text-rendering option was configured for
messages and notes:
```js
// Example from `sequenceRenderer.js: drawMessage()`
textObj.anchor = conf.messageAlign;
textObj.valign = conf.messageAlign;
```
Both the `anchor` option (which controls left-right alignment) and the `valign` option (which controls
vertical top-down placement) were set to the same value, the user-provided `messageAlign` config option.
While `left` and `right` are valid values for the `anchor` option, they were effectively no-ops for the
`valign` option, which only supports `top`, `start`, `middle`, `center`, `bottom`, and `end`.
To fix the issue, the `valign` property is now always set to `center` for notes and messages.
Similarly, the `dominantBaseline` option of texts is now always set to `middle`, rather than setting it to
either `text-{before,after}-edge`, which caused left-aligned multi-line text to always be "top-left" aligned
inside a note (or "bottom-right" when attempting to right-align).
Now, texts in messages and notes are always vertically centered and alignment options correctly apply for
both single and multi-line content.
2022-07-03 11:59:57 +02:00
5b15865d30
fix #3184 : Inject xlink in mermaidAPI. ( #3185 )
...
* fix #3184 : Inject xlink in mermaidAPI.
* fix static analysis
2022-07-03 10:37:27 +02:00
1dfddfde54
Merge branch 'release/9.1.3' into 3061_refactoring_and_modularisation
2022-06-28 20:12:03 +02:00
1f4c1c3a6c
Merge pull request #3140 from mermaid-js/#3095-Gitgrph-Font-Size
...
#3095 Added support for commit & tag label font size
2022-06-28 19:11:16 +02:00
cc45f3ca01
Merge pull request #3151 from pinghe/develop
...
Add C4 Diagram. Compatible with C4-PlantUML syntax (2). #3038
2022-06-28 19:10:42 +02:00
259abb081a
Merge pull request #3176 from yutotnh/fix-typo
...
Fix typo
2022-06-28 19:01:35 +02:00
0ae1bdb61a
Merge pull request from GHSA-x3vm-38hw-55wf
...
CSS Injection security issue
2022-06-28 18:55:12 +02:00
5110e42786
Better balance check
2022-06-28 18:50:41 +02:00
0d6109c7a8
Merge branch 'develop' into fix-typo
2022-06-27 12:43:55 +09:00
4d4b77f39f
fix: typo for source
2022-06-27 12:34:28 +09:00
8484d55a6a
Fix fir tests
2022-06-26 21:30:49 +02:00
0a55cda0a9
Rendering statediagram v2 using the diagram passed from mermaidAPI
2022-06-26 21:05:30 +02:00
2480a5eaa2
Merge remote-tracking branch 'origin/develop' into 3061_refactoring_and_modularisation
2022-06-26 14:28:11 +02:00
0e47c0ee6c
fix #3019 Add word boundary to FK&PK. ( #3168 )
2022-06-23 08:20:32 +02:00
2792bb41de
Updated allowed characters to accomodate fonts and rgba colors
2022-06-22 08:16:55 +02:00
ca909edbed
fix: Typo for documents and comments
2022-06-22 12:39:10 +09:00
610f154c74
Sanitizsation of incoming variables that are added to the userStyles
2022-06-21 21:46:37 +02:00
ec2da8e85d
Only allowing a subset of characters in themeVariables
2022-06-21 21:17:53 +02:00
546eb285c4
C4 diagram is fixed style, such as css color, so different css is not provided under different skins.
...
updateElementStyle and UpdateElementStyle are written in the diagram last part. updateElementStyle is inconsistent with the original definition and updates the style of the relationship, including the offset of the text label relative to the original position.
- [ ] Custom tags/stereotypes support and skinparam updates
- - [ ] AddElementTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite): Introduces a new element tag. The styles of the tagged elements are updated and the tag is displayed in the calculated legend.
- - [ ] AddRelTag(tagStereo, ?textColor, ?lineColor, ?lineStyle, ?sprite, ?techn, ?legendText, ?legendSprite): Introduces a new Relationship tag. The styles of the tagged relationships are updated and the tag is displayed in the calculated legend.
- - [X] UpdateElementStyle(elementName, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite): This call updates the default style of the elements (component, ...) and creates no additional legend entry.
- - [X] UpdateRelStyle(from, to, textColor, lineColor, ?offsetX, ?offsetY): This call updates the default relationship colors and creates no additional legend entry. Two new parameters, offsetX and offsetY, are added to set the offset of the original position of the text.
- - [ ] RoundedBoxShape(): This call returns the name of the rounded box shape and can be used as ?shape argument.
- - [ ] EightSidedShape(): This call returns the name of the eight sided shape and can be used as ?shape argument.
- - [ ] DashedLine(): This call returns the name of the dashed line and can be used as ?lineStyle argument.
- - [ ] DottedLine(): This call returns the name of the dotted line and can be used as ?lineStyle argument.
- - [ ] BoldLine(): This call returns the name of the bold line and can be used as ?lineStyle argument.
- - [X] UpdateLayoutConfig(?c4ShapeInRow, ?c4BoundaryInRow): New. This call updates the default c4ShapeInRow(4) and c4BoundaryInRow(2).
2022-06-18 22:43:07 +08:00
f79d4f9a40
Merge branch 'develop' into 3061_refactoring_and_modularisation
2022-06-18 14:24:51 +02:00
ddcc9a9d77
fix: use db for parser.yy
2022-06-16 11:37:28 -07:00
e29c3d6125
#3095 Added support for commit & tag label font size
2022-06-14 20:36:26 +02:00
69b7b0e029
Fix for padding issue and some cleanup
2022-06-14 20:09:55 +02:00
113efd1150
Added placeholder docs fro C4C diagram
2022-06-14 18:27:15 +02:00
2d5e49fa15
2022-06-14 17:49:05 +02:00
611880414b
Merge pull request #3114 from siddhant-tripathy1/3093_Removing_sass_files
...
Removed the Sass files
2022-06-14 17:10:45 +02:00
5d30d46535
Merge pull request #3118 from mermaid-js/3116_paddings
...
Handle diagram paddings in a consistent way
2022-06-08 20:24:18 +02:00
4dd3d3bc76
2022-06-08 20:17:31 +02:00
61c1b0aebb
Removed the Sass files
2022-06-08 00:27:23 +05:30
c147404d1c
#3080 Added support for cherry pick commits
2022-06-07 20:32:43 +02:00
1851e81794
#3080 Adding rotated commit label functionality
2022-06-07 18:45:07 +02:00
aeb6e860bb
Merge pull request #3094 from deining/contrib
...
Fixing various typos
2022-06-07 17:17:49 +02:00
3300ad09f3
Merge pull request #3038 from pinghe/develop
...
Add C4 Diagram. Compatible with C4-PlantUML syntax.
2022-06-07 17:12:10 +02:00
8e157423e0
Fixing various typos
...
Changing links from http to https
2022-06-01 12:06:53 +02:00
bd459fadd3
2022-05-31 20:35:44 +02:00
bb5baa65cb
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-05-31 17:11:29 +02:00
ee61a26faf
Merge pull request #3063 from financelurker/feature/3062_critical_region_and_break_in_sequence_diagrams
...
feat: adding "Critical Region"/"Option" and "Break" blocks to sequence diagram
2022-05-31 17:11:03 +02:00
66f2f42294
Selecting the correct title for gantt charts
2022-05-24 20:10:04 +02:00
b82b2d2b78
#3074 Using regular title as a fallback for the accessibility title when no dedicated accessibility title is present
2022-05-24 18:52:37 +02:00
6eef26f107
#3074 Fix for tests
2022-05-24 18:33:13 +02:00
2ab1e162ea
#3074 Cleanup and fixes for issues with accessibility for gantt and journey diagrams
2022-05-24 18:20:05 +02:00
077e6621b9
Undo whitespace changes
2022-05-21 09:40:21 +02:00
7372ca5e8e
Adding "Critical Region" and "Break" blocks
2022-05-21 09:31:06 +02:00
938b47bead
Removed unnecessary textLength attribute.
...
This attribute makes two digit numbers look bad.
2022-05-19 23:17:11 +00:00
ce3ba4f772
Make initThrowsErrors available to clients
...
Missing piece for https://github.com/mermaid-js/mermaid/pull/2379
2022-05-18 08:51:19 +02:00
a3878528c6
#3050 Renaming setTitle to setAccTitle
2022-05-17 20:23:45 +02:00
91d5c7ed71
#3046 Fixed liniting issue
2022-05-17 19:28:23 +02:00
85062ac570
#3046 Add support for cyclic themeVariable rotation for more than 8 branches
2022-05-17 19:15:50 +02:00
ea58bb3359
Merge branch 'master' into develop
2022-05-17 17:06:38 +02:00
28ca1420f9
Add C4Context diagram. Compatible with C4-PlantUML syntax.
...
For an example, see the source code demos/index.html
- System Context
- Container diagram
- Component diagram
- Dynamic diagram
- Deployment diagram
2022-05-17 19:57:03 +08:00
015c112103
Add C4Context diagram. Compatible with C4-PlantUML syntax.
...
```
C4Context
title System Context diagram for Internet Banking System
Person(customerA, "Banking Customer A", "A customer of the bank, with personal bank accounts.")
Person(customerB, "Banking Customer B")
Person_Ext(customerC, "Banking Customer C")
System(SystemAA, "Internet Banking System", "Allows customers to view information about their bank accounts, and make payments.")
Person(customerD, "Banking Customer D", "A customer of the bank, <br/> with personal bank accounts.")
Enterprise_Boundary(b1, "BankBoundary") {
SystemDb_Ext(SystemE, "Mainframe Banking System", "Stores all of the core banking information about customers, accounts, transactions, etc.")
System_Boundary(b2, "BankBoundary2") {
System(SystemA, "Banking System A")
System(SystemB, "Banking System B", "A system of the bank, with personal bank accounts.")
}
System_Ext(SystemC, "E-mail system", "The internal Microsoft Exchange e-mail system.")
SystemDb(SystemD, "Banking System D Database", "A system of the bank, with personal bank accounts.")
Boundary(b3, "BankBoundary3", "boundary") {
SystemQueue(SystemF, "Banking System F Queue", "A system of the bank, with personal bank accounts.")
SystemQueue_Ext(SystemG, "Banking System G Queue", "A system of the bank, with personal bank accounts.")
}
}
BiRel(customerA, SystemAA, "Uses")
BiRel(SystemAA, SystemE, "Uses")
Rel(SystemAA, SystemC, "Sends e-mails", "SMTP")
Rel(SystemC, customerA, "Sends e-mails to")
```
2022-05-15 17:08:09 +08:00
ee0b31b3d5
#3025 Fix from broken init call
2022-05-11 14:04:50 +02:00
32a2e5fc47
fix: allow dot in entity name; fixes #1895
2022-05-10 18:39:11 -07:00
bc58c8e03c
chore: reduce excessive logs in unit tests
2022-05-10 17:09:42 -07:00
20c4a68aa8
Merging release 9.1.0 to develop
2022-05-10 18:51:21 +02:00
6cea0fd835
#2951 Fix for styling issue on labes when using htmlLabels in legacy flowcharts
2022-05-10 17:45:12 +02:00
734cef9017
Merge pull request #3004 from timmaffett/parse_parseError_fixes
...
fix mermaidAPI.parse() behavior to match documentation, add tests to ensure behavior matches docs
2022-05-10 17:00:22 +02:00
3cb926727c
Fixing failing test cases
2022-05-06 20:14:36 +02:00
6528a0cfb6
Merge pull request #3010 from mermaid-js/GitGraph_mainBranchOrdering
...
Added support to change the position of the main branch
2022-05-06 19:48:05 +02:00
65143a0182
#2732 Regression fixes for accessibility
2022-05-06 19:42:40 +02:00
3ef7d6fbc6
Added support to change the position of the main branch
2022-05-06 19:37:32 +02:00
c8e5525899
Merge branch 'develop' into parse_parseError_fixes
2022-05-06 09:24:49 -07:00
3b94850084
Merge branch 'develop' into 2732_accesible_charts
2022-05-06 18:10:23 +02:00
d8682cfb5f
#2732 rendering the title and descr fields for the gitGraph
2022-05-06 17:40:40 +02:00
1602755330
Merge pull request #3002 from husa/feature/2937-gitgraph-branch-ordering
...
GitGraph: add support for branch ordering
2022-05-06 17:38:06 +02:00
572b29b35f
Merge branch 'develop' into 2732_accesible_charts
2022-05-06 17:17:59 +02:00
f7c28ff31e
Merge branch 'mermaid-js:develop' into parse_parseError_fixes
2022-05-05 11:52:23 -07:00
ca8080a371
add more test for mermaidAPI.parse() to ensure it matches documented behavior
2022-05-05 11:50:11 -07:00
67b6414693
fix parse() to match spec (return true if valid, false if invalid (and a parseError handler is defined))
2022-05-05 11:48:53 -07:00
8210e3c80a
add setParseErrorHandler,check for undefined mermaidAPI before using
2022-05-05 11:47:46 -07:00
52fbc604b8
chore(deps-dev): bump jest from 27.5.1 to 28.0.3 ( #2995 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yash-Singh1 <saiansh2525@gmail.com>
2022-05-04 17:42:11 -07:00
d740fa5acf
add support for branch ordering
2022-05-04 18:04:41 +03:00
ed56e4858a
Cleanup
2022-04-30 16:14:43 +02:00
fdd7af9089
Adding acc to gitGrapg parser
2022-04-30 16:06:53 +02:00
e917347b81
Removing logging, cleanup
2022-04-30 15:54:03 +02:00
3baf31695e
Updated user state diagram parsing with the new syntax
2022-04-30 15:50:02 +02:00
ae91f794d6
Updated user journey diagram parsing with the new syntax
2022-04-30 15:44:03 +02:00
34ffe2790b
Updated sequence diagram parsing with the new syntax
2022-04-30 15:35:34 +02:00
a642ae356c
Updated requirement diagram parsing with the new syntax
2022-04-30 15:22:51 +02:00
a401e44180
Updated pie parsing with the new syntax + fix for flowDb
2022-04-30 15:13:28 +02:00
8372d4952e
Updated gantt parsing with the new syntax
2022-04-30 15:07:13 +02:00
5f4b7ae369
Updated er diagrams with the new syntax
2022-04-30 15:00:50 +02:00
5e6b4d73e1
Updated classdiagrams with the new syntax
2022-04-30 14:54:24 +02:00
85e157f0d3
Updated flowcharts with the new syntax
2022-04-30 11:36:00 +02:00
0127238645
protect config.js from attempting to use invalid theme name
2022-04-29 17:46:19 -07:00
dc53699a96
chore: fix a few security vulnerabilities
2022-04-28 19:29:56 -07:00
b30790cac4
Added default new line in the diagram text before parsing for special case where code is trimmed
2022-04-28 20:09:42 +02:00
d914e23626
Fix for hideUnusedParticipants
2022-04-28 18:45:18 +02:00
386f3c7ce9
Merge branch 'develop' into feature/hideUnusedParticipants_1210
2022-04-28 17:38:48 +02:00
3fcc43efdd
Sequence autonumbering and Git fix options parsing
2022-04-28 14:25:25 +02:00
170ed89e9e
Merge branch 'master' into develop
2022-04-21 22:08:29 +02:00
b472fb4f73
Retain attribute dominant-baseline in DOMpurify sanitization
2022-04-21 22:02:11 +02:00
a6299d8334
Fix for broken gitGraph for Mermaid Live Editor
2022-04-21 21:33:49 +02:00
c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update
...
Removal of vulnerability
2022-04-21 21:25:08 +02:00
df87ab8818
Fix for vulnerability
2022-04-21 21:11:48 +02:00
a3e6d3cd76
Merge pull request #2954 from husa/feature/2936-gitgraph-pathed-branch-name
...
GitGraph: add support for "pathed" branches. fix #2936
2022-04-21 20:11:39 +02:00
1947af0693
Merge pull request #2955 from husa/feature/2934-gitgraph-support-merge-tags
...
GitGraph. Support tags for merge commits
2022-04-21 20:09:31 +02:00
8966639e65
Fix for broken gitGraph for Mermaid Live Editor
2022-04-21 18:16:22 +02:00
473aced449
Add initThrowsErrors() ( #2379 )
...
* Add initThrowsErrors()
* Update mermaid.js
* Update mermaid.js
2022-04-19 17:21:10 +02:00
3f812326a6
gitgraph #2934 support tags for merge commits
2022-04-19 18:02:41 +03:00
99a8c0d152
fix #2936 add support for "pathed" branches
...
allow "/" in branch names
2022-04-19 17:42:02 +03:00
4c93870580
feat: add hideUnusedParticipants and some cleanup
2022-04-14 19:19:18 -07:00
37f6a42de8
fix: clear state before error; closes #2931 ( #2932 )
2022-04-12 19:04:00 -07:00
0935fb0790
Lint fix
2022-04-12 07:40:01 +02:00
cda21c50ac
Merge branch 'develop' into kh-user-journey
2022-04-12 07:36:33 +02:00
7aa037ee60
Merge pull request #2917 from therzka/accessible-state-diagrams
...
feat: add accDescription field to state diagrams
2022-04-12 07:31:55 +02:00
491933f114
Link fix
2022-04-12 07:26:18 +02:00
6052636a62
Merge branch 'develop' into cg-sanitize
2022-04-12 07:20:31 +02:00
7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access
...
feat: Add accessibility fields to requirements diagram
2022-04-12 07:19:40 +02:00
e48d60f4cf
Linting changes to fix build
2022-04-12 07:16:14 +02:00
4f833db2d0
Merge pull request #2913 from lindseywild/feat/flowchart-accessibility
...
feat: adds title and description to flowchart
2022-04-12 07:09:10 +02:00
266bce45f2
Merge pull request #2912 from el-mapache/feat/gantt-diagram-accessibility
...
Adds accDescription to Gantt, draws tags to svg
2022-04-12 07:06:41 +02:00
a7527e6f88
fix test issue to ensure description is clearable
2022-04-08 13:35:48 -07:00
6a57c99335
fix lint issues
2022-04-08 13:24:33 -07:00
6b4eaa185e
add journey tests for accDescription
2022-04-08 13:07:52 -07:00
81b982ac20
feat: add accDescription along with test page
2022-04-08 12:57:42 -07:00
897c4259ed
add title getters and setters, add spec for stateDiagram-v2
2022-04-08 18:44:22 +00:00
9eb18e78c3
add title to jison
2022-04-08 18:43:57 +00:00
c1a17d9fce
revert change to accessibility.js
2022-04-08 18:42:37 +00:00
df993f977c
add/remove semicolons
2022-04-08 18:03:31 +00:00
5452cedc51
always use the same setup
2022-04-08 13:38:57 +00:00
49409241bc
Add accDescription field to state diagrams
2022-04-07 21:35:13 +00:00
e5345f209c
Sanitize user input for accessibility nodes
...
* Adds accDescription to demos/gantt.html
2022-04-07 15:34:53 -04:00
0c5252594e
Merge branch 'master' into develop
2022-04-07 21:06:04 +02:00
e2ec7fd653
feat: adds text sanitization, refactors function
2022-04-07 14:58:36 -04:00
7a5149e39e
feat: adds title and description to flowchart
2022-04-07 14:42:13 -04:00
d36f45ec58
feat: add sanitization consistently
2022-04-07 18:36:30 +00:00
380688c16a
Merge pull request #2879 from adam-hotait/develop
...
fix(sequencediagram): draw arrowheads on top of activation boxes
2022-04-07 20:33:17 +02:00
1d269f07e3
Update src/diagrams/requirement/requirementRenderer.js
...
Co-authored-by: Lindsey Wild <35239154+lindseywild@users.noreply.github.com>
2022-04-07 14:22:47 -04:00
8b29fbe98e
Updating Gitgraph docs
2022-04-07 20:13:15 +02:00
3d7cb212c0
feat: Add accessibility fields to requirements diagram
2022-04-07 18:02:48 +00:00
f2e77917d7
Merge pull request #2911 from gwincr11/cg-class-diagram-accessibility
...
Class diagram accessibility
2022-04-07 19:57:27 +02:00
bed475b229
Merge pull request #2914 from mermaid-js/1252_gitgraph_reinvented
...
#1252 Adding configuration options and some cleanup, swich of graphType
2022-04-07 18:35:59 +02:00
87b56bdd9a
#1252 Adding confuration options and some cleanup, swicth of graphType from git to gitGraph
2022-04-07 18:22:06 +02:00
65b0b83625
Adds accDescription, draws tags to svg
2022-04-07 10:05:54 -04:00
bfca242958
feat(:accessibility): Add accessibility fields to class chart
2022-04-07 13:56:23 +00:00
d3ba48a1b7
fix(sequencediagram): draw arrowheads on top of activation boxes
2022-04-04 13:00:59 +02:00
44877545e5
Merge pull request #2832 from gwincr11/cg-accessibility
...
ER and Sequence Chart Accessibility
2022-03-31 21:01:31 +02:00
57ac111d05
Added commit types in renderer
2022-03-31 20:52:27 +02:00
51e9a6b3aa
Added sanitization for gitGraph
2022-03-31 20:12:06 +02:00
3ccf027f42
Removing random label for merge commits
2022-03-31 20:06:31 +02:00
12c63ff007
Finalizing GitGraph with directives, theming & docs
2022-03-31 19:37:36 +02:00
f6421734a2
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-31 19:16:31 +02:00
be92c70b1b
Autofix
2022-03-31 19:15:01 +02:00
50f522ae5c
feat: adding more accessibility tooling
2022-03-31 13:21:56 +00:00
22aca7b3ee
#1252 Adding background on commit labels
2022-03-25 08:56:22 +01:00
c0335cf5fb
#1252 Adding support for tags
2022-03-24 20:25:22 +01:00
a29e2e6baa
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-24 17:29:36 +01:00
17857d3ea9
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31 ( #2822 )
...
* chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31
Bumps [prettier-plugin-jsdoc](https://github.com/hosseinmd/prettier-plugin-jsdoc ) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/hosseinmd/prettier-plugin-jsdoc/releases )
- [Changelog](https://github.com/hosseinmd/prettier-plugin-jsdoc/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hosseinmd/prettier-plugin-jsdoc/compare/v0.3.30...v0.3.31 )
---
updated-dependencies:
- dependency-name: prettier-plugin-jsdoc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Update config.js
* Update defaultConfig.js
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
2022-03-21 21:45:45 +01:00
a9194d4eaa
Added test cases for error handling
2022-03-17 20:40:35 +01:00
4023be1e84
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented
2022-03-17 20:07:30 +01:00
b78b371025
Added theming support for gitgraph
2022-03-17 20:07:27 +01:00
501e62894b
Added gitGraph jest test cases
2022-03-17 19:07:57 +01:00
c1dead1187
Added branch, merge and checkout error handling scenarios
2022-03-17 19:06:31 +01:00
01970d2bbd
fix broken rendering for math error
2022-03-17 19:05:19 +01:00
243f2b28cd
fix for gitGraph (:) and spaces (new line) issue
2022-03-17 19:04:37 +01:00
9f7130a3e6
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-17 18:03:40 +01:00
b84cd155dd
Merge pull request #2831 from gwincr11/cg-custom-dompurify-config
...
Add dompurify config option
2022-03-17 18:01:19 +01:00
0a8a0790cf
Renedring fix in an edge case
2022-03-17 17:35:45 +01:00
0181cbf743
feat(accessibility): add accessibility attributes to sequence diagrams
2022-03-17 16:18:10 +00:00
c6c9b88292
feat(config): add dompurify config option
2022-03-17 14:34:52 +00:00
4f5cab7f4c
fix: autonumber bug
2022-03-11 16:32:04 +08:00
7bd9286a9b
fix checkout if branch already exist
2022-03-10 20:08:26 +01:00
781b239d0d
Lint fixes
2022-03-10 19:58:56 +01:00
2b3f99d0e9
Draft handling of occupied lanes
2022-03-10 19:54:19 +01:00
4ff3b23da5
feat: adding highlight and reverse commit types and some pathfinding
2022-03-10 19:34:49 +01:00
9ddf138683
fix check if branch already exist
2022-03-10 18:34:50 +01:00
8cb548d30d
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented
2022-03-03 19:58:47 +01:00
b1fab6ffcd
Theming changes for base theme
2022-03-03 19:58:43 +01:00
5a8c372666
update gitgraph jison
2022-03-03 19:58:28 +01:00
56a1c27907
added merge commit type
2022-03-03 19:10:34 +01:00
7e041dd921
Arrows colored by branch and skip of arrow heads
2022-03-03 18:56:27 +01:00
1f175d2d84
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented
2022-03-03 17:30:00 +01:00
b110567517
Bends of the lines when branching
2022-03-03 17:29:14 +01:00
7b0c3c3cd5
fix: update to latest version of sanitize-url
...
There's been a bunch of security issues in the older versions of sanitize-url that this resolves.
2022-03-03 15:26:12 +01:00
bc9ff496f2
Clean up gitg=Graph JISON
2022-02-24 19:55:16 +01:00
4ec1c608a3
small bug with the id on the title
2022-02-24 13:31:27 -05:00
14464f9fba
merge develop to current branch
2022-02-24 19:24:42 +01:00
286f6e52f0
Adding sanitization to input fields for Pie chart
2022-02-24 19:17:37 +01:00
908b704a42
Merge pull request #2747 from gwincr11/cg-pie-chart-accessibility
...
feat: add accessibility title and description to pie chart
2022-02-24 19:00:07 +01:00
f95de5c6d9
Merge pull request #2740 from Guy-Adler/feature/2391_double_circle
...
Double Circle Node Shape
2022-02-24 18:45:50 +01:00
933efd0dda
replace mock data with real
2022-02-24 18:40:22 +01:00
4753ae8ac0
feature: adding arrows to the git graph
2022-02-24 18:08:09 +01:00
0b815c7782
feat: add accessibility title and description to pie chart
...
* Reuse the title as the title element
* Add description to the parser and then render
2022-02-23 02:23:57 +00:00
cc826289c6
Rendering commits and commit labels
2022-02-17 20:14:05 +01:00
7098bf9185
fix: update mockDB
2022-02-17 19:41:54 +01:00
43854a2921
Merge branch 'master' into develop
2022-02-17 18:25:00 +01:00
ffc6cae7f5
fix: adding gitgraph to default config
2022-02-17 18:12:17 +01:00
40f95a5dc1
chore: merge branch 'develop' into 1252_gitgraph_reinvented
2022-02-17 17:48:48 +01:00
04454cece0
fix: changed open and close markers as recommended
...
chnged from `()(` and `())` to `(((` and `)))`
2022-02-17 17:22:38 +01:00
d8c7a2894e
test: removed unit test for double circle in the flowRendererv1
...
The feature is only available using flowRendererv2, which does not have unit tests.
2022-02-17 10:37:07 +01:00
1e4be4eb6a
removed unnecessary console.log
2022-02-16 23:53:08 +01:00
e1f0e69263
feat(flowchart): implement double circle node
...
The implementation uses two circles, inside each other.
A double circle node is opend with `()(` and closed with `)()`.
2022-02-16 23:05:46 +01:00
74b1219d62
fix(2689): use correct default sans-serif fonts for actors and tasks
...
The previous default font, Open-Sans, does not exist (it is Open Sans).
A generic font family must not be in quotes.
There is no changes to tests, as tests set font-family to Courier
for reproducability.
Fixes 2689
See https://fonts.google.com/specimen/Open+Sans
and https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
2022-02-15 14:21:04 +01:00
bb2dd2f5f3
getting there
2022-02-10 20:32:21 +01:00
882ba03fcb
fix: handling diagram width in sandbox mode
2022-02-03 19:54:24 +01:00
384afc1a6d
Merge branch '2654_sandbox' into release/8.14.0
2022-01-28 14:46:23 +01:00
fa55b7c824
feat: add support for links in sanbox mode
2022-01-28 14:45:43 +01:00
eeccf1c56b
fix: handling rerender in sandbox mode fixing tests
2022-01-22 13:29:54 +01:00
e3e9c67f5b
fix: handling rerender in sandbox mode
2022-01-22 12:36:18 +01:00
a73b291c4f
fix: setting width of iframe to size of the diagram
2022-01-22 11:47:03 +01:00
cbe2ce41c1
feat: adding new security level sandbox, sequence diagram update
2022-01-21 18:15:18 +01:00
06834eb383
feat: adding new security level sandbox, diagram updates
2022-01-21 17:17:31 +01:00
413816783d
fix: hadling of render after error, fixing test
2022-01-20 20:38:24 +01:00
4081d7f5f6
feat: experimental version of sanboxing
2022-01-20 19:37:52 +01:00
3a2f6659a6
fix: one more sanitization
2022-01-18 23:26:43 +01:00
2210c73ae8
fix: handling annotations
2022-01-18 23:21:09 +01:00
44d7dfe993
#2646 exploration
2022-01-18 23:02:16 +01:00
adc15c2989
Merge pull request #2621 from Billiam/bugfix/console-log
...
Remove console.log from common.js
2022-01-18 22:57:04 +01:00
91ec41762a
#2632 Adding proper handling of cardinalities
2022-01-16 15:14:59 +01:00
7abe279b4a
#2631 Adding safeguard to the while loops
2022-01-16 15:08:14 +01:00
748ee19b4a
Update common.js
...
Remove console.log from removeEscapes
2022-01-12 01:22:06 -06:00
ab276ccdfe
Merge pull request #2598 from ebjornset/bug/2346_er_attribute_keys_and_comments_problems
...
fix: bug #2346 "ER-attribute comments not work"
2022-01-11 18:02:27 +01:00
5178de7fef
Fix diagram typo ( #2614 )
2022-01-10 16:59:00 +01:00
d3577eb59b
fix: bug #2346 "ER-attribute comments not work"
2021-12-29 21:27:51 +01:00
f4c335ad2f
Fix for XSS vulnerability in url sanitization
2021-12-28 16:59:22 +01:00
6f800be33b
Fix for issue with links from actors
2021-12-23 11:03:07 +01:00
036f9dc359
#2560 Adding dark mode to allowed options in directives
2021-12-15 00:19:04 +01:00
9c12502a36
#2560 Tetsing that the added css have balanced brackets
2021-12-14 23:54:31 +01:00
4cd2621eeb
build: group webpack & ignore dist & support yarn1.x ( #2551 )
2021-12-11 12:02:39 +01:00
bf716de886
Merge + Binaries
2021-12-11 08:31:43 +01:00
6a45701042
Merge pull request #2513 from mermaid-js/default_as_id_string_token
...
feat(flowchart): Allow default in the node ID
2021-12-11 07:19:10 +01:00
d0cf3fc96a
Merge
2021-12-08 11:55:49 +01:00
308ab0e465
Merge pull request #2528 from mermaid-js/jison-core
...
move jison folder into src folder
2021-12-08 07:57:21 +01:00
a97b2cc4da
#2541 Sanitizing the label string in class diagrams
2021-12-07 21:55:33 +01:00
80b14d1d7f
lint markdown : enable eslint-plugin-markdown
2021-12-04 13:10:39 +01:00
8574dadc34
move jison folder into src folder
2021-12-04 11:51:08 +01:00
e6cf1f2602
Merge pull request #2389 from maiermic/feature/1893_data_flow_diagrams
...
Feature/1893 data flow diagrams
2021-12-01 18:48:09 +01:00
492ecb1099
merge
2021-12-01 18:12:05 +01:00
3426aa8b2a
Lint fix
2021-11-30 20:41:57 +01:00
3526e35012
Fix for node with wrong type
2021-11-30 20:28:51 +01:00
31851b2e30
Fixed eslint error
2021-11-29 13:02:38 -03:00
08702565f7
Changed logic to render states with spaces in names to fix regressions.
2021-11-29 11:57:59 -03:00
d19be0b940
Merge pull request #2501 from pbendersky/bug/1342-spaces-in-state-name
...
Fixes rendering of state names with spaces
2021-11-29 07:56:35 +01:00
28bb07d415
fix: check if `node.prop` is defined
2021-11-28 15:35:56 +01:00
c2db1d4d44
add missing semicolon
2021-11-28 12:44:22 +01:00
b6d3ac8e32
warn if unknown node property is given
2021-11-28 12:38:51 +01:00
9e8c03cb49
Merge branch 'develop' into feature/1893_data_flow_diagrams
2021-11-28 12:26:39 +01:00
86810e04bd
Revert "add shape `datastore` (for nodes of data flow diagram)"
...
This reverts commit cd427ab8ba
2021-11-28 12:17:05 +01:00
984a5084b0
render node property `borders` of `rect` node
2021-11-28 12:13:48 +01:00
853d62c8d1
add `props` of vertex to node
2021-11-28 12:12:39 +01:00
0550e4a899
add `props` to vertex
2021-11-28 12:11:50 +01:00
dec6b6d8b5
replace 'datastore' brackets with 'vertex with props' bracket
2021-11-28 12:09:54 +01:00
a3b2ba736d
feat(flowchart): Allow default in the node ID
2021-11-25 13:48:28 -08:00
7ce383078d
Fixed state nodes with spaces being rendered as rectWithTitle instead of rect
2021-11-19 13:40:39 -03:00
d84be0d792
Enable eslint-plugin-jest, eslint-plugin-cypress and wider scan
2021-11-18 23:57:16 +01:00
9d1f32cc0a
Merge branch 'eslint-fix' of https://github.com/mmorel-35/mermaid into mmorel-35-eslint-fix
2021-11-18 18:05:15 +01:00
95df8fa128
Version 8.13.4 bundles
2021-11-18 17:10:36 +01:00
72d2045104
#2496 Unbreaking state diagrams
2021-11-17 22:30:30 +01:00
3feff08d42
#2496 A more delicate fix for issue
2021-11-17 21:31:52 +01:00
fcbd8a5081
#2496 Fix for issue
2021-11-17 20:08:39 +01:00
5b8a4a0b7a
fix conf table display
2021-11-15 09:58:47 +01:00
e68ec31a8f
Fix lint warnings
2021-11-11 10:37:50 -08:00
2368ba4914
Merge github.com:mermaid-js/mermaid into eslint-fix
2021-11-11 10:31:08 -08:00
0db5f9fea7
Merge branch 'develop' into develop
2021-11-11 19:09:12 +01:00
57671b2b78
enable prettier-plugin-jsdoc
2021-11-10 08:41:52 +01:00
4d103c14f7
enable eslint fix and eslint-plugin-jsdoc
2021-11-09 11:01:49 +01:00
0fb25ee749
Merge github.com:mermaid-js/mermaid into jsdoc
2021-11-06 19:48:34 -07:00
d2d8c9bc8e
Add jsdoc and refactor a bit of code
2021-11-06 19:36:06 -07:00
69ecb02375
Merge branch 'develop'
...
Conflicts:
dist/mermaid.core.js
dist/mermaid.core.js.map
dist/mermaid.esm.min.mjs
dist/mermaid.js
dist/mermaid.js.map
dist/mermaid.min.js
dist/mermaid.min.js.map
2021-11-04 21:23:29 +01:00
dac542682d
More code fence syntax highlighting
2021-11-01 19:43:54 -07:00
Harman Goei