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
8b35745928
Corrected typos in documentation
2021-10-23 22:57:24 +11:00
24d18eb42a
#2425 Unicode handling for HTML labels
2021-10-21 19:37:48 +02:00
d63b26efc2
feat: added includes; added excludes date background
2021-10-20 18:39:35 +08:00
ebe8b8d89f
Allowing & and = in links
2021-10-14 21:08:42 +02:00
4a50995906
Sequence Diagram: Removed eval from popup handling
2021-10-14 21:02:18 +02:00
cd427ab8ba
add shape `datastore` (for nodes of data flow diagram)
...
See https://github.com/mermaid-js/mermaid/issues/1893
2021-10-09 16:21:57 +02:00
cefafba062
add brackets [| and |] for datastore nodes of data flow diagrams
...
See https://github.com/mermaid-js/mermaid/issues/1893
2021-10-09 16:19:42 +02:00
18ecf479b1
Sequence Diagram Popup : Work _in_progress
2021-10-07 21:52:16 +02:00
a06f6f9604
Add sanitize to properties and link in Sequence Diagram
2021-10-07 21:48:44 +02:00
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
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
aa666d1829
Merge branch 'release/8.13.2' into develop
2021-09-29 20:22:57 +02:00
5d5808880f
Merge branch 'release/8.13.1' into develop
2021-09-29 20:22:09 +02:00
cb2294d6f2
Merge branch '2292_Class_Diagram_curly_brace_space_issue' into release/8.13.2
2021-09-29 20:06:32 +02:00
7ad509cc7a
Correct handling of the note object foir state diagrams when sanitizing it
2021-09-29 19:48:27 +02:00
dd088bc603
test commit
2021-09-29 18:48:09 +02:00
c5d091d445
Handling of svg labels for state diagrams
2021-09-29 18:29:39 +02:00
38ef061175
Reverting PR #2312
2021-09-29 18:22:35 +02:00
55eebd9309
2292 Fix for broken class diagram on space after the '{' curly brace
2021-09-29 17:13:14 +02:00
d45765dab5
Lint fixes + fix for unit tests
2021-09-29 09:35:14 +02:00
e4e8a00acc
Test fix + empty relation
2021-09-29 08:57:54 +02:00
35d8f33542
Merge branch 'master'
...
Conflicts:
cypress/platform/xss7.html
2021-09-29 08:51:54 +02:00
75b79e1b23
State diagram sanitization
2021-09-29 08:45:07 +02:00
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
83d3b31a1a
Merge branch 'release/8.13.0'
2021-09-23 18:59:51 +02:00
b2fb9f421a
Merge branch 'master' of github.com:mermaid-js/mermaid
2021-09-23 18:52:57 +02:00
004e7e376d
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus
2021-09-18 10:19:07 +02:00
432267c811
#2315 Fix for broken tests
2021-09-18 10:05:53 +02:00
0fcabfae05
#2315 Fixing issue with padding between actors and content in sequence diagram
2021-09-18 08:26:49 +02:00
9faa5acb21
#2315 Adding docs and integration tests
2021-09-18 08:03:34 +02:00
6ce1c80a47
#2315 Adding the possibility to add actor figures as participants
2021-09-16 20:43:10 +02:00
96977e70b3
Cleaned up remaining prettier errors.
2021-09-14 14:26:43 -07:00
a448af2897
add spec
2021-09-14 18:41:51 +09:00
20aaf644fa
useMaxWidth should make height 100% too.
2021-09-14 18:28:15 +09:00
8bd830c991
Merge branch 'develop' into feature/field-classifier
2021-09-13 21:45:47 +02:00
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
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
b3210ed2ef
Added sanitization of the links to prevent script injection attacks.
2021-09-02 11:59:43 -07:00
ce6d8576ae
Merge branch 'develop' into feature/2249_sequence_diagram_popup_menus
2021-08-27 15:02:11 -07:00
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
5997227997
chore: add the static field to the new renderer
2021-08-27 09:14:20 +02:00
296a64f465
Updated the version id
2021-08-26 19:32:05 +02:00
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
2e02f843ad
Merge pull request #2246 from reetghosh1/bug/1794_Unequal_Arrowhead_bug
...
Fixed Unequal Arrow Bug
2021-08-26 18:22:47 +02:00
d32fb0e4c0
Fix for classDiagram-v2 support for cardinality label positioning
2021-08-26 17:18:05 +02:00
0658a363cb
#2270 Add support for direction statements for classDiagrams
2021-08-26 17:05:10 +02:00
8db827e429
chore: fix regexp
2021-08-26 11:37:14 +02:00
8a8f792d4b
fix: abstract field doesnt make any sense
2021-08-26 11:00:39 +02:00
c0c978bbdf
feat: add the possibility to use classifiers on fields of class diagrams
...
fix #1953
2021-08-26 10:53:03 +02:00
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
fd6e59174e
Fix for dark theme, class diagrams (v2)
2021-08-19 21:16:26 +02:00
54ef5b0bee
Fix for classDiagram-v2 support for cardinality where HTML label is true
2021-08-19 21:15:21 +02:00
b0c09a5b0f
#2256 Switch default renderer for class diagrams to the next generation renderer
2021-08-19 20:11:11 +02:00
719de71de4
Fix for broken Pie Diagram for d3 v6 upgrade
2021-08-19 19:50:20 +02:00
2dfc9a7973
Lint fixes
2021-08-19 19:37:24 +02:00
798a0ad783
Fix for broken Pie Diagram for d3 v6 upgrade
2021-08-19 19:04:14 +02:00
5ef2ad5536
Fix for classDiagram-v2 support for cardinality
2021-08-19 18:48:19 +02:00
0276a67417
Fix for classDiagram-v2 support for generics using '~' & method emphasis
2021-08-19 18:00:49 +02:00
46a3d10e8a
Fix for classDiagram-v2 support for generics using '~'
2021-08-19 17:51:22 +02:00
d9a9eb56a7
Fixed Unequal Arrow Bug
2021-08-17 22:52:10 +05:30
a251848ba1
#2240 Reversing order of calls
2021-08-15 16:57:26 +02:00
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
8af36b742e
Merge branch 'master'
...
Conflicts:
dist/mermaid.core.js
dist/mermaid.core.js.map
dist/mermaid.js
dist/mermaid.js.map
dist/mermaid.min.js
dist/mermaid.min.js.map
2021-08-05 20:08:37 +02:00
b6648283c2
Removed some log statements
2021-08-05 19:53:11 +02:00
b29979bfd9
Fix for broken test
2021-08-05 18:58:42 +02:00
7e346a56ff
Lint fix
2021-08-05 18:18:18 +02:00
c0831ecef6
Using Whitelist in all places
2021-08-05 17:35:28 +02:00
88e195408c
Lint fixes
2021-08-05 01:13:13 +02:00
655ff2675e
#2219 Excluding using a black list as well
2021-08-05 01:07:35 +02:00
37fae09ce4
#2219 Validating directives agains list of legal configuration keys
2021-08-05 01:05:34 +02:00
711fb7d748
#2219 UnFrezing object to not cause other downstream issues
2021-08-05 00:52:10 +02:00
f8891beb0a
#2219 Frezing object to protect the prototype
2021-08-05 00:40:21 +02:00
eb4ac5c103
Merge
2021-08-04 20:02:16 +02:00
73ff972789
#2219 Moving check earlier in the chain for better effect
2021-08-03 20:10:15 +02:00
1d32307a71
use Object.entries instead of d3.entries as it is deprecated ( #35 )
2021-07-29 22:08:01 +02:00
7d802a71c1
Fix for tests
2021-07-29 18:11:48 +02:00
69a1bb99ac
#2209 Combining sanitasion approaches
2021-07-29 18:05:13 +02:00
5399214ad8
Update of prettier, eslint and rules
2021-07-15 11:35:12 +02:00
896c7eca57
Fix for issue with updated stylis
2021-07-15 10:58:22 +02:00
1034e1a301
#2177 Jets upgrade
2021-07-15 10:14:35 +02:00
30de90e4f0
#2177 Updating sanitize-url, dagre, graphlib, khroma, moment-mini, stylis
2021-07-07 18:06:09 +02:00
30a02adfe3
Merge branch 'develop' into fix/entity-decode
2021-07-07 14:01:30 +02:00
ed6abb6d92
Merge branch 'develop' of github.com:sidharthv96/mermaid into fix/entity-decode
...
* 'develop' of github.com:sidharthv96/mermaid:
Update flowchart.md
Added new theme user journey diagram specific theme variables
fix typo
2122 Blöockling javascript urls
fix: Assign proper namespaces to foreignObject children
Small positoining fix for parallell processes and nested composite states
Version update in the docs
Updated version in package.json and recompile
Lint fix
fix typo
Fix for styling
Fox fr keeping the label background in state diagrams
Removed unused dependency "he"
Ensuring "minify" is only listed as a dev dependency
Update n00b-syntaxReference.md
Update _sidebar.md
[docs] Update default log level value
2021-07-07 02:02:42 +05:30
862330a576
Fix #1603 Remove entity-decode Dependency.
2021-07-07 02:00:44 +05:30
c447262764
Testcommit
2021-07-05 12:05:33 +02:00
b468065c6b
Adding dompurify
2021-07-05 11:38:24 +02:00
67050e4d6d
#2170 Adjusting tests
2021-07-05 11:10:26 +02:00
5437ab7057
#2170 Lint fix
2021-07-05 10:27:15 +02:00
2f73fd3a9d
#2170 Adding dompurify
2021-07-05 10:21:11 +02:00
6b9462f606
Preventing xss manipulation using onerror with the antiscript setting.
2021-06-27 00:24:19 +02:00
9cc4f73cab
Merge pull request #2151 from mermaid-js/2125_switch_state_renderer
...
#2125 Switching default renderer for state diagrams
2021-06-25 12:06:25 +02:00
d0d87497c5
#2125 Switching default renderer for state diagrams
2021-06-25 11:08:57 +02:00
db049f9c8e
Merge pull request #2119 from lishid/develop
...
fix: Assign proper namespaces to foreignObject children
2021-06-25 10:30:50 +02:00
c1335955f4
Merge pull request #2133 from mermaid-js/2132_style_journey_diagram
...
FIX: Added new theme user journey diagram specific theme variables
2021-06-25 10:28:00 +02:00
62c6b9d886
Merge pull request #2109 from fabiospampinato/no-useless-prod-deps
...
Removed some non-production dependencies from the list of production dependencies
2021-06-25 10:27:17 +02:00
8b55b83256
Added new theme user journey diagram specific theme variables
2021-06-15 14:21:25 +02:00
3d22fa5d24
2122 Blöockling javascript urls
2021-06-08 20:08:04 +02:00
e0652539fb
fix: Assign proper namespaces to foreignObject children
2021-06-06 16:57:47 -04:00
26ede9b015
Small positoining fix for parallell processes and nested composite states
2021-06-06 11:37:23 +02:00
e6e94ad57e
Merge pull request #2115 from mermaid-js/2111_placeholder
...
2111 placeholder
2021-06-05 12:11:13 +02:00
e0c3b8e269
Lint fix
2021-06-04 07:27:44 +02:00
9861c081db
fix typo
2021-06-04 13:56:11 +09:00
916df3ff4f
Fix for styling
2021-06-03 21:41:29 +02:00
c0b65e9304
Fox fr keeping the label background in state diagrams
2021-06-03 21:27:53 +02:00
aa2596b457
#2111 Handling 'false' as false
2021-06-03 20:47:24 +02:00
359ea05680
Removed unused dependency "he"
2021-06-03 13:23:26 +01:00
bf21aa8cd6
#2088 Add the possibility to theme forks and joins using theme variables
2021-05-23 10:42:07 +02:00
529824e2b3
#2088 Add the possibility to theme forks and joins using theme variables
2021-05-23 08:12:32 +02:00
6e6ced2cee
#2088 Add the possibility to theme forks and joins using theme variables
2021-05-22 20:13:31 +02:00
4c92592aa1
#2050 Updating tests and adding docs
2021-05-18 22:34:24 +02:00
0bbefdc48f
#2050 Adjusted default value for direction in subgraphs
2021-05-18 21:36:04 +02:00
09569301f1
#2050 Adding possibility to render subgrapgs in different directions
2021-05-18 21:15:06 +02:00
cea1441eeb
#2072 fix for composite states
2021-05-17 18:49:53 +02:00
84941607df
Fix for links between composie states
2021-05-16 10:44:34 +02:00
af4930e3f3
Expandingh with of subgraphs whith title
2021-05-16 08:21:28 +02:00
0a4f16737a
#2072 Handle width of clusters with wide titles
2021-05-15 18:52:06 +02:00
417428acea
Removed some console statememnts and updated version
2021-05-10 18:14:47 +02:00
d208f58084
SMall styling fix for choices in state diagrams
2021-05-10 07:44:28 +02:00
6dcc538777
2021-05-09 16:24:36 +02:00
75769c46de
2021-05-09 15:42:31 +02:00
d3d0df59cb
2021-05-09 15:34:02 +02:00
43f6ae7ba0
Add the directive state ment for change rendering direction in composite states
2021-05-09 15:25:51 +02:00
e3164d8d44
#2055 Fix for how ids are set to notes
2021-05-09 11:12:22 +02:00
4720ede442
#2045 name change of state diagram specific theme variable
2021-05-09 10:56:39 +02:00
37136c9bef
#1648 , #1656 Making Pie Chart more configurable
2021-05-07 17:02:08 +02:00
fb5970d4db
Merge pull request #2038 from mermaid-js/2017_std_req_diagrams
...
2017 std req diagrams
2021-05-07 02:49:32 +02:00
2de9d491c3
#2045 Small fix for alt ackground in state diagrams
2021-05-06 22:16:31 +02:00
30909bd6fe
#2045 Fix for text color in state diagram v1 in dark
2021-05-06 20:43:34 +02:00
2104c983e9
#2045 Fix for default value
2021-05-06 20:29:07 +02:00
30faf7bfad
#2045 Adjusted styling css to make use of state diagram theme variables
2021-05-06 20:26:00 +02:00
785e5552ae
Merge branch 'pie_chart_themeing' into state-diagram-themeing
2021-05-06 07:52:09 +02:00
a1cd398e4d
2021-05-06 07:50:24 +02:00
edb06b12e9
#2043 Added PieChart theme variable support
2021-05-06 03:09:36 +02:00
1337ffe9e5
#2043 Added PieChart theme variable support
2021-05-06 01:41:24 +02:00
5157b2eff4
#2017 Fix for theme variable border size for requirement title line
2021-05-03 16:22:54 +02:00
Knut Sveidqvist