9317 Commits

Author SHA1 Message Date
Sidharth Vinod
6a1a38b395
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-19 22:18:14 +05:30
Sidharth Vinod
d0224b23b0
Cleanup e2e.yml 2024-01-19 19:47:42 +05:30
Sidharth Vinod
6334516639
Merge branch 'combineImages' into develop
* combineImages:
  Ignore push events on merge queue
2024-01-19 19:47:12 +05:30
Sidharth Vinod
aadf32ab3e
Ignore push events on merge queue 2024-01-19 19:45:55 +05:30
Sidharth Vinod
6424f823b2
Merge pull request #5213 from mermaid-js/combineImages
Optimise caching of test results
2024-01-19 14:09:03 +00:00
Sidharth Vinod
8bfb269b37
Remove :: 2024-01-19 19:33:59 +05:30
Sidharth Vinod
3935f6b389
Remove :: 2024-01-19 19:31:25 +05:30
Sidharth Vinod
f5dd24bce4
Remove :: 2024-01-19 19:29:45 +05:30
Sidharth Vinod
279e31bc55
Debug 2024-01-19 19:23:13 +05:30
Sidharth Vinod
f1fc874da8
Debug 2024-01-19 19:20:39 +05:30
Sidharth Vinod
a871a68f3c
Remove spec selector 2024-01-19 19:05:06 +05:30
Sidharth Vinod
a964af67ec
Handle edge cases in E2E 2024-01-19 19:04:25 +05:30
Sidharth Vinod
6f205f89b2
Always run combineArtifacts 2024-01-19 16:58:19 +05:30
Sidharth Vinod
35b3192c2b
Fix error message 2024-01-19 16:58:19 +05:30
Sidharth Vinod
be4721b24d
Fix cache save 2024-01-19 16:58:19 +05:30
Sidharth Vinod
a9a8a208a6
Update cache key 2024-01-19 16:58:19 +05:30
Sidharth Vinod
f58a86d747
Notify users 2024-01-19 16:58:19 +05:30
Sidharth Vinod
4ce5d07125
Flatten uploaded images 2024-01-19 16:58:18 +05:30
Sidharth Vinod
658af081ee
Flatten uploaded images 2024-01-19 14:42:51 +05:30
Sidharth Vinod
cb0ee5aa41
Use pixelmatch for image comparison 2024-01-19 13:17:14 +05:30
Sidharth Vinod
97f9919250
Merge pull request #5210 from sidharthv96/sidv/e2e
E2E test
2024-01-19 12:24:41 +05:30
Sidharth Vinod
d6e738ac4c
Run all tests 2024-01-19 12:21:51 +05:30
Sidharth Vinod
91a63933ec
Merge branch 'develop' into sidv/e2e
* develop:
  Fix lint
2024-01-19 12:17:45 +05:30
Sidharth Vinod
448756ab54
Fix lint 2024-01-19 12:17:20 +05:30
Sidharth Vinod
7805e05495
Update lockfile 2024-01-19 12:15:01 +05:30
Sidharth Vinod
98782d3a1f
Merge branch 'develop' into sidv/e2e 2024-01-19 12:11:45 +05:30
Sidharth Vinod
76dacf8e90
E2E test 2024-01-19 12:10:39 +05:30
Sidharth Vinod
681d3c3ed8
Merge pull request #5208 from sidharthv96/sidv/e2e
E2E Image comparison
2024-01-19 12:10:14 +05:30
Sidharth Vinod
d2c82c1802
Use cache to store snapshots 2024-01-19 12:06:53 +05:30
rowanfr
ff5240c0bc
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-01-18 22:37:43 -06:00
Sidharth Vinod
8754b9dd5d
Merge pull request #5150 from mermaid-js/renovate/patch-all-patch
chore(deps): update all patch dependencies (patch)
2024-01-18 17:03:11 +00:00
renovate[bot]
fb7cd9ca40
chore(deps): update all patch dependencies 2024-01-18 16:17:34 +00:00
Sidharth Vinod
858d512766
Merge pull request #5200 from mermaid-js/dependabot/npm_and_yarn/follow-redirects-1.15.5
build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5
2024-01-18 16:10:27 +00:00
Sidharth Vinod
781065dee4
Merge pull request #5205 from mathbraga/revert-5197-revert-5041-feature/4935_subgraph-title-margin-config-option
Revert "Revert 5041 feature/4935 subgraph title margin config option"
2024-01-18 16:10:05 +00:00
Sidharth Vinod
2525966853
Merge pull request #5132 from nirname/docs/2910_update-contributing-guidelines
Contribution documentation improvements
2024-01-18 15:59:47 +00: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 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
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 v10.7.0 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