GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
4,046 Commits 182 Branches 159 Tags
Commit Graph

431 Commits

Author SHA1 Message Date
Knut Sveidqvist
fcbd8a5081 #2496 Fix for issue 2021-11-17 20:08:39 +01: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
Ashish Jain
250c9beff9 #2425 Added new test case 2021-10-21 19:45:15 +02:00
Ashish Jain
24d18eb42a #2425 Unicode handling for HTML labels 2021-10-21 19:37:48 +02:00
Ashish Jain
a06f6f9604 Add sanitize to properties and link in Sequence Diagram 2021-10-07 21:48:44 +02: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
Knut Sveidqvist
8ee3155f2a Fix for broken test 2021-09-29 20:20:44 +02:00
Ashish Jain
38ef061175 Reverting PR #2312 2021-09-29 18:22:35 +02:00
Knut Sveidqvist
e4e8a00acc Test fix + empty relation 2021-09-29 08:57:54 +02:00
Knut Sveidqvist
db8517a7f9 Adding xss tests 2021-09-29 08:52:12 +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
Ashish Jain
165a10ac37 Fix for broken classDiagram-v2.spec.js test case 2021-09-23 18:36:45 +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
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
9c511559ff #2315 Adding to docs and an integration test 2021-09-18 07:51:15 +02:00
Knut Sveidqvist
6ce1c80a47 #2315 Adding the possibility to add actor figures as participants 2021-09-16 20:43:10 +02:00
Yusuke Wada
0839fadbc2 fix e2e 2021-09-15 12:47:24 +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
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
Ashish Jain
3ad190855b
Merge pull request #2273 from mermaid-js/2272_switching_flopwchart_renderer_in_docs 
#2272 Switching the renderer in the docs
 2021-08-26 18:58:48 +02:00
Knut Sveidqvist
206a35ebd9 #2272 Switching the renderer in the docs 2021-08-26 18:55:47 +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
Knut Sveidqvist
0658a363cb #2270 Add support for direction statements for classDiagrams 2021-08-26 17:05:10 +02:00
Xavier Stouder
46a7039ae9 test: e2e test 2021-08-26 11:36:21 +02:00
Ashish Jain
0fba1c06b4 Updated test cases for class diagram v2 2021-08-20 17:28:57 +02:00
Ashish Jain
69a9829041 Updated test cases for class diagram v2 2021-08-20 17:12:46 +02:00
Ashish Jain
2434a94aae Updated test cases for class diagram v2 2021-08-19 21:27:11 +02:00
MOREL Matthieu
55faa3cb1a yarn build and adapt e2e tests 
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-08-18 16:49:00 +02:00
Knut Sveidqvist
a251848ba1 #2240 Reversing order of calls 2021-08-15 16:57:26 +02:00
RonaldZielaznicki
3383da514a Update ER Diagram to have keys and comments. 
Update ER Diagrams to have keys and comments.
 2021-08-12 16:18:54 -04:00
Knut Sveidqvist
c0831ecef6 Using Whitelist in all places 2021-08-05 17:35:28 +02:00
Knut Sveidqvist
f8891beb0a #2219 Frezing object to protect the prototype 2021-08-05 00:40:21 +02:00
Knut Sveidqvist
73ff972789 #2219 Moving check earlier in the chain for better effect 2021-08-03 20:10:15 +02:00
Knut Sveidqvist
69a1bb99ac #2209 Combining sanitasion approaches 2021-07-29 18:05:13 +02:00
Knut Sveidqvist
1034e1a301 #2177 Jets upgrade 2021-07-15 10:14:35 +02:00
Knut Sveidqvist
30de90e4f0 #2177 Updating sanitize-url, dagre, graphlib, khroma, moment-mini, stylis 2021-07-07 18:06:09 +02:00
Knut Sveidqvist
7fcb1ae9b3 #2177 Updating cypress and percy 2021-07-07 16:41:36 +02:00
Knut Sveidqvist
ed0947d761 Updated test 2021-06-27 00:57:28 +02:00
Knut Sveidqvist
6564bad85e Updated test 2021-06-27 00:40:14 +02:00
Knut Sveidqvist
6b9462f606 Preventing xss manipulation using onerror with the antiscript setting. 2021-06-27 00:24:19 +02:00
Knut Sveidqvist
3d22fa5d24 2122 Blöockling javascript urls 2021-06-08 20:08:04 +02:00