Knut Sveidqvist
bbc7fe6163
#3358 Fix for width of composite blocks
2024-01-18 10:22:09 +01:00
rowanfr
3fad11e104
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-01-17 22:40:19 -06:00
Alois Klink
8788b49351
Merge pull request #5192 from murdoa/bug/5191_fix_gantt_chart_padding_docs
...
Updated gantt chart docs to show all config options
2024-01-17 18:55:03 +00:00
Matheus Braga
7a8a1315c0
Merge branch 'develop' into feature/5114_add_parallel_commit_config
2024-01-16 21:14:17 -03:00
Matheus B
9213afbacd
Add tests for gitgraphs with unconnected branches
2024-01-16 20:55:42 -03:00
Matheus B
c77a6e156c
Include logic for gitgraph with unconnected branches
2024-01-16 20:54:26 -03:00
Matheus B
02246f64d2
Include undefined on findClosestParent return types and update the function
2024-01-16 20:01:03 -03:00
Matheus B
bf1edd99f9
Remove unnecessary argument on findClosestParent call
2024-01-16 19:37:52 -03:00
Matheus B
6f09bc7dc7
Use already defined const instead of method call
2024-01-16 19:34:16 -03:00
Matheus B
96ac2369b6
Change string concatenation to template literal
2024-01-16 15:36:31 -03:00
Matheus Braga
8c7edebe93
Revert "Revert 5041 feature/4935 subgraph title margin config option"
2024-01-16 13:21:31 -03:00
Sidharth Vinod
aab7631a9f
Merge branch 'develop' into next
...
* develop: (62 commits)
Draft release on master
docs: Add release version
Revert "fix: render the participants in same order as they are created"
Revert "Feature/4935 subgraph title margin config option"
Fix typo
add inadvertent tracking removal
update announcement bar
Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
v10.7.0
10.6.2-rc.3
docs: Remove broken integration
chore: Minor cleanup of imperativeState
chore(deps): update all minor dependencies
adds corresponding change in docs/ecosystem
Adds Unison programming language to community integrations list
update verbiage
update verbiage
add jetbrains blog post
additional updates
Fixed parser/tests
...
2024-01-16 19:15:33 +05:30
ilyes-ced
38ee1724a8
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-01-16 10:06:08 +00:00
rowanfr
0c7e2e2364
Fixed linting error
2024-01-15 20:48:29 -06:00
rowanfr
f693084065
Fixed configuration override on subgraphs
...
There was an issue with overriding the subgraphs with the main graphs direction which this commit fixes. It only overrides `rankdir` on the `setGraph` function so that the subgraph preserves it's `rankdir`. There is likely a better way of doing this by modifying the initialization of subgraph configuration to match the main graph when it comes to other elements in the JSON object which composes the graph label.
As we modify the codebase this added line can be deprecated once we add more modular control to subgraphs such as allowing custom spacing or configurations for them. As `rankdir` is the only thing one can set with the `direction` keyword that is the only variable being overwritten for now.
2024-01-15 20:21:01 -06:00
rowanfr
a5ecc7a06d
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-01-15 16:40:08 -06:00
Nikolay Rozhkov
36fdff8378
Merge branch 'develop' into docs/2910_update-contributing-guidelines
2024-01-15 13:17:47 +03:00
dependabot[bot]
0e7e597384
build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.15.2 to 1.15.5.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.5 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-15 09:18:38 +00:00
Sidharth Vinod
dc857f804e
Draft release on master
2024-01-15 14:47:03 +05:30
Sidharth Vinod
0bd2340a33
Merge pull request #5188 from mermaid-js/release/10.7.0
...
Release/10.7.0
2024-01-15 14:34:14 +05:30
Sidharth Vinod
d972ddd932
docs: Add release version
2024-01-15 14:27:48 +05:30
Sidharth Vinod
54307bb0f4
Merge branch 'develop' of github.com:mermaid-js/mermaid into release/10.7.0
...
* 'develop' of github.com:mermaid-js/mermaid:
Revert "fix: render the participants in same order as they are created"
Revert "Feature/4935 subgraph title margin config option"
Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
2024-01-15 13:55:04 +05:30
Sidharth Vinod
b3fa9167a0
Merge branches 'master' and 'release/10.7.0' of github.com:mermaid-js/mermaid into release/10.7.0
...
* 'master' of github.com:mermaid-js/mermaid:
add inadvertent tracking removal
update announcement bar
* 'release/10.7.0' of github.com:mermaid-js/mermaid:
2024-01-15 13:39:25 +05:30
Sidharth Vinod
7508d9adc5
Merge pull request #5198 from mermaid-js/revert-5017-bug/4946-fix-svg-order-sequence-participant
...
Revert "fix: render the participants in same order as they are created"
2024-01-15 07:56:39 +00:00
Sidharth Vinod
d91b3ce857
Merge pull request #5197 from mermaid-js/revert-5041-feature/4935_subgraph-title-margin-config-option
...
Revert 5041 feature/4935 subgraph title margin config option
2024-01-15 07:52:49 +00:00
Sidharth Vinod
11542b3b5d
Revert "fix: render the participants in same order as they are created"
2024-01-15 13:22:00 +05:30
Sidharth Vinod
b46da49f85
Revert "Feature/4935 subgraph title margin config option"
2024-01-15 13:08:58 +05:30
Sidharth Vinod
0e105afbf9
Fix typo
2024-01-15 12:55:28 +05:30
rowanfr
565f1543c6
Update demos/flowchart.html
...
Co-authored-by: Nikolay Rozhkov <nironame@gmail.com>
2024-01-14 17:12:12 -06:00
Nikolay Rozhkov
bafb991a35
Run dev docs without npx
2024-01-14 01:07:37 +03:00
Nikolay Rozhkov
385bf328c2
Remove npx completely from run script
2024-01-14 01:05:47 +03:00
nirname
3290c38260
Update docs
2024-01-13 20:41:27 +00:00
Nikolay Rozhkov
621d6cbda1
Fix linters
2024-01-13 23:38:11 +03:00
ilyes-ced
0d8016d926
cypress tests
2024-01-13 12:30:41 +00:00
Nikolay Rozhkov
f6b321d769
Removed volta requirement, leave pnpm only
2024-01-13 15:19:36 +03:00
Abrifq
3fb6acbf8f
Fix pnpm-lock by resetting it, sorry!
2024-01-12 23:50:35 +03:00
Abrifq
cbeee51108
Merge branch 'develop' into patch-4
2024-01-12 23:42:18 +03:00
ilyes-ced
a599e33ec2
add: class names and class definitions|todo: tests
2024-01-12 20:41:25 +00:00
Alois Klink
5e61867c89
Merge pull request #5193 from mermaid-js/v3-announcement-bar
...
DOCS: update announcement bar
2024-01-12 16:20:32 +00:00
Steph
d6d465d207
add inadvertent tracking removal
2024-01-12 07:54:19 -08:00
steph
c96cc21692
update announcement bar
2024-01-11 22:42:09 -08:00
rowanfr
36c84b3fec
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-01-11 18:31:53 -06:00
ilyes-ced
9cca389031
fix:styles can be in random order and are optional
2024-01-11 23:27:48 +00:00
Nikolay Rozhkov
a3092fc174
Fixed dead link
2024-01-12 02:00:30 +03:00
Nikolay Rozhkov
26f6aec442
build
2024-01-12 01:57:13 +03:00
ilyes-ced
e965507470
Merge branch 'mermaid-js:develop' into feature/add-point-styling-quadrant-to-charts
2024-01-11 22:42:19 +00:00
Nikolay Rozhkov
21ecc28b40
Merge branch 'develop' into docs/2910_update-contributing-guidelines
2024-01-12 01:41:00 +03:00
nirname
374e788e81
Update docs
2024-01-11 22:35:39 +00:00
Nikolay Rozhkov
7219d604a9
Updated contributing docs after review, minor fixes
2024-01-12 01:32:07 +03:00
murdoa
e52fcd0bdd
Updated gantt chart docs to show all config options
2024-01-11 22:24:50 +00:00
