2303 Commits

Author SHA1 Message Date
Sidharth Vinod
65ee65b3ec
Merge pull request #4915 from Patronud/develop
prevent-inherited-lineheights-on-edgeterminal-4083
2023-11-25 10:33:46 +05:30
Yuta Nakamura
1ff7218558 fix: flowchart image without text 2023-11-24 21:35:50 +09:00
Sidharth Vinod
bffbf87cb3
Version for rc release 2023-11-24 14:08:56 +05:30
Sidharth Vinod
63890cc2fd
Version for rc release 2023-11-24 14:07:52 +05:30
Sidharth Vinod
9ade49b39c
Version for rc release 2023-11-24 14:02:55 +05:30
Sidharth Vinod
b5ba09500f
Merge branch 'develop' into refactor/unifyEdgeMarkers 2023-11-24 11:14:00 +05:30
Sidharth Vinod
7b0f6c1c74
fix Types 2023-11-24 10:44:18 +05:30
Sidharth Vinod
c0fcf4f3b1
Merge branch 'develop' into 5064_EdgeOffsetEdgeCase
* develop:
  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 10:26:32 +05:30
Sidharth Vinod
55ce05fc75
chore: Add tests for calculateDeltaAndAngle 2023-11-24 10:25:50 +05:30
Sidharth Vinod
94c3d7fb60
Merge branch 'next' into sidv/splitELK
* next: (39 commits)
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:55:31 +05:30
Sidharth Vinod
a2db4a464a
Merge branch 'develop' into next
* develop: (39 commits)
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:54:02 +05:30
Sidharth Vinod
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
Sidharth Vinod
78e118c876
fix: #5064 Handle case when line has only one point 2023-11-24 09:42:21 +05:30
Sidharth Vinod
5b7ba838f1
Merge branch 'sidv/splitELK' of https://github.com/mermaid-js/mermaid into sidv/splitELK
* 'sidv/splitELK' of https://github.com/mermaid-js/mermaid:
  5043 Allow registered diagrams to be overridden.
2023-11-23 22:15:08 +05:30
Sidharth Vinod
ac99eb59d2
Cleanup package.json
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-23 22:15:04 +05:30
Omer Priel
9ae00ebcdb reset the testTimeout to 5 seconds and change it directly in the test 2023-11-23 14:55:09 +02:00
Matheus Braga
997a3771f1
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-20 21:28:09 -03:00
Matheus B
d79671e04a Resolve lint issue 2023-11-20 21:16:10 -03:00
Matheus B
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
Matheus B
d61bfde167 Replace string concat with string templates 2023-11-20 21:06:38 -03:00
Matheus B
fc3018e977 Move subgraph title margin tests to independent file 2023-11-20 20:55:43 -03:00
Matheus B
63c2d36232 Rename file and update imports 2023-11-20 20:49:00 -03:00
Matheus B
c0a43f5d5a Change getSubGraphTitleMargins to accept config object as parameter 2023-11-20 20:40:30 -03:00
Matheus B
ad6c76116d Modify getSubGraphTitleMargins to use null coalescing operator 2023-11-20 19:13:34 -03:00
renovate[bot]
3ba0fee406
Update all patch dependencies 2023-11-20 09:56:45 +00:00
Steph
cbc97dacdf fix broken link 2023-11-19 20:39:18 -08:00
Steph
8405454a1a add latest blog post 2023-11-19 20:32:20 -08:00
renovate[bot]
a1c0761ef9
Update all minor dependencies 2023-11-20 01:43:47 +00:00
Sidharth Vinod
38b3a2080b
5043 Allow registered diagrams to be overridden. 2023-11-20 00:29:13 +05:30
Sidharth Vinod
0fec0ef624
5043 Move ELK to standalone package 2023-11-19 00:44:44 +05:30
Matheus Braga
42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-17 21:41:27 -03:00
Matheus B
453c16d08e Remove unnecessary code 2023-11-17 20:20:13 -03:00
RounakJoshi09
c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-11-17 11:28:20 +05:30
RounakJoshi09
aadf5339a4 Error Hash Removed 2023-11-17 09:51:03 +05:30
Sidharth Vinod
a47a9e400b
Merge branch 'develop' into refactor/unifyEdgeMarkers 2023-11-16 11:00:33 +05:30
Sidharth Vinod
510549f365
Merge branch 'develop' into next
* develop:
  fix text-decoration for abstract attibutes
  ci(pr-labeler): add required `template` option
  ci(pr-labeler): replace TimonVS/pr-labeler-action
  style(pr-labeler): format .github/pr-labeler.yml
  docs(ci/pr-labeler): warn about security issues
  ci(release-draft): handle new release-drafter name
  ci(release-drafter): remove unused `branch` config
  ci(pr-labeler): limit GITHUB_TOKEN permissions
  ci(release-draft): limit GITHUB_TOKEN permissions
2023-11-15 09:10:13 +05:30
Nikolay Rozhkov
52603d7acd
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-14 16:26:19 +03:00
Alois Klink
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
Sidharth Vinod
6ce543e118
Merge branch 'develop' into next
* develop: (126 commits)
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:20:27 +05:30
Sidharth Vinod
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
Sidharth Vinod
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
Nikolay Rozhkov
fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-13 23:14:42 +03:00
Matheus B
56c3809b57 Add logic to add subgraph title margin on layout 2023-11-12 17:32:58 -03:00
Matheus B
8b0a5be6d9 Include subgraph margin into label positioning 2023-11-11 18:18:51 -03:00
Matheus B
52ed38719f Fix nesting of getSubGraphTitleMargins test. 2023-11-10 21:35:58 -03:00
Matheus B
0bcd5d28e8 Create helper function for subgraph title margin fetching. 2023-11-10 21:30:09 -03:00
Matheus B
b134766647 Add subgraph title margin config options to schema. 2023-11-10 21:22:31 -03:00
Sidharth Vinod
b12b8a9278
Merge pull request #4952 from ajdamico/patch-1
add links to make it easier
2023-11-09 23:46:24 +05:30
Sidharth Vinod
3c13386e5d
Update packages/mermaid/src/docs/community/questions-and-suggestions.md 2023-11-09 23:44:35 +05:30
Sidharth Vinod
a177141962
Merge pull request #5028 from mermaid-js/3952-lexical-ids
3952 lexical ids
2023-11-09 18:04:38 +00:00