Commit Graph

520 Commits

Author SHA1 Message Date
Ashish Jain f95de5c6d9
Merge pull request #2740 from Guy-Adler/feature/2391_double_circle
Double Circle Node Shape
2022-02-24 18:45:50 +01:00
Ashish Jain 933efd0dda replace mock data with real 2022-02-24 18:40:22 +01:00
Ashish Jain 40f95a5dc1 chore: merge branch 'develop' into 1252_gitgraph_reinvented 2022-02-17 17:48:48 +01:00
Guy Adler 04454cece0
fix: changed open and close markers as recommended
chnged from `()(` and `())` to `(((` and `)))`
2022-02-17 17:22:38 +01:00
Guy Adler 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
Ashish Jain bb2dd2f5f3 getting there 2022-02-10 20:32:21 +01:00
Knut Sveidqvist 882ba03fcb fix: handling diagram width in sandbox mode 2022-02-03 19:54:24 +01:00
Knut Sveidqvist 46cdacfdc7 fix: broken test 2022-01-28 16:14:58 +01:00
Knut Sveidqvist fa55b7c824 feat: add support for links in sanbox mode 2022-01-28 14:45:43 +01:00
Knut Sveidqvist e3e9c67f5b fix: handling rerender in sandbox mode 2022-01-22 12:36:18 +01:00
Knut Sveidqvist a73b291c4f fix: setting width of iframe to size of the diagram 2022-01-22 11:47:03 +01:00
Knut Sveidqvist cbe2ce41c1 feat: adding new security level sandbox, sequence diagram update 2022-01-21 18:15:18 +01:00
Knut Sveidqvist 06834eb383 feat: adding new security level sandbox, diagram updates 2022-01-21 17:17:31 +01:00
Knut Sveidqvist 4081d7f5f6 feat: experimental version of sanboxing 2022-01-20 19:37:52 +01:00
Knut Sveidqvist 44d7dfe993 #2646 exploration 2022-01-18 23:02:16 +01:00
Knut Sveidqvist 91ec41762a #2632 Adding proper handling of cardinalities 2022-01-16 15:14:59 +01: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 b4fbe1b0f0 Adding an test file 2021-12-22 21:20:14 +01:00
Knut Sveidqvist 036f9dc359 #2560 Adding dark mode to allowed options in directives 2021-12-15 00:19:04 +01:00
Knut Sveidqvist 9c12502a36 #2560 Tetsing that the added css have balanced brackets 2021-12-14 23:54:31 +01:00
Matthieu MOREL 67143b7bfd
fix: lint-staged and merge eslint-config-html (#2550) 2021-12-11 11:12:14 +01:00
Knut Sveidqvist 4459eb5c87 Merge 2021-12-11 08:42:21 +01:00
Knut Sveidqvist d0cf3fc96a Merge 2021-12-08 11:55:49 +01:00
Knut Sveidqvist e0a05f83d1 Lint fix 2021-12-08 08:42:12 +01:00
Knut Sveidqvist 89ce930de2 Adding integration test 2021-12-07 22:55:28 +01:00
Knut Sveidqvist a97b2cc4da #2541 Sanitizing the label string in class diagrams 2021-12-07 21:55:33 +01:00
Yash-Singh1 3ea974709f chore: apply linting to html ext too and fixes for files 2021-12-04 15:28:40 -08:00
Knut Sveidqvist 3526e35012 Fix for node with wrong type 2021-11-30 20:28:51 +01:00
Knut Sveidqvist a018789026 Merge remote-tracking branch 'origin/develop' into develop 2021-11-30 19:24:10 +01:00
Knut Sveidqvist d9e598aa7f testcommit 2021-11-30 19:12:39 +01:00
Yash-Singh1 a3b2ba736d feat(flowchart): Allow default in the node ID 2021-11-25 13:48:28 -08:00
Matthieu MOREL d84be0d792 Enable eslint-plugin-jest, eslint-plugin-cypress and wider scan 2021-11-18 23:57:16 +01:00
Knut Sveidqvist 95df8fa128 Version 8.13.4 bundles 2021-11-18 17:10:36 +01:00
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
Knut Sveidqvist 26ede9b015 Small positoining fix for parallell processes and nested composite states 2021-06-06 11:37:23 +02:00
Knut Sveidqvist aa2596b457 #2111 Handling 'false' as false 2021-06-03 20:47:24 +02:00
Knut Sveidqvist bf21aa8cd6 #2088 Add the possibility to theme forks and joins using theme variables 2021-05-23 10:42:07 +02:00
Knut Sveidqvist 529824e2b3 #2088 Add the possibility to theme forks and joins using theme variables 2021-05-23 08:12:32 +02:00
Knut Sveidqvist 6e6ced2cee #2088 Add the possibility to theme forks and joins using theme variables 2021-05-22 20:13:31 +02:00
Knut Sveidqvist 4c92592aa1 #2050 Updating tests and adding docs 2021-05-18 22:34:24 +02:00
Knut Sveidqvist 09569301f1 #2050 Adding possibility to render subgrapgs in different directions 2021-05-18 21:15:06 +02:00
Knut Sveidqvist d1180a5c69 Fix for broken rendering test 2021-05-16 10:59:07 +02:00
Knut Sveidqvist 84941607df Fix for links between composie states 2021-05-16 10:44:34 +02:00
Knut Sveidqvist 3dc7b68d08 Test commit 2021-05-16 08:36:30 +02:00
Knut Sveidqvist af4930e3f3 Expandingh with of subgraphs whith title 2021-05-16 08:21:28 +02:00
Knut Sveidqvist 0a4f16737a #2072 Handle width of clusters with wide titles 2021-05-15 18:52:06 +02:00
Knut Sveidqvist 560951d597 Updated test 2021-05-09 15:57:44 +02:00
Knut Sveidqvist d3d0df59cb 2021-05-09 15:34:02 +02:00
Knut Sveidqvist 43f6ae7ba0 Add the directive state ment for change rendering direction in composite states 2021-05-09 15:25:51 +02:00