Commit Graph

2805 Commits

Author SHA1 Message Date
rowanfr
ae29dd124c Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-03-06 12:06:06 -06:00
Sidharth Vinod
7fec51f322 chore: Remove unused imports in block 2024-03-06 14:18:27 +05:30
Sidharth Vinod
1659ace65d Fix spelling 2024-03-06 14:16:32 +05:30
Sidharth Vinod
3340608689 Merge branch 'develop' into next
* develop:
  Update docs
  chore(deps): update all patch dependencies
2024-03-06 14:05:16 +05:30
rowanfr
5ccdb6f213 Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-03-05 16:38:24 -06:00
Sidharth Vinod
5b3f320e5d Merge branch 'develop' into renovate/patch-all-patch 2024-03-05 21:30:12 +05:30
Sidharth Vinod
a43cd55c53 Merge branch 'develop' into next
* develop:
  Lychee ignore chrome webstore
  Update link
  build(docs): vendor CSS dependencies
  chore(deps): update all minor dependencies
  Ran lint:fix
  Fix chrome webstore url causing 404
2024-03-05 21:07:26 +05:30
Sidharth Vinod
803e068630 Merge branch 'master' into develop
* master:
  Update link
2024-03-05 21:06:21 +05:30
Sidharth Vinod
231534a0db Update link 2024-03-05 21:03:21 +05:30
renovate[bot]
2c6d1cb1ce chore(deps): update all patch dependencies 2024-03-05 15:32:30 +00:00
Alois Klink
fe905cedd3 Merge branch 'develop' into pull/5350 2024-03-05 14:13:01 +00:00
Max Stanley
d8b878414b build(docs): vendor CSS dependencies 2024-03-05 14:03:53 +00:00
Arda Aydın
2537bf5310 Ran lint:fix
Wait, it complained about a table in markdown?
Why??
2024-03-02 18:41:14 +00:00
Arda Aydın
f4dffc8cdf Fix chrome webstore url causing 404
now it's "Too many redirects" like all of it's brethren 🙂
2024-03-02 21:17:28 +03:00
Sidharth Vinod
171a2019ec Merge branch 'next' into pr/Yokozuna59/5345
* next: (100 commits)
  Resolves E2E testing issues and issue #5343
  Fix spelling
  Fix community integrations
  Fix docs
  docs: Fix config
  Update all minor dependencies
  Amend docs to document gitgraph parallel commits
  Fix lint
  Use Yarn Add COREPACK_ENABLE_STRICT
  Added link to Blazorade Mermaid to the community integrations page.
  Bump node version
  Add lcov to cspell
  Correcting path to docker-entrypoint.sh
  Update recommended Vitest extension
  Replace mermaid-js.github.io links
  Replace links to docs with links to webhelp
  Link to contributing page on webhelp
  Changes to timeline.md 1. Added colons to all 'NOTES' for consistency.
  Changes to timeline.md 1. Updates the Wikipedia citation to include a link. 2. Removed periods from documentation sections to be consistent (some had periods, some didn't) 3. Added a space to a coding example for spacing consistency.
  Replace version number placeholder
  ...
2024-03-01 12:22:14 +05:30
Sidharth Vinod
5807d521b7 Merge branch 'develop' into next
* develop: (99 commits)
  Fix spelling
  Fix community integrations
  Fix docs
  docs: Fix config
  Update all minor dependencies
  Amend docs to document gitgraph parallel commits
  Fix lint
  Use Yarn Add COREPACK_ENABLE_STRICT
  Added link to Blazorade Mermaid to the community integrations page.
  Bump node version
  Add lcov to cspell
  Correcting path to docker-entrypoint.sh
  Update recommended Vitest extension
  Replace mermaid-js.github.io links
  Replace links to docs with links to webhelp
  Link to contributing page on webhelp
  Changes to timeline.md 1. Added colons to all 'NOTES' for consistency.
  Changes to timeline.md 1. Updates the Wikipedia citation to include a link. 2. Removed periods from documentation sections to be consistent (some had periods, some didn't) 3. Added a space to a coding example for spacing consistency.
  Replace version number placeholder
  Fix link to Contributors section in README
  ...
2024-03-01 12:18:25 +05:30
Reda Al Sulais
2b2bbe35d0 build(deps): update langium to v3 and apply the required changes 2024-02-29 20:38:15 +03:00
rowanfr
0cb365cf31 Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-02-29 05:45:16 -06:00
Sidharth Vinod
1857eb1dae Merge pull request #5152 from macherel/git-graph-merge-commit
Fix color and arrow for merge commit (gitGraph)
2024-02-29 08:29:23 +05:30
Sidharth Vinod
619f097f1a Merge branch 'develop' into git-graph-merge-commit 2024-02-29 07:57:09 +05:30
Sidharth Vinod
5fe9f9ed57 Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-02-29 07:55:16 +05:30
rowanfr
3602191f69 Added E2E testing for spacing
This adds E2E testing for spacing and provides more appropriate comments for the changes made to `index.js`
2024-02-28 17:12:20 -06:00
rowanfr
5935e277e6 Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph 2024-02-28 14:01:43 -06:00
rowanfr
0ce33cb160 Update packages/mermaid/src/dagre-wrapper/index.js
The code setting the `ranksep` and `nodesep` to subgraphs was made cleaner and more legible while maintaining the intended functionality of subgraph spacing

Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-02-28 13:55:21 -06:00
Sidharth Vinod
a9e67e4266 Fix spelling 2024-02-27 15:33:28 +05:30
Sidharth Vinod
0215e0173f Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-02-27 15:31:32 +05:30
Sidharth Vinod
31a287b7b0 Merge pull request #5301 from mermaid-js/renovate/all-minor
chore(deps): update all minor dependencies (minor)
2024-02-27 10:00:50 +00:00
Sidharth Vinod
e59f290546 Fix community integrations 2024-02-27 15:44:59 +05:30
Sidharth Vinod
9377d054a0 Merge branch 'pr/MikaBerglund/5333' into develop
* pr/MikaBerglund/5333:
  Fix docs
2024-02-27 15:43:55 +05:30
Sidharth Vinod
10bb9202a7 Merge pull request #5333 from Blazorade/docs/blazorade
Added link to Blazorade Mermaid to the community integrations page.
2024-02-27 15:43:21 +05:30
Sidharth Vinod
2c59ceb005 Fix docs 2024-02-27 15:41:58 +05:30
Sidharth Vinod
adf0ae5474 Merge branch 'develop' into pr/MikaBerglund/5333
* develop:
  Fix lint
  Use Yarn Add COREPACK_ENABLE_STRICT
  Updated chrome extension url's to new store
  add name only when present in rectData
  make name optional
  feat: add name field to the actors
  Changes to intro.md 1. Removed the Slack link 2. Updated the Discord invite link
  Changes to intro.md 1. Removed the Slack invite and left only the Discord invite
  Changes to intro.md 1. Added a link to the Discord server
  Updated contributions file
  #3358 Layoutfix for growing parent when children spans new rows due to updated columns widths
  Update docs
  Mermaid version 10.8.0
2024-02-27 15:41:29 +05:30
Sidharth Vinod
af93b72ec5 Merge pull request #5336 from NicolasCwy/chore/5324-add-docs-gitgraph-parallel-commits
Add gitgraph parallel commits to docs
2024-02-27 15:30:32 +05:30
Sidharth Vinod
370cd98d23 docs: Fix config 2024-02-27 15:29:41 +05:30
renovate[bot]
c842401aaa Update all minor dependencies 2024-02-27 07:22:07 +00:00
Sidharth Vinod
d163ca7e1b Merge pull request #5297 from Abrifq/patch-5
[Docs] Updated chrome extension url's to new store
2024-02-27 12:49:56 +05:30
Nicolas Chang
cbb715a44d Amend docs to document gitgraph parallel commits 2024-02-27 15:06:38 +08:00
Sidharth Vinod
af3d728a72 Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-02-27 12:35:38 +05:30
Sidharth Vinod
3093afe63e Merge pull request #5284 from ad1992/aakansha/actor-name
feat: add name field to the actors
2024-02-27 06:23:45 +00:00
Sidharth Vinod
197d808e33 Merge branch 'develop' into patch-5 2024-02-27 11:44:57 +05:30
Sidharth Vinod
9f8c87a1d8 Merge branch 'master' into develop
* master:
  Changes to intro.md 1. Removed the Slack link 2. Updated the Discord invite link
  Changes to intro.md 1. Removed the Slack invite and left only the Discord invite
  Changes to intro.md 1. Added a link to the Discord server
  Updated contributions file
  Update docs
  Mermaid version 10.8.0
2024-02-27 11:43:00 +05:30
Mika Berglund
00bd208f18 Added link to Blazorade Mermaid to the community integrations page. 2024-02-27 00:15:56 +02:00
Sidharth Vinod
d4ff5f5c27 Merge pull request #5315 from FutzMonitor/updateTimelineMD
Updates Timeline Documentation
2024-02-26 21:22:13 +05:30
futzmonitor
15b3647514 Changes to timeline.md
1. Added colons to all 'NOTES' for consistency.
2024-02-25 11:38:11 -05:00
futzmonitor
6d58c7504d Changes to timeline.md
1. Updates the Wikipedia citation to include a link.
2. Removed periods from documentation sections to be consistent (some had periods, some didn't)
3. Added a space to a coding example for spacing consistency.
2024-02-25 11:33:01 -05:00
Michael Baumgartner
81491f2e34 Merge branch 'develop' into docs/replaceVersionPlaceholder 2024-02-20 19:33:28 +01:00
Michael Baumgartner
77f76f52b5 Replace version number placeholder
The header of the section contains the version number for the feature,
so the warning box should contain the same version
2024-02-20 19:23:30 +01:00
Sidharth Vinod
70c8a3dde8 Merge pull request #5287 from BoDonkey/docs/add-apostrophecms-integration
Add new extension to integrations
2024-02-19 03:55:37 +00:00
Abrifq
53599817a9 Updated chrome extension url's to new store 2024-02-17 20:13:38 +03:00
Bruno Macherel
4336b91dbd Fix color and arrow for merge commit 2024-02-16 17:12:39 +01:00