1678 Commits

Author SHA1 Message Date
Ashish Jain
aa666d1829 Merge branch 'release/8.13.2' into develop 2021-09-29 20:22:57 +02:00
Ashish Jain
5d5808880f Merge branch 'release/8.13.1' into develop 2021-09-29 20:22:09 +02:00
Ashish Jain
cb2294d6f2 Merge branch '2292_Class_Diagram_curly_brace_space_issue' into release/8.13.2 2021-09-29 20:06:32 +02:00
Knut Sveidqvist
7ad509cc7a Correct handling of the note object foir state diagrams when sanitizing it 2021-09-29 19:48:27 +02:00
Knut Sveidqvist
dd088bc603 test commit 2021-09-29 18:48:09 +02:00
Knut Sveidqvist
c5d091d445 Handling of svg labels for state diagrams 2021-09-29 18:29:39 +02:00
Ashish Jain
38ef061175 Reverting PR #2312 2021-09-29 18:22:35 +02:00
Ashish Jain
55eebd9309 2292 Fix for broken class diagram on space after the '{' curly brace 2021-09-29 17:13:14 +02:00
Knut Sveidqvist
d45765dab5 Lint fixes + fix for unit tests 2021-09-29 09:35:14 +02:00
Knut Sveidqvist
e4e8a00acc Test fix + empty relation 2021-09-29 08:57:54 +02:00
Knut Sveidqvist
35d8f33542 Merge branch 'master'
Conflicts:
	cypress/platform/xss7.html
2021-09-29 08:51:54 +02:00
Knut Sveidqvist
75b79e1b23 State diagram sanitization 2021-09-29 08:45:07 +02:00
Knut Sveidqvist
b62d0d974f
Merge pull request #2312 from cm-wada-yusuke/bug/2160-fixed-height-useMaxWith
configureSvgSize should make height 100% when useMaxWidth is true.
2021-09-23 19:32:43 +02:00
Knut Sveidqvist
83d3b31a1a Merge branch 'release/8.13.0' 2021-09-23 18:59:51 +02:00
Knut Sveidqvist
b2fb9f421a Merge branch 'master' of github.com:mermaid-js/mermaid 2021-09-23 18:52:57 +02:00
Knut Sveidqvist
004e7e376d
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-09-18 10:19:07 +02:00
Knut Sveidqvist
432267c811 #2315 Fix for broken tests 2021-09-18 10:05:53 +02:00
Knut Sveidqvist
0fcabfae05 #2315 Fixing issue with padding between actors and content in sequence diagram 2021-09-18 08:26:49 +02:00
Knut Sveidqvist
9faa5acb21 #2315 Adding docs and integration tests 2021-09-18 08:03:34 +02:00
Knut Sveidqvist
6ce1c80a47 #2315 Adding the possibility to add actor figures as participants 2021-09-16 20:43:10 +02:00
eajenkins
96977e70b3 Cleaned up remaining prettier errors. 2021-09-14 14:26:43 -07:00
Yusuke Wada
a448af2897 add spec 2021-09-14 18:41:51 +09:00
Yusuke Wada
20aaf644fa useMaxWidth should make height 100% too. 2021-09-14 18:28:15 +09:00
Knut Sveidqvist
8bd830c991
Merge branch 'develop' into feature/field-classifier 2021-09-13 21:45:47 +02:00
eajenkins
85d33ecccd Added support for a new link syntax per recommendation:
link <actor>: <label> @ <link-url>

Removed documentation for class/icon definitions until we can finalize the design for this.

Fixed prettier errors.
2021-09-10 16:27:07 -07:00
Knut Sveidqvist
b6ba4b2fd8
Merge pull request #2237 from RonaldZielaznicki/2070_more_columns_for_entity_relationship_diagrams
2070: Update ER Diagram to have keys and comments.
2021-09-09 17:50:38 +02:00
eajenkins
b3210ed2ef Added sanitization of the links to prevent script injection attacks. 2021-09-02 11:59:43 -07:00
E Jenkins
ce6d8576ae
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus 2021-08-27 15:02:11 -07:00
eajenkins
291bec7e90 Initial implementation for Issue#2249.
Includes changes to sequence diagram code to enable popup menus and individualized styling of actors
Includes unit and e2e tests.
Includes updates to the md file for sequencediagrams.
2021-08-27 10:56:56 -07:00
Xavier Stouder
5997227997 chore: add the static field to the new renderer 2021-08-27 09:14:20 +02:00
Ashish Jain
296a64f465 Updated the version id 2021-08-26 19:32:05 +02:00
Ashish Jain
f07a777194
Merge pull request #2271 from mermaid-js/2270_direction_class
2270 Adding support for direction statements in class diagrams.
2021-08-26 18:30:12 +02:00
Ashish Jain
2e02f843ad
Merge pull request #2246 from reetghosh1/bug/1794_Unequal_Arrowhead_bug
Fixed Unequal Arrow Bug
2021-08-26 18:22:47 +02:00
Ashish Jain
d32fb0e4c0 Fix for classDiagram-v2 support for cardinality label positioning 2021-08-26 17:18:05 +02:00
Knut Sveidqvist
0658a363cb #2270 Add support for direction statements for classDiagrams 2021-08-26 17:05:10 +02:00
Xavier Stouder
8db827e429 chore: fix regexp 2021-08-26 11:37:14 +02:00
Xavier Stouder
8a8f792d4b fix: abstract field doesnt make any sense 2021-08-26 11:00:39 +02:00
Xavier Stouder
c0c978bbdf feat: add the possibility to use classifiers on fields of class diagrams
fix #1953
2021-08-26 10:53:03 +02:00
Knut Sveidqvist
b80ebb4fcb Merge branch '2256_class_switch_to_ng_renderer' of github.com:mermaid-js/mermaid into 2256_class_switch_to_ng_renderer 2021-08-19 21:16:31 +02:00
Knut Sveidqvist
fd6e59174e Fix for dark theme, class diagrams (v2) 2021-08-19 21:16:26 +02:00
Ashish Jain
54ef5b0bee Fix for classDiagram-v2 support for cardinality where HTML label is true 2021-08-19 21:15:21 +02:00
Knut Sveidqvist
b0c09a5b0f #2256 Switch default renderer for class diagrams to the next generation renderer 2021-08-19 20:11:11 +02:00
Ashish Jain
719de71de4 Fix for broken Pie Diagram for d3 v6 upgrade 2021-08-19 19:50:20 +02:00
Ashish Jain
2dfc9a7973 Lint fixes 2021-08-19 19:37:24 +02:00
Ashish Jain
798a0ad783 Fix for broken Pie Diagram for d3 v6 upgrade 2021-08-19 19:04:14 +02:00
Ashish Jain
5ef2ad5536 Fix for classDiagram-v2 support for cardinality 2021-08-19 18:48:19 +02:00
Ashish Jain
0276a67417 Fix for classDiagram-v2 support for generics using '~' & method emphasis 2021-08-19 18:00:49 +02:00
Ashish Jain
46a3d10e8a Fix for classDiagram-v2 support for generics using '~' 2021-08-19 17:51:22 +02:00
Reet Ghosh
d9a9eb56a7
Fixed Unequal Arrow Bug 2021-08-17 22:52:10 +05:30
Knut Sveidqvist
a251848ba1 #2240 Reversing order of calls 2021-08-15 16:57:26 +02:00