8f733c6b01
Merge branch 'master' into develop
...
* master:
fix broken link
add latest blog post
fix linting
fix: set proper shiki theme for light and dark modes
fix: change shiki theme to github-light
add latest blog post
add latest blog post
2023-11-24 09:46:21 +05:30
78e118c876
fix : #5064 Handle case when line has only one point
2023-11-24 09:42:21 +05:30
9ae00ebcdb
reset the testTimeout to 5 seconds and change it directly in the test
2023-11-23 14:55:09 +02:00
997a3771f1
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-20 21:28:09 -03:00
d79671e04a
Resolve lint issue
2023-11-20 21:16:10 -03:00
a935380713
Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option
2023-11-20 21:07:24 -03:00
d61bfde167
Replace string concat with string templates
2023-11-20 21:06:38 -03:00
fc3018e977
Move subgraph title margin tests to independent file
2023-11-20 20:55:43 -03:00
63c2d36232
Rename file and update imports
2023-11-20 20:49:00 -03:00
c0a43f5d5a
Change getSubGraphTitleMargins to accept config object as parameter
2023-11-20 20:40:30 -03:00
ad6c76116d
Modify getSubGraphTitleMargins to use null coalescing operator
2023-11-20 19:13:34 -03:00
3ba0fee406
Update all patch dependencies
2023-11-20 09:56:45 +00:00
cbc97dacdf
fix broken link
2023-11-19 20:39:18 -08:00
8405454a1a
add latest blog post
2023-11-19 20:32:20 -08:00
a1c0761ef9
Update all minor dependencies
2023-11-20 01:43:47 +00:00
42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option
2023-11-17 21:41:27 -03:00
453c16d08e
Remove unnecessary code
2023-11-17 20:20:13 -03:00
c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit
2023-11-17 11:28:20 +05:30
aadf5339a4
Error Hash Removed
2023-11-17 09:51:03 +05:30
a47a9e400b
Merge branch 'develop' into refactor/unifyEdgeMarkers
2023-11-16 11:00:33 +05:30
52603d7acd
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
2023-11-14 16:26:19 +03:00
c56025ec3b
Merge pull request #5013 from SteffenLm/bug/5009_static_class_attribute_not_rendered
...
Fix - static class attributes are not rendered underlined
2023-11-14 09:44:35 +00:00
0c0f7a739e
Merge pull request #4934 from RounakJoshi09/bug/#3251_linkStyle-can't-specify-ids
...
bug/#3251_linkStyle-can't-specify-ids Fixed
2023-11-14 05:38:20 +00:00
5fdbf5d891
Merge pull request #5017 from ad1992/bug/4946-fix-svg-order-sequence-participant
...
fix: render the participants in same order as they are created
2023-11-14 05:29:35 +00:00
fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring
2023-11-13 23:14:42 +03:00
56c3809b57
Add logic to add subgraph title margin on layout
2023-11-12 17:32:58 -03:00
8b0a5be6d9
Include subgraph margin into label positioning
2023-11-11 18:18:51 -03:00
52ed38719f
Fix nesting of getSubGraphTitleMargins test.
2023-11-10 21:35:58 -03:00
0bcd5d28e8
Create helper function for subgraph title margin fetching.
2023-11-10 21:30:09 -03:00
b134766647
Add subgraph title margin config options to schema.
2023-11-10 21:22:31 -03:00
b12b8a9278
Merge pull request #4952 from ajdamico/patch-1
...
add links to make it easier
2023-11-09 23:46:24 +05:30
3c13386e5d
Update packages/mermaid/src/docs/community/questions-and-suggestions.md
2023-11-09 23:44:35 +05:30
a177141962
Merge pull request #5028 from mermaid-js/3952-lexical-ids
...
3952 lexical ids
2023-11-09 18:04:38 +00:00
0f2b941e2d
Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
...
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-11-09 08:05:09 -08:00
e8ad72a980
Merge branch 'develop' into 3952-lexical-ids
2023-11-09 07:03:40 -08:00
a8fe640546
update edge ids
2023-11-09 06:57:51 -08:00
01bbcc597a
draw top actors with lines first followed by messages
2023-11-09 17:52:00 +05:30
f47e920a97
Documentation: clarify sentence
2023-11-09 12:50:01 +01:00
1571b25d29
Merge pull request #4958 from csholmq/fix/tooltip
...
fix(tooltip): remove redundant scroll offset
2023-11-09 09:01:19 +00:00
4a92fc5c92
Fix lint
2023-11-09 14:20:06 +05:30
8d6317b49a
Merge branch 'develop' into pr/csholmq/4958
...
* develop: (21 commits)
Fix typo
fix typo
Add new Atlassian integrations
chore(deps): update all patch dependencies
chore: release v10.6.1
fix(flow): fix invalid ellipseText regex
review fixes
Update XYChart's nav link in the docs template
Update index.md
add comment for ts ignore
move decodeEntities to utils
review fixes
chore(deps): update all minor dependencies
chore: Point to correct changelog
add spec
fix: getMessageAPI so it considers entity codes
Update classDiagram.md
Chore: Typo fixed in multiple files
feat(gantt): update styles
docs(integrations): add Mermaid for Slack
...
2023-11-09 14:19:28 +05:30
ee49c4b660
Merge pull request #4933 from REVERB283/bug/4716_fix_target_blank_getting_sanitized
...
fix: target blank removed from anchor tag
2023-11-09 08:46:33 +00:00
72038a68a9
Fix typo
2023-11-09 14:06:58 +05:30
051260e9a8
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop
...
* 'develop' of https://github.com/mermaid-js/mermaid :
docs: fixed typo
2023-11-09 14:04:33 +05:30
3cf0a2b290
Merge pull request #4893 from 0xflotus/patch-1
...
docs: fixed typo
2023-11-09 14:04:17 +05:30
adfb60e045
fix typo
2023-11-09 14:03:38 +05:30
79bae62ce0
Merge pull request #4973 from SahilNagpure07/patch-1
...
docs: Update classDiagram.md
2023-11-09 13:57:36 +05:30
3038ce5864
Merge pull request #5021 from nashtechlabs/docs/patch-1
...
Add new Atlassian integrations
2023-11-09 13:56:19 +05:30
c8a826dfce
Merge pull request #5012 from StefonSimmons/patch-1
...
Update index.md
2023-11-09 13:51:27 +05:30
0075538431
fix linting
2023-11-09 13:49:42 +05:30
8db9700807
fix: set proper shiki theme for light and dark modes
2023-11-09 13:36:44 +05:30
1fa8de2771
fix: change shiki theme to github-light
2023-11-09 13:36:44 +05:30
09d9c31d53
chore: Reset mock in edgeMarker test
2023-11-09 11:36:45 +05:30
fadae38bec
Merge branch 'develop' into docs/patch-1
2023-11-09 05:34:57 +07:00
e46626d3ed
Merge branch 'develop' into refactor/unifyEdgeMarkers
...
* develop: (155 commits)
chore(deps): update all patch dependencies
chore: release v10.6.1
fix(flow): fix invalid ellipseText regex
review fixes
Update XYChart's nav link in the docs template
add comment for ts ignore
move decodeEntities to utils
review fixes
chore(deps): update all minor dependencies
chore: Point to correct changelog
add spec
fix: getMessageAPI so it considers entity codes
chore(deps): update all patch dependencies
Update integrations-community.md
docs: upate the list of tools with native support of mermaid
Fix typo in build-docs.yml
Updated mermaid version
Limiting the number of edges that are allowed in the flowchart
Update README.md
Update README.md
...
2023-11-09 02:39:54 +05:30
8f572021af
chore: Add test for invalid marker
2023-11-09 02:38:48 +05:30
4952b13ad0
fix: Ignore unknown arrow type values
...
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-09 02:37:38 +05:30
d1fba9c567
Merge pull request #4824 from JackuB/patch-1
...
Docs: add Mermaid for Slack integration
2023-11-08 20:58:40 +00:00
c2e26baf4d
Merge pull request #4930 from Mister-Hope/patch-2
...
feat(gantt): update styles
2023-11-08 20:42:53 +00:00
f6b1e049f1
Merge branch 'develop' into docs/patch-1
2023-11-08 15:56:22 +07:00
f487dcd57b
Merge commit 'b61ea4b8aa2f5d38ad6af828ed0620a589ec5786'
...
This fixes the link to xyChart in the docs on the `master` branch.
2023-11-08 08:42:05 +00:00
71478f5a64
Merge pull request #5014 from Abrifq/patch-2
...
Update XYChart's nav link in the docs template
2023-11-08 08:22:30 +00:00
c9ace33cf1
Add new Atlassian integrations
2023-11-08 14:39:06 +07:00
c117447bb3
add latest blog post
2023-11-07 00:54:32 -08:00
1f7aec7405
Merge branch 'master' into update-latest-news
2023-11-07 00:50:51 -08:00
6e74e91b5d
chore(deps): update all patch dependencies
2023-11-07 05:11:34 +00:00
eb4bd314b6
Merge pull request #5002 from ad1992/bug/4983-fix-getMessageAPI
...
fix: getMessageAPI so it considers entity codes
2023-11-07 05:04:53 +00:00
d1045ed644
Merge remote-tracking branch 'origin/release/10.6.1'
2023-11-06 14:29:58 +00:00
51d076a83b
Merge branch 'develop' into bug/4946-fix-svg-order-sequence-participant
2023-11-06 19:54:32 +05:30
65daab2aaf
chore: release v10.6.1
...
Fixes
=====
- Flowchart: Fix a freeze when using a `(` character in an ellipse node
2023-11-06 13:57:01 +00:00
dff8b783b8
fix
2023-11-06 19:02:10 +05:30
78c1a3d980
fix
2023-11-06 18:57:47 +05:30
23cbf50413
fix: render the participants in same order as they are created
2023-11-06 18:47:38 +05:30
7c7f3dd8be
Merge pull request #5016 from aloisklink/fix/4964-fix-invalid-ellipseText-regex
...
fix(flow): fix invalid ellipseText regex
2023-11-06 11:16:44 +00:00
172d90e731
fix(flow): fix invalid ellipseText regex
...
This invalid regex was causing Mermaid to freeze.
2023-11-06 10:08:12 +00:00
dff13439f6
review fixes
2023-11-06 12:17:43 +05:30
b61ea4b8aa
Update XYChart's nav link in the docs template
...
The site gives 404 with xychart but navigates correctly with xyChart
2023-11-05 22:35:36 +03:00
b5fd8fb7c1
fix text-decoration for abstract attibutes
2023-11-03 20:55:42 +01:00
4ba3e2cff3
Update index.md
...
fix typo
2023-11-03 15:51:33 -04:00
a818f3e3ae
add comment for ts ignore
2023-11-03 13:31:21 +05:30
58bad981be
move decodeEntities to utils
2023-11-03 13:25:26 +05:30
6a5b7c40bd
Merge branch 'develop' into bug/4983-fix-getMessageAPI
2023-11-03 13:18:38 +05:30
6e6e92a1d1
review fixes
2023-11-03 13:16:30 +05:30
99244ffae5
Merge branch 'master' into update-latest-news
2023-11-02 05:05:04 -07:00
0d4faef758
chore(deps): update all minor dependencies
2023-11-01 19:42:28 +00:00
0c5cf72235
chore: Point to correct changelog
2023-11-01 20:18:49 +05:30
57a9d7356c
GitGraph: made reroute fn more readable
...
Pre-commit lint hook had made the use of ternaries harder to read
than I'd originally intended so I introduced an additional
variable which explains what is being checked and keeps ternaries
from becoming obscured.
2023-10-31 17:24:13 +00:00
a9c5d903c5
GitGraph: simplified branch check in arrow rerouting fn
...
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
2023-10-31 17:24:13 +00:00
bf52e76a39
GitGraph: Moved branch curve check to within reroute check fn
...
Based on review by @nirname. I had originally been trying
to minimise number of new arguments being passed to
rerouting check but as the branch curve check is not used
elsewhere and is part of the same rerouting check it makes
sense for them to be together.
Position information now passed to rerouting fn instead.
2023-10-31 17:24:13 +00:00
31a8e040fa
GitGraph: corrected minor typo in comment.
2023-10-31 17:24:13 +00:00
0555368e1c
GitGraph: added branch checking to rerouting
...
Hypothesised that working out which branch needed checking for
overlapping commits might be missing, so added that as a
nested ternary and passed result as new argument to rerouting
check.
If commits are found on the branch which will be getting the
curve (whichever branch is lower or more to the right of main
than the other, for now), then the arrow will be rerouted.
I may refactor in a follow-up commit and I think there's scope
to simplify the logic but this is a test for now.
2023-10-31 17:24:13 +00:00
3e18e76d31
GitGraph: removed check of branch with main from arrow reroute fn
...
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.
This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
2023-10-31 17:24:13 +00:00
7c87df7cf6
GitGraph: rename overlap check to shouldRerouteArrow
...
The function also now does an additional check to see
if source branch in overlap check is on main.
As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
2023-10-31 17:24:13 +00:00
dba7197fc6
GitGraph: simplified overlapping check fn
2023-10-31 17:24:13 +00:00
461a293d71
GitGraph: refactored overlapping fn for efficiency/performance
...
On previous rewrite, I had created new functions within the
overlapping functions but these were being recreated on each
iteration of Object.some(). I moved them outside this for
clarity and so they're not recreated each iteration.
2023-10-31 17:24:13 +00:00
9f8457d249
GitGraph: Rewrote overlap fn to make main branch exception to rule.
2023-10-31 17:24:13 +00:00
8c43d2273f
GitGraph: added destination branch check into overlapping fn.
2023-10-31 17:24:13 +00:00
9469f759a9
GitGraph: Moved overlapping commit arrow colour inside conditional
2023-10-31 17:24:13 +00:00
4787bb07df
GitGraph: corrected object method in hasOverlappingCommits
2023-10-31 17:24:13 +00:00
33050e1812
GitGraph: Update variable names in drawArrow fn
2023-10-31 17:24:13 +00:00
Sidharth Vinod