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
Knut Sveidqvist
e3164d8d44
#2055 Fix for how ids are set to notes
2021-05-09 11:12:22 +02:00
Knut Sveidqvist
4720ede442
#2045 name change of state diagram specific theme variable
2021-05-09 10:56:39 +02:00
Knut Sveidqvist
2de9d491c3
#2045 Small fix for alt ackground in state diagrams
2021-05-06 22:16:31 +02:00
Knut Sveidqvist
2104c983e9
#2045 Fix for default value
2021-05-06 20:29:07 +02:00
Knut Sveidqvist
30faf7bfad
#2045 Adjusted styling css to make use of state diagram theme variables
2021-05-06 20:26:00 +02:00
Knut Sveidqvist
a1cd398e4d
2021-05-06 07:50:24 +02:00
Knut Sveidqvist
aa39dcc34f
#2035 Growing composite state width with title
2021-05-02 08:44:28 +02:00
Knut Sveidqvist
6dc71122b8
#2032 Adding new statement to add choice shape in state diagrams
2021-05-01 18:09:42 +02:00
Knut Sveidqvist
d8d624870d
Adjustments
2021-04-30 19:25:45 +02:00
Knut Sveidqvist
1e6ed7be02
#2029 Adding option to configure default renderer
2021-04-30 17:27:05 +02:00
Knut Sveidqvist
2240333df1
#2026 Fix for descriptions of composite states
2021-04-30 13:50:21 +02:00
Knut Sveidqvist
fab98633a4
Updated test
2021-04-30 10:46:48 +02:00
Knut Sveidqvist
11f3cbdb36
#1958 Handling multiple edges from and to the same node tuple
2021-04-30 10:34:50 +02:00
Knut Sveidqvist
de8bdb96bd
Final tweaks
2021-04-30 09:04:09 +02:00
Knut Sveidqvist
a9f14d9ffe
Adding image test for failing testcase
2021-04-29 19:27:04 +02:00
Knut Sveidqvist
ce84278f10
Better track of the order of the edge and removing debug code
2021-04-29 19:24:07 +02:00
Knut Sveidqvist
8955e0a6b1
Fix for first case
2021-04-29 18:50:12 +02:00
Knut Sveidqvist
8f09514dd7
#2017 Standardization of requirement diagrams
2021-04-26 19:08:16 +02:00
Knut Sveidqvist
45918da48e
Updated tests
2021-04-25 12:27:59 +02:00
Knut Sveidqvist
cef6273dcf
Updated tests
2021-04-25 12:27:51 +02:00
Knut Sveidqvist
b69ad0a3d2
Fix for broken test
2021-04-25 10:59:01 +02:00
Knut Sveidqvist
f7750e5f04
Style fix for topAxis and added integration test
2021-04-25 10:41:59 +02:00
Knut Sveidqvist
3209986df1
#1955 Fix for tests
2021-03-23 20:10:58 +01:00
Knut Sveidqvist
87458657f8
#1955 Different selector in order to make it possible to change the text color for flowcharts vis classDef statements
2021-03-23 19:22:10 +01:00
Knut Sveidqvist
4e7ecb3f30
Merge branch 'master' into develop
2021-03-13 16:45:27 +01:00
Knut Sveidqvist
0f31471b2e
#1940 Fix
2021-03-11 20:57:45 +01:00
Knut Sveidqvist
4395a5f404
Added tests to trigger the xss attack (and fail initially)
2021-03-11 19:51:05 +01:00
Knut Sveidqvist
cc1eb5dd98
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2021-02-28 10:28:50 +01:00
Knut Sveidqvist
d66727cb35
Render test for requirement diagrams and updated showcase diagrams
2021-02-28 10:28:31 +01:00
Knut Sveidqvist
b1d21b0e3f
Merge branch 'develop' into 1906_gantt_font
2021-02-27 13:07:02 +01:00
Knut Sveidqvist
30b265a425
Removed configuration not used
2021-02-27 10:28:15 +01:00
Knut Sveidqvist
021bc5f011
Making the font size being configurable and addting the ability set the section font size
2021-02-25 10:06:13 +01:00
Knut Sveidqvist
693de2996a
#1903 Use central configuration tools
2021-02-23 20:56:01 +01:00
Knut Sveidqvist
229f5b0c51
Updated rendering test
2021-02-18 19:52:50 +01:00
Knut Sveidqvist
562390dbb6
Test commit
2021-01-28 20:55:58 +01:00
Knut Sveidqvist
1b9d9fe12c
#1874 #1865 Fix for regression issue - flowchart
2021-01-28 20:51:11 +01:00
Knut Sveidqvist
fc5693067c
#1874 #1865 Fix for rgression issue
2021-01-28 07:52:17 +01:00
Knut Sveidqvist
177cd30854
#1874 Protecting the original configuration
2021-01-27 22:23:33 +01:00
Marc Faber
0c724d1a88
fix integration tests
2021-01-23 21:48:36 +01:00
Marc Faber
bf8e7a3590
#1783 Apply styles to all types of flowchart node shapes
2021-01-23 20:17:36 +01:00
Knut Sveidqvist
7cb46ffa18
Merge branch 'master' into develop
2021-01-23 16:10:07 +01:00
Knut Sveidqvist
ea9a893c24
#1865 Making title color woitk when htmnlLabels are used
2021-01-23 16:07:25 +01:00
Knut Sveidqvist
22da3bdba7
Dev fix
2021-01-21 21:20:35 +01:00
Knut Sveidqvist
5d24a2b7d9
#1528 Adding async arrow type in sequence diagrams
2021-01-11 23:09:37 +01:00
Knut Sveidqvist
1c0b167c95
Merge branch 'develop' of https://github.com/designsforhealth/mermaid into designsforhealth-develop
2020-12-17 20:44:23 +01:00
Ashish Jain
032d8781dc
Updated the click_security_loose test case for classDiagram and classDiagram-v2 for new callback function arg
2020-12-17 20:26:12 +01:00
Knut Sveidqvist
9c36b2bef7
Added e2e test for the new argument handling for flowcharts and graph
2020-12-17 19:58:25 +01:00
Johnny Walker
0fe1fb76d1
test: add tests for sequence diagram text wrap updates
2020-12-12 02:01:40 -05:00
Matthieu MOREL
85c8b2fdc3
support old syntax
2020-12-10 09:37:00 +01:00
Matthieu MOREL
b97e71e83e
Support old and new syntax
2020-12-10 09:35:46 +01:00
Matthieu MOREL
40cf4dfee4
missing keywords
2020-12-06 13:49:42 +01:00
Matthieu MOREL
1a2c1252f0
update doc and integration tests
2020-12-06 13:43:42 +01:00
Matthieu MOREL
95ee87f771
add keywords href and call for urls and functions
2020-12-06 13:23:17 +01:00
GDFaber
f62189b381
Merge pull request #1781 from mermaid-js/bug/1751_flowchart_subgraph_styles
...
Apply style settings to subgraphs in "flowchart" diagrams
2020-11-18 00:42:30 +01:00
Marc Faber
55532c00b4
Revert updates on integration tests due to failing PR tests
2020-11-18 00:34:02 +01:00
Marc Faber
a16bbb8046
#1751 apply style settings to subgraphs in "flowchart" diagrams
2020-11-17 23:18:11 +01:00
Marc Faber
06f74a8c15
updated integration tests
2020-11-17 14:34:48 +01:00
Adrian Hall
ae1880311e
Support attribute definitions for entities in ERDs
2020-11-02 09:41:46 +00:00
Adrian Hall
851cff4bb8
Merge branch 'develop' into bug/1710_underscore_in_entity_names
2020-10-23 10:02:50 +01:00
Adrian Hall
245e25f4b7
Allow underscores in entity names, and entities with no relationships
2020-10-23 10:00:17 +01:00
Ashish Jain
3f6296b619
#1713 , #1719 , # 1720
2020-10-22 21:40:08 +02:00
Knut Sveidqvist
6eaea38df7
Adding styling
2020-10-22 19:51:31 +02:00
Knut Sveidqvist
5fb572abaf
Merge branch 'develop' into 1252_gitgraph_reinvented
2020-10-22 18:55:56 +02:00
Knut Sveidqvist
7c939860d6
#1740 Adding test
2020-10-22 18:47:32 +02:00
Knut Sveidqvist
d8da24804f
#1724 Adding fontawesome to edge labels
2020-10-15 19:29:37 +02:00
Knut Sveidqvist
4ae61ad35a
€1726 updated test
2020-10-15 19:06:38 +02:00
Knut Sveidqvist
c2c5cc45fa
Merge remote-tracking branch 'refs/remotes/origin/1726_graphDef_linkStyle'
...
Conflicts:
cypress/platform/knsv.html
2020-10-15 19:04:48 +02:00
Knut Sveidqvist
7404e436d2
#1726 Handling think lines
2020-10-15 19:00:35 +02:00
Knut Sveidqvist
cc1560d3e3
#1726 fix for link styling and classes for subgraph
2020-10-15 18:42:58 +02:00
Knut Sveidqvist
4812437519
2020-10-15 18:42:58 +02:00
Knut Sveidqvist
6df9bf36e5
Work in progress
2020-10-15 17:49:39 +02:00
Knut Sveidqvist
53933d934d
2020-10-15 17:45:19 +02:00
Knut Sveidqvist
f108099623
2020-10-15 17:37:16 +02:00
Knut Sveidqvist
2e4d1a7b44
Release 8.8.2
2020-10-08 19:43:29 +02:00
Knut Sveidqvist
582a045457
#1704 Test and lint
2020-10-07 20:43:52 +02:00
Knut Sveidqvist
4b2d98129e
#1704 handling of subgraph data
2020-10-07 20:43:31 +02:00
Knut Sveidqvist
f0a8eaa5be
Merge pull request #1697 from mermaid-js/1676_click_support_v2
...
Adds support for custom cssClasses for classDiagram-v2. Also, improved test cases for classDiagram.
2020-09-23 20:41:52 +02:00
Ashish Jain
93bf8d7414
#1696 Fix for custom cssClass test cases for classDiagram
2020-09-23 20:16:06 +02:00
Knut Sveidqvist
ce23316008
#1694 Applying styles from the graph definition for flowcharts
2020-09-23 19:51:16 +02:00
Ashish Jain
c04dac65ac
#1693 Added support for custom cssClass and styling to classDiagram-v2
2020-09-23 19:27:09 +02:00
Knut Sveidqvist
f856782528
#1657Fix for broken test
2020-09-20 12:31:39 +02:00
Knut Sveidqvist
c9ff70b3cc
#1657 Handling class definitions for flowchart beta
2020-09-20 12:14:04 +02:00
Ashish Jain
a26c9fca1e
#1676 Fix for additonal usecases for flowchart
2020-09-16 21:53:17 +02:00
Knut Sveidqvist
2a6372cabe
#1676 Handling vertices starting with a number
2020-09-16 20:09:02 +02:00
Ashish Jain
22c710ed99
#1676 Fix for broken test cases
2020-09-16 18:59:53 +02:00
Knut Sveidqvist
c8c4554299
#1676 Adding click support and tooltip support for flowchart
2020-09-12 10:56:23 +02:00
Knut Sveidqvist
9d8c867de8
#1676 Adding click support to the new rendering engine and classDiagram-v2
2020-09-10 20:58:16 +02:00
Ashish Jain
28c01f6476
Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two
2020-09-09 18:43:53 +02:00
Knut Sveidqvist
4f8e242dac
2020-09-06 22:34:13 +02:00
Knut Sveidqvist
9106c6ad52
#1602 Update of handling of nested subgraphs
2020-09-02 20:34:24 +02:00
Knut Sveidqvist
a82c53dd2e
Not moving the label away from assigned position
2020-08-29 16:11:42 +02:00
Ashish Jain
b244118fd9
Fix for class title label css
2020-08-27 20:43:37 +02:00
Guillaume Grossetie
99844b4ca3
Add e2e tests on all diagrams
2020-08-25 17:17:52 +02:00
Guillaume Grossetie
184fcab0b7
resolves #1490 consistent SVG height and width between diagrams
2020-08-25 15:46:10 +02:00
Knut Sveidqvist
0cbd002667
#1607 Using correct config when to decide about sanitizing text
2020-08-23 20:02:51 +02:00
Ashish Jain
89b4f84b0a
Update classDiagram-v2 spec test case name
2020-08-19 20:55:46 +02:00
Ashish Jain
455cd9c696
Merge branch 'develop' of https://github.com/knsv/mermaid into 1542_take_two
2020-08-19 18:45:24 +02:00
Knut Sveidqvist
6b23c71bb5
Use courier in all rendering tests
2020-08-16 21:49:36 +02:00
Knut Sveidqvist
236332d8c7
Use arial in stateDiagram rendering tests
2020-08-16 13:50:27 +02:00
Knut Sveidqvist
de72d7ba13
Use arial in stateDiagram rendering tests
2020-08-16 13:19:01 +02:00
Knut Sveidqvist
ba6d73fc17
Debug of fonts in percy renderings
2020-08-16 13:01:45 +02:00
Knut Sveidqvist
888b1fb021
#1613 #1495 Adding support for edge length to flowchart (beta)
2020-08-16 08:45:44 +02:00
Knut Sveidqvist
958b032cea
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-08-16 08:34:47 +02:00
Knut Sveidqvist
129b3f9004
Cherry pick of config changes
2020-08-14 07:34:42 +02:00
Mattéo Delabre
01344a991d
Add support for changing the length of edges
...
Resolves #637 , resolves #1495 .
The syntax for edges is extended to allow for extra
dashes/equals signs/dots (depending on the edge type). Each added
character increases the length of the edge by one rank level, as
follows:
Length | 1 | 2 | 3 |
------------------|:------:|:-------:|:--------:|
Normal | `---` | `----` | `-----` |
Normal with arrow | `-->` | `--->` | `---->` |
Thick | `===` | `====` | `=====` |
Thick with arrow | `==>` | `===>` | `====>` |
Dotted | `-.-` | `-..-` | `-...-` |
Dotted with arrow | `-.->` | `-..->` | `-...->` |
This features leverages the `minlen` property exposed by Dagre which was
not previously available when using Mermaid.
2020-08-14 00:15:26 +02:00
Ashish Jain
060ac3bb4a
Adjust the class members with proper parsing
2020-08-13 21:06:33 +02:00
Ashish Jain
2519486a02
Merge branch '1614_fontFamily' of https://github.com/knsv/mermaid into 1542_take_two
2020-08-13 20:09:13 +02:00
Ashish Jain
bec3cc437d
Fix for interface rendering and positioning
2020-08-13 20:08:09 +02:00
Knut Sveidqvist
525a32f9f0
2020-08-13 20:03:42 +02:00
Ashish Jain
36f8f1902c
Removing hard coding with dynamic values for cardinalities
2020-08-13 19:41:33 +02:00
Knut Sveidqvist
bde7b1a828
Html labels set to false in tests
2020-08-13 19:19:19 +02:00
Ashish Jain
9891b383e7
Adding classDiagram-v2 test cases
2020-08-13 18:52:04 +02:00
Ashish Jain
28bc87b873
Merge branch 'develop' into 1542_take_two
2020-08-13 18:27:37 +02:00
Knut Sveidqvist
677c6d9f89
Release 8.7.0
2020-08-09 14:02:57 +02:00
Knut Sveidqvist
77541102af
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2020-08-08 10:59:59 +02:00
Ashish Jain
61993a032a
Initial implementation for cardinality position.
2020-08-07 14:52:42 +02:00
Justin Greywolf
1f051d7a9f
1181-Css for class diagrams
...
Initial change for supporting custom CSS for use with classDiagrams.
updated `LABEL` regex for specificity
2020-08-03 12:47:50 -07:00
Knut Sveidqvist
87f12c7d5a
Updated with a small example of a custom theme
2020-07-31 16:04:12 +02:00
Knut Sveidqvist
e9e9b13df0
Added themeVariable references and som adjustments in base theme calculations.
2020-07-31 15:05:51 +02:00
Knut Sveidqvist
5565aab488
#1590 Theme base tweaked for custom theming
2020-07-30 19:18:18 +02:00
Knut Sveidqvist
36e421eb5f
Merge pull request #1586 from mermaid-js/1542_take_two
...
1542 take two
2020-07-30 08:58:56 +02:00
Knut Sveidqvist
a5b01c3f6f
#1542 Adding gantt to showcases
2020-07-30 08:34:41 +02:00
Knut Sveidqvist
ecea0f90d4
#1542 Handling of config
2020-07-29 22:19:23 +02:00
Knut Sveidqvist
a4bf85b1b6
#1542 Making sure config and directives works for overriding theme variables using initialize call or directives + tests
2020-07-29 18:38:59 +02:00
Knut Sveidqvist
cf70678188
Merge branch 'develop' into feature/1460_add_link_target_to_flowchart_click
2020-07-28 13:21:31 +02:00
Knut Sveidqvist
b23988c947
Merge pull request #1582 from cmmoran/develop
...
Directive support for many diagrams, config bugfix
2020-07-28 13:17:35 +02:00
Marc Faber
d04d8c3a1d
#1460 Add link target option to flowchart click
2020-07-28 10:49:54 +02:00
chris moran
e5b22684cd
Fixed a parser warning in classDiagram
...
Fixed a regression bug I introduced in theme.spec.js
2020-07-27 09:57:04 -04:00
Knut Sveidqvist
f0ed170b04
#1542 Setting up base theme for custom theming
2020-07-27 11:51:20 +02:00
Knut Sveidqvist
5a7d770a58
#1542 Setting up base theme for custom theming
2020-07-27 10:01:34 +02:00
chris moran
c8f652aaa8
Merge branch 'mermaid-js-develop' into develop
2020-07-27 03:23:04 -04:00
Knut Sveidqvist
01d7a33230
Merge branch 'master' into develop
2020-07-26 22:37:10 +02:00
chris moran
108a50f3bb
Merge branch 'mermaid-js-develop' into develop
2020-07-26 08:59:22 -04:00
Knut Sveidqvist
95b7e4f9ad
Theme tweaks
2020-07-26 14:09:48 +02:00
Knut Sveidqvist
8dd0fe3c40
Adding showcases
2020-07-26 11:50:36 +02:00
Knut Sveidqvist
b1f0797a1f
Updated test
2020-07-26 08:20:45 +02:00
Knut Sveidqvist
62acc18e7d
Merge of cherry pick
2020-07-26 08:03:56 +02:00
Knut Sveidqvist
06d80032fe
#1578 Fetching updated configuration before use
2020-07-26 08:00:43 +02:00
Knut Sveidqvist
dc2d52fc09
testing the label width in percy
2020-07-24 19:14:42 +02:00
chris moran
cb675300b1
Directive support added to journey
...
Fixed an issue in journey svgDraw.drawText expected an attribute (textMargin) but did not receive one and raised an error: <tspan> attribute x: Expected length, "NaN".
Added parseDirective to journeyDb
2020-07-23 05:58:15 -04:00
Ashish Jain
71af9741cc
Correct positioning for class title
2020-07-22 21:25:01 +02:00
Ashish Jain
c9d4cac3ff
Merge branch 'develop' into feature/Issue-1465_Class_migration
2020-07-22 19:33:20 +02:00
Ashish Jain
a2932a0393
Merge branch 'master' into develop
2020-07-22 19:30:55 +02:00
Ashish Jain
24e470a099
Merge branch 'develop' into feature/Issue-1465_Class_migration
2020-07-22 18:23:47 +02:00
Ashish Jain
8e72ddde32
#1552 Update current.html for cardinality test
2020-07-22 18:20:31 +02:00
Ashish Jain
abe23250c4
Adjusting initial classDiagram shape rendering
2020-07-21 15:25:16 +02:00
Knut Sveidqvist
b93ef22687
#1562 Fix for test
2020-07-21 12:31:05 +02:00
Knut Sveidqvist
cb79302867
#1562 Updated handling of pointsarray when the point is already in the array
2020-07-21 12:01:08 +02:00
Knut Sveidqvist
211d6f4005
2020-07-21 11:15:42 +02:00
Knut Sveidqvist
936d5821f9
Merge
2020-07-18 20:12:10 +02:00
Knut Sveidqvist
08064c4243
#1542 Adding khroma for color manipulations
2020-07-18 15:15:50 +02:00
Knut Sveidqvist
e8af778962
#1542 Updated test
2020-07-18 13:52:51 +02:00
Knut Sveidqvist
062126c43d
Test page for directives
2020-07-17 12:44:42 +02:00
Knut Sveidqvist
f9667cd80f
#1542 Test page using directoives to switch theme
2020-07-17 12:34:33 +02:00
Knut Sveidqvist
65c2f58a66
#1542 Test page using directoives to switch theme
2020-07-17 09:31:42 +02:00
Knut Sveidqvist
030b945828
#1542 Theme variables setup
2020-07-17 09:16:39 +02:00
Knut Sveidqvist
fd4240b774
#1542 Setting theme options as the regular options
2020-07-16 23:39:38 +02:00
Knut Sveidqvist
8c0e022b44
Template for dynamic styles in place
2020-07-16 20:27:42 +02:00
Knut Sveidqvist
da8e75f98a
Merge from master with doc updates
2020-07-16 12:27:03 +02:00
Knut Sveidqvist
bbc9532444
#1454 Adding showcase diagrams rendered with the different themes
2020-07-15 14:02:19 +02:00
Knut Sveidqvist
fe5d9e486b
#1485 Fixing for test
2020-07-15 13:29:35 +02:00
Knut Sveidqvist
3a9306a9c2
#1485 Setting proper font settings in the root css
2020-07-15 12:12:57 +02:00
Knut Sveidqvist
686ee1e349
Relase 8.6.0
2020-07-13 16:39:52 +02:00
Knut Sveidqvist
dc2f9c304d
Font fix for rendering tests - back to noto font
2020-07-12 15:25:01 +02:00
Knut Sveidqvist
462d5c3b12
Font fix for rendering tests
2020-07-12 14:56:27 +02:00
Knut Sveidqvist
39e90a20da
Font fix for rendering tests
2020-07-12 12:21:17 +02:00
Knut Sveidqvist
61684830bf
2020-07-12 11:15:32 +02:00
Ryan Ling
5da4ced8c1
Add `flowchart.diagramPadding` config option
...
This option lets you customise the padding around the whole flowchart.
It is equivalent to `er.diagramPadding` and defaults to 8px for
backwards compatibility with the current hardcoded value.
2020-07-11 16:54:00 +10:00
Knut Sveidqvist
32b2ee8cab
2020-07-04 11:13:54 +02:00
chris moran
217bd1f4bf
Fixed test cases for sequence diagrams
...
Updated config to match a conversation knut and i had about the relationship between global, site, and integrator configuration
(Will update docs)
Renamed wrapEnabled to wrap
Poor man's caching for calculateTextDimensions, wrapLabel, and breakString (actually makes a huge difference)
2020-06-26 09:26:56 -04:00
Ashish Jain
b190a0eaba
Added support for classDiagram relation arrow markers
2020-06-24 21:45:19 +02:00
Ashish Jain
85d4f2843e
Initial commit for classDiagram v2
2020-06-24 19:34:12 +02:00
chris moran
7d9bf83f66
addition: added bounds models for bounds checking in unit tests.
...
addition: bounds.init will clear models
addition: added loop model widths id instead of using title as the id
removed parseMessage debug message
addition: added configuration labelBoxWidth and labelBoxHeight for loop label box width/height
change: adjusted svgDraw drawText to support anchor and valign and whether to output a tspan
change: drawText returns an array regardless of array size
change: hardcoded label width/height uses conf.labelBoxWidth and conf.labelBoxHeight
change: Math.round() on many of the calculations to clean up bounds values
change: getTextObj anchor, width, height start as undefined
2020-06-22 16:59:07 -04:00
Chris Moran
18254392ab
Merge branch 'mermaid-js-develop' into develop
2020-06-19 13:32:23 -04:00
Knut Sveidqvist
b3f9bbe50f
Merge branch 'develop' into 1474_missplaced_transitions
2020-06-19 11:38:30 +02:00
Knut Sveidqvist
e37c7e58cf
Merge pull request #1479 from chewnoill/chewy/cleanup-after-failed-render
...
cleanup helper dom elements before rendering
2020-06-19 11:29:46 +02:00
Knut Sveidqvist
feb9ffadec
Diagram showing sequence diagram with cut long message text
2020-06-19 11:03:37 +02:00
Knut Sveidqvist
a4d96b032e
Diagram showing sequence diagram with long message text
2020-06-19 11:01:54 +02:00
Knut Sveidqvist
038d70a40b
Diagram showing sequence diagram with long message text
2020-06-19 10:57:16 +02:00
Knut Sveidqvist
44d5009538
Revert of PR #1482
2020-06-19 10:52:20 +02:00
Chris Moran
e64a65c41e
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
Updated/corrected sequenceDiagram.spec to set the config using mermaidAPI
Enabled freeze on mermaidAPI to protect defaultConfig
2020-06-18 08:10:50 -04:00
Chris Moran
67c2fe8005
Refactored rendering sequence diagrams
...
Fixed default config clobbering issues
2020-06-17 18:13:37 -04:00
will cohen
d3d15b79fb
cleanup helper dom elements before rendering
2020-06-17 17:54:01 -04:00
Knut Sveidqvist
c95257f32c
#1474 Adding some tests
2020-06-17 18:28:49 +02:00
Knut Sveidqvist
f0162557c5
#1474 Handling transitions
2020-06-17 18:16:24 +02:00
Chris Moran
5f257119d6
Merge branch 'develop' into refactor-sequences
...
# 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
# src/config.js
# src/mermaidAPI.js
2020-06-17 06:12:02 -04:00
Chris Moran
3c72d28511
Refactored rendering sequence diagrams
2020-06-17 05:54:24 -04:00
Knut Sveidqvist
a251029546
#§473 Font update for e2e tests
2020-06-15 22:42:33 +02:00
Knut Sveidqvist
b5d457daa9
Testcommit
2020-06-15 22:26:11 +02:00
Knut Sveidqvist
603f2a2154
1473 Using setConfig instead of initialize from mermaid in some cases
2020-06-15 21:55:20 +02:00
Knut Sveidqvist
bd0210cdce
1473 Updated config handling
2020-06-15 01:11:56 +02:00
Knut Sveidqvist
5677523800
1473 Setting default config
2020-06-14 23:37:08 +02:00
Knut Sveidqvist
2150933368
Setting default config
2020-06-14 22:50:45 +02:00
Knut Sveidqvist
6559cfd0e1
#1466 Handling line styles using the new rendering engine
2020-06-13 13:12:33 +02:00
Justin Greywolf
0495103635
Fix regex and Fix incorrect test
2020-06-08 19:21:33 -07:00
Knut Sveidqvist
85a8feec9d
Also fix for error handling when setting mermaid.parseError
2020-06-06 12:42:35 +02:00
Knut Sveidqvist
b76e833ea5
#1436 Correcting intersection calculations for circles
2020-05-30 18:04:46 +02:00
Knut Sveidqvist
3bdb9f289f
Merge branch 'master' into develop
2020-05-30 17:11:23 +02:00
Knut Sveidqvist
8958b2aa1b
Merge pull request #1432 from mermaid-js/1418_html_labels_rendering_engine
...
1418 html labels rendering engine
2020-05-27 22:34:26 +02:00
Knut Sveidqvist
8603cf89b0
#1418 Fix for descriptions in states
2020-05-27 22:18:59 +02:00
Knut Sveidqvist
4ea6c98f43
#1418 Adding support for htmlLabels in stateDiagram (v2)
2020-05-27 20:41:59 +02:00
Knut Sveidqvist
39bdf261c6
2020-05-27 19:38:30 +02:00
Adrian Hall
f1c05bc909
Ensure empty quoted relationship labels are accepted in ER diagrams
2020-05-23 13:33:44 +01:00
Knut Sveidqvist
9da027cf74
Fix for intersect issues for start/end state
2020-05-17 09:34:56 +02:00
Knut Sveidqvist
c21b61bbd2
Bug fixes in new functionality, intersections not taken into account in nodes used by new graph engine. Graph flowchart not usable when integrating using mermaid.core. Incorrect flwochart docs
2020-05-16 19:58:22 +02:00
Knut Sveidqvist
9a3ec31191
#1386 Adding support for click events and links
2020-05-06 18:51:12 +02:00
Knut Sveidqvist
a20e6086cc
#1386 Adding subroutine support for new rendering engine
2020-05-03 21:52:44 +02:00
Knut Sveidqvist
67aed51742
#1382 Fix for lost parentage for nodes in deep structure
2020-05-01 19:18:07 +02:00
Russell Geraghty
950af2e753
Tidy up documentation, correct rendering in test
2020-04-28 08:28:16 +01:00
Knut Sveidqvist
fa612b731c
Renaming some tests to diffrentiate the old implementation from the impl via the new rendering engine
2020-04-26 17:48:07 +02:00
Knut Sveidqvist
3aa5fc0cc2
Merge pull request #1365 from dany74q/feature/sequence-diagrams-improvements
...
Feature/sequence diagrams improvements
2020-04-26 17:21:55 +02:00
Knut Sveidqvist
397f57accb
Merge pull request #1334 from russellgeraghty/feature/user-journey
...
Feature/user journey
2020-04-26 17:17:33 +02:00
Knut Sveidqvist
507582f40b
#1295 Bugfix for descriptions
2020-04-26 16:01:17 +02:00
Knut Sveidqvist
fd37edc53f
#1295 Adding support for forks and joins
2020-04-26 10:07:25 +02:00
Knut Sveidqvist
5662c06a33
#1295 Adding support for multiline descriptions for states
2020-04-26 09:47:47 +02:00
Knut Sveidqvist
0aede618ec
#1295 Adding support for multiline descriptions for states
2020-04-25 17:01:20 +02:00
Knut Sveidqvist
25ea221a6a
#1295 Rendering tests for stateDiagram v2
2020-04-25 14:11:05 +02:00
Danny Shemesh
862f20ef20
Added cypress e2e tests for suggested improvements
...
This commits adds e2e tests for the suggested improvements.
I've went over the generated screenshots and they look good to me.
2020-04-23 18:31:22 +03:00
Knut Sveidqvist
59f3d2a11e
#1295 Fix for edges in subgraphs and handling of concurrent states in statediagram-v2
2020-04-22 20:03:41 +02:00
Russell Geraghty
249a14f84a
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-17 07:30:53 +01:00
Knut Sveidqvist
c3f2e8dde1
#1295 Render fix for flowchart, correct marker handling and some cleanup
2020-04-16 19:44:11 +02:00
Russell Geraghty
433f88b459
Merge remote-tracking branch 'upstream/develop' into feature/user-journey
2020-04-13 20:08:20 +01:00
Knut Sveidqvist
704d56d193
#1295 Updates mermaid-graphlib
2020-04-13 16:25:10 +02:00
Knut Sveidqvist
5f4da6e0bc
Merge branch 'develop' into feature/1295_generic_rendering_engine
2020-04-11 18:53:47 +02:00
Knut Sveidqvist
22e17172dd
#1295 Recursive rendering, draft
2020-04-11 17:16:01 +02:00
Knut Sveidqvist
6ec731e263
Merge pull request #1345 from GDFaber/feature/1343_add_flowchart_subroutine_shape
...
Add flowchart subroutine node shape
2020-04-11 14:12:20 +02:00
Knut Sveidqvist
7cd8b6f938
Merge pull request #1336 from GDFaber/feature/1290_hide_or_style_gantt_today_marker
...
#1290 Hide/style today marker in gantt diagram
2020-04-11 14:04:31 +02:00
Knut Sveidqvist
8455db6fae
#1295 Moving graph operations into mermaid-graplib and adding tests
2020-04-10 07:27:04 +02:00
Marc Faber
7f67435cb9
#1343 Add flowchart subroutine node shape
2020-04-10 00:14:41 +02:00
Marc Faber
dcfa903176
#1290 Hide/style today marker in gantt diagram
2020-04-05 01:59:18 +02:00
Marc Faber
fc70a8e145
#1271 Fix autonumber positioning in sequence diagrams with multiline texts
2020-04-04 21:53:31 +02:00