GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-21 06:53:17 +08:00
Code Issues Projects Releases Wiki Activity
4,637 Commits 185 Branches 159 Tags
Commit Graph

1285 Commits

Author SHA1 Message Date
Knut Sveidqvist
91ec41762a #2632 Adding proper handling of cardinalities 2022-01-16 15:14:59 +01:00
Knut Sveidqvist
7abe279b4a #2631 Adding safeguard to the while loops 2022-01-16 15:08:14 +01:00
Billiam
748ee19b4a
Update common.js 
Remove console.log from removeEscapes
 2022-01-12 01:22:06 -06:00
Eirik Bjornset
d3577eb59b fix: bug #2346 "ER-attribute comments not work" 2021-12-29 21:27:51 +01:00
Knut Sveidqvist
f4c335ad2f Fix for XSS vulnerability in url sanitization 2021-12-28 16:59:22 +01:00
Knut Sveidqvist
6f800be33b Fix for issue with links from actors 2021-12-23 11:03:07 +01:00
Knut Sveidqvist
d0cf3fc96a Merge 2021-12-08 11:55:49 +01:00
Yash-Singh1
a3b2ba736d feat(flowchart): Allow default in the node ID 2021-11-25 13:48:28 -08:00
Knut Sveidqvist
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
Knut Sveidqvist
72d2045104 #2496 Unbreaking state diagrams 2021-11-17 22:30:30 +01:00
Knut Sveidqvist
3feff08d42 #2496 A more delicate fix for issue 2021-11-17 21:31:52 +01:00
Yash-Singh1
e68ec31a8f Fix lint warnings 2021-11-11 10:37:50 -08:00
Yash-Singh1
2368ba4914 Merge github.com:mermaid-js/mermaid into eslint-fix 2021-11-11 10:31:08 -08:00
Matthieu MOREL
57671b2b78
enable prettier-plugin-jsdoc 2021-11-10 08:41:52 +01:00
Matthieu MOREL
4d103c14f7 enable eslint fix and eslint-plugin-jsdoc 2021-11-09 11:01:49 +01:00
Yash-Singh1
0fb25ee749 Merge github.com:mermaid-js/mermaid into jsdoc 2021-11-06 19:48:34 -07:00
Yash-Singh1
d2d8c9bc8e Add jsdoc and refactor a bit of code 2021-11-06 19:36:06 -07:00
Knut Sveidqvist
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
AlwinW
8b35745928 Corrected typos in documentation 2021-10-23 22:57:24 +11:00
Echo Chen
d63b26efc2 feat: added includes; added excludes date background 2021-10-20 18:39:35 +08:00
Knut Sveidqvist
ebe8b8d89f Allowing & and = in links 2021-10-14 21:08:42 +02:00
Ashish Jain
4a50995906 Sequence Diagram: Removed eval from popup handling 2021-10-14 21:02:18 +02:00
Ashish Jain
18ecf479b1 Sequence Diagram Popup : Work _in_progress 2021-10-07 21:52:16 +02:00
Ashish Jain
a06f6f9604 Add sanitize to properties and link in Sequence Diagram 2021-10-07 21:48:44 +02:00
Oleg Aksenov
626fbe6de8
Update src/diagrams/common/common.js 
Co-authored-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
 2021-10-03 18:56:37 +03:00
Oleg Aksenov
b22422f4b8
Comment console.log in sanitizeText 
This is to avoid console window be flooded with 'security level' messages
 2021-10-03 18:08:53 +03:00
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
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
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
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