Commit Graph

3503 Commits

Author SHA1 Message Date
Neil Cuzon 769a7b1384
Add files via upload 2021-05-02 22:53:02 -07:00
Neil Cuzon 149abf98cf
Delete Live-Editor-Choices.png 2021-05-02 22:52:52 -07:00
Neil Cuzon 92d70dfcf4
Update _sidebar.md 2021-05-02 01:55:27 -07:00
Knut Sveidqvist c56ccb3aa4
Merge pull request #2036 from mermaid-js/2035_grow_width_with_title
State diagrams - Growing composite state width with title
2021-05-02 10:20:38 +02:00
Knut Sveidqvist aa39dcc34f #2035 Growing composite state width with title 2021-05-02 08:44:28 +02:00
Knut Sveidqvist 9cce3faba5
Merge pull request #2034 from mermaid-js/2032_adding_choice_to_state_diagrams
#2032 Adding new statement to add choice shape in state diagrams
2021-05-01 18:51:13 +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 d3f8f03a7d
Merge pull request #2031 from mermaid-js/2029_option_to_configure_renderer
2029 option to configure renderer
2021-04-30 19:56:46 +02:00
Knut Sveidqvist 7a90970177
Merge pull request #2030 from mermaid-js/2026_fix_for_descriptions
2026 fix for descriptions
2021-04-30 19:56:31 +02:00
Knut Sveidqvist b20f8668be Fix for test 2021-04-30 19:34:25 +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 973369e7f1 Lint fix 2021-04-30 17:20:53 +02:00
Knut Sveidqvist 0185d75b05 Reversal of simple fix for grap directions flips 2021-04-30 17:18:50 +02:00
Knut Sveidqvist 3e40bec98d
Merge pull request #2027 from dominikmeyersap/patch-1
Update sequenceDiagram.md
2021-04-30 17:15:27 +02:00
Dominik Meyer f96ca5dd73
Update sequenceDiagram.md 2021-04-30 13:53:02 +02:00
Knut Sveidqvist 2240333df1 #2026 Fix for descriptions of composite states 2021-04-30 13:50:21 +02:00
Knut Sveidqvist fdac4bf2c9
Merge pull request #2025 from mermaid-js/fix_for_nested_subgraphs
Fixes for links to and from subgraphs and labels on multiple edges from the same node to the same destination
2021-04-30 10:59:25 +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 a3e7df0068
Merge pull request #2020 from sidharthv96/develop
Add code sample in Issue template
2021-04-30 10:06:15 +02:00
Knut Sveidqvist 4e6b9ec947 Removed debug code from label 2021-04-30 10:05:20 +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
Sidharth Vinod 9594c8d004
Add code sample in Issue template 2021-04-28 20:06:51 +05:30
Knut Sveidqvist 8a893e12f5
Merge pull request #2018 from mermaid-js/2017_std_req_diagrams
#2017 Standardization of requirement diagrams
2021-04-26 19:27:05 +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 8c57df1945
Merge pull request #1997 from Mister-Hope/develop
docs: update setup config
2021-04-25 11:07:02 +02:00
Knut Sveidqvist 6c927e8ec4
Merge pull request #1999 from bish0polis/patch-1
Update flowchart.md
2021-04-25 11:06:39 +02:00
Knut Sveidqvist 0e881faa87
Merge pull request #2006 from mermaid-js/dependabot/npm_and_yarn/develop/coveralls-3.1.0
Bump coveralls from 3.0.9 to 3.1.0
2021-04-25 11:06:14 +02:00
Knut Sveidqvist 6dbec06571
Merge pull request #2004 from mermaid-js/dependabot/github_actions/develop/andymckay/labeler-1.0.2
Bump andymckay/labeler from 1.0 to 1.0.2
2021-04-25 11:05:57 +02:00
Knut Sveidqvist 3306b01df9
Merge pull request #2005 from mermaid-js/dependabot/npm_and_yarn/develop/eslint-plugin-prettier-3.4.0
Bump eslint-plugin-prettier from 3.1.2 to 3.4.0
2021-04-25 11:05:39 +02:00
Knut Sveidqvist 598993e592
Merge pull request #2003 from mermaid-js/dependabot/github_actions/develop/Dunning-Kruger/lock-issues-v1.1
Bump Dunning-Kruger/lock-issues from v1 to v1.1
2021-04-25 11:05:24 +02:00
Knut Sveidqvist d03ef49a3c
Merge pull request #2002 from mermaid-js/dependabot/github_actions/develop/actions/upload-artifact-v2.2.3
Bump actions/upload-artifact from v1 to v2.2.3
2021-04-25 11:02:46 +02:00
Knut Sveidqvist ea108b7733
Merge pull request #2001 from mermaid-js/dependabot/github_actions/develop/actions/checkout-v2.3.4
Update actions/checkout requirement to v2.3.4
2021-04-25 11:02:33 +02:00
Knut Sveidqvist 60bbee9eaf
Merge pull request #2000 from mermaid-js/dependabot/github_actions/develop/actions/cache-v2.1.5
Bump actions/cache from v1 to v2.1.5
2021-04-25 11:02:19 +02:00
Knut Sveidqvist 1e316c75ea
Merge pull request #1988 from vaceletm/vaceletm-add-tuleap-integration
Add Tuleap in the integration list
2021-04-25 10:59:36 +02:00
Knut Sveidqvist 30c07c429c Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2021-04-25 10:59:05 +02:00
Knut Sveidqvist b69ad0a3d2 Fix for broken test 2021-04-25 10:59:01 +02:00
Knut Sveidqvist bad2c82669
Merge pull request #1993 from aniston/patch-1
dateFormat must not have ':'
2021-04-25 10:53:28 +02:00
Knut Sveidqvist 12efdbef01
Merge pull request #1992 from mermaid-js/dependabot/npm_and_yarn/ssri-6.0.2
Bump ssri from 6.0.1 to 6.0.2
2021-04-25 10:52:24 +02:00
Knut Sveidqvist cf6476c1fc
Merge branch 'develop' into vaceletm-add-tuleap-integration 2021-04-25 10:51:08 +02:00
Knut Sveidqvist f48cb65284
Merge pull request #1991 from SilvM/patch-1
Add joplin to integrations
2021-04-25 10:49:18 +02:00
Knut Sveidqvist 62b8f78937 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2021-04-25 10:48:39 +02:00
Knut Sveidqvist 1b66b3c3fb
Merge pull request #1982 from ahmadnassri/develop
fix: re-write id generator
2021-04-25 10:45:27 +02:00
dependabot[bot] 2075e42c6d
Bump coveralls from 3.0.9 to 3.1.0
Bumps [coveralls](https://github.com/nickmerwin/node-coveralls) from 3.0.9 to 3.1.0.
- [Release notes](https://github.com/nickmerwin/node-coveralls/releases)
- [Commits](https://github.com/nickmerwin/node-coveralls/compare/3.0.9...v3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-25 08:45:09 +00:00