Commit Graph

2822 Commits

Author SHA1 Message Date
Sidharth Vinod 077b1a5d8a
Merge branch 'develop' into release/10.9.0
* develop:
  Fix community integrations
  Fix docs
  docs: Fix config
  Amend docs to document gitgraph parallel commits
  Added link to Blazorade Mermaid to the community integrations page.
2024-02-27 15:46:22 +05:30
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 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 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
Sidharth Vinod 31686802b3
Bump version 2024-02-27 13:21:49 +05:30
Sidharth Vinod b96eaed6f4
Fix store link 2024-02-27 12:54:56 +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
Robert Means eaffe334c4 Fix CMS order 2024-02-16 05:28:29 -05:00
Robert Means 551ccfc8ce Add new extension to integrations 2024-02-15 14:20:32 -05:00
Jason Dent 36f056fd92
Update packages/mermaid/src/diagrams/sankey/parser/sankey.jison
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-02-15 16:58:06 +01:00
Jason Dent c3060548cf Update comment to link to replacement function. 2024-02-15 09:22:50 +01:00
Jason Dent 4a7489a7b6 chore: Update cspell and fix issues
- covert `cSpell.json` to `cspell.config.yaml`
- break up the word list into multiple dictionary files
- fix spelling issues
- Enable spell checking code for non-test files
2024-02-14 23:17:44 +01:00
Aakansha Doshi 23dd7b2b10 add name only when present in rectData 2024-02-14 12:41:54 +05:30
Aakansha Doshi bee88ac70e make name optional 2024-02-14 12:36:42 +05:30
Aakansha Doshi 1a8361d5c9
Merge branch 'develop' into aakansha/actor-name 2024-02-14 12:31:27 +05:30
Aakansha Doshi e21643229e feat: add name field to the actors 2024-02-14 12:12:49 +05:30
Sidharth Vinod 4a4e96cfbd
Merge branch 'develop' into feature/2776_katex_math 2024-02-13 10:56:46 +05:30
renovate[bot] 9ee2d70c8c
chore(deps): update all patch dependencies 2024-02-12 06:00:22 +00:00
renovate[bot] ddd971eae4
chore(deps): update all minor dependencies 2024-02-12 01:15:54 +00:00
Sidharth Vinod 062176d8d0
Merge branch 'next' into pr/Yokozuna59/4751
* next:
  Fix BlockDiagramConfig
  Fix docs
2024-02-11 20:26:16 +05:30
Sidharth Vinod a344d88020
Fix BlockDiagramConfig 2024-02-11 20:25:33 +05:30
Sidharth Vinod 00423ed152
Fix config 2024-02-11 20:05:08 +05:30
Sidharth Vinod 48ff3b2c11
Merge branch 'next' into pr/Yokozuna59/4751
* next: (118 commits)
  Update Deps
  chore(deps): update all patch dependencies
  fix typo cutomers => customers
  chore(deps): update all minor dependencies
  Fix macOS onboarding issues
  Bump @zenuml/core and update render options in mermaid-zenuml (#5257)
  Fixed Typo in ErrorRenderer.ts (#5256)
  #3358 Removing redundant file
  #3358 Fix after review
  Fix selector
  #3358 Renaming of IOperation to ActionFun
  chore: Add interface naming
  build(deps-dev): bump vite from 4.4.12 to 4.5.2
  Update container
  Update container
  Remove pnpm cache
  3358 Adding types for blockArrowHelper
  #3358n Updated lockfile
  Update docs
  #3358 Another set of review changes
  ...
2024-02-11 20:00:27 +05:30
Sidharth Vinod e047755a21
Merge branch 'develop' into next
* develop: (124 commits)
  chore(deps): update all patch dependencies
  fix typo cutomers => customers
  chore(deps): update all minor dependencies
  Fix macOS onboarding issues
  Bump @zenuml/core and update render options in mermaid-zenuml (#5257)
  Fixed Typo in ErrorRenderer.ts (#5256)
  #3358 Removing redundant file
  #3358 Fix after review
  Fix selector
  #3358 Renaming of IOperation to ActionFun
  chore: Add interface naming
  build(deps-dev): bump vite from 4.4.12 to 4.5.2
  Update container
  Update container
  Remove pnpm cache
  3358 Adding types for blockArrowHelper
  #3358n Updated lockfile
  Update docs
  #3358 Another set of review changes
  Use `.node-version` file in workflows
  ...
2024-02-11 19:56:55 +05:30
futzmonitor ec7591bfa8
Changes to intro.md
1. Removed the Slack link
2. Updated the Discord invite link
2024-02-09 13:41:55 +05:30
futzmonitor 6682988403
Changes to intro.md
1. Added a link to the Discord server
2024-02-09 13:41:54 +05:30
renovate[bot] 19f150922b
chore(deps): update all patch dependencies 2024-02-06 08:36:17 +00:00
Leo Gallucci 9261715003 fix typo cutomers => customers
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
2024-02-05 18:09:25 +01:00
Don b043d79cc4
Bump @zenuml/core and update render options in mermaid-zenuml (#5257)
* Update dependencies and render options in mermaid-zenuml

* update snpashots

* Revert "update snpashots"

This reverts commit e52022782b5565e3b95752bdf147cd8b2e0f03cd.
2024-02-04 18:20:02 +05:30
Sidharth Vinod 3b5cb020ea
Merge pull request #5218 from mermaid-js/dependabot/npm_and_yarn/vite-4.5.2
build(deps-dev): bump vite from 4.4.12 to 4.5.2
2024-02-03 05:58:52 +00:00
Knut Sveidqvist 3fe7e2dfe8 Updated contributions file 2024-02-02 11:30:29 +01:00
Knut Sveidqvist 51e7444b94 #3358 Layoutfix for growing parent when children spans new rows due to updated columns widths 2024-02-02 11:10:42 +01:00
Knut Sveidqvist f5555245f9 Mermaid version 10.8.0 2024-02-02 08:53:29 +01:00
Knut Sveidqvist 5c9857c4eb
Merge pull request #5247 from mermaid-js/sidv/mindmapToTs
Convert Mindmap to TS
2024-02-01 13:23:13 +00:00
Christian 494ba45c5e
Fixed Typo in ErrorRenderer.ts (#5256)
* Changes to flow.jison
1. Added support for the plus symbol.

* Changes to errorRenderer.ts
1. Fixed a typo where 'renering' instead 'rendering'

* Revert "Changes to flow.jison"

This reverts commit 28b9dc897f.
2024-02-01 17:32:52 +05:30
Knut Sveidqvist a7afc11079 #3358 Removing redundant file 2024-02-01 10:49:59 +01:00
Knut Sveidqvist d3c5b02008 Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram 2024-02-01 10:41:11 +01:00
Knut Sveidqvist 16149abcc0 #3358 Fix after review 2024-02-01 10:40:39 +01:00
Ashish Jain 13d0b61757
Merge branch 'develop' into 3358-blocks-diagram 2024-01-31 15:08:09 +01:00
Sidharth Vinod ebc59d8227
Merge branch 'develop' into feature/2776_katex_math 2024-01-31 15:21:13 +05:30
Sidharth Vinod 45f4d3d443
Merge branch 'develop' into sidv/mindmapToTs 2024-01-31 15:20:16 +05:30
Sidharth Vinod 33d45f639c
Merge pull request #5254 from mermaid-js/chore/InterfaceNaming
chore: Add interface naming Convention
2024-01-31 09:49:59 +00:00
Knut Sveidqvist 4786cfb6aa #3358 Renaming of IOperation to ActionFun 2024-01-31 09:50:11 +01:00
Sidharth Vinod 7aa4466b69
chore: Add interface naming 2024-01-31 14:19:01 +05:30
Sidharth Vinod 56da881ed4
Merge branch 'develop' into sidv/mindmapToTs
* develop:
  Update container
  Update container
  Remove pnpm cache
  Use `.node-version` file in workflows
  fix: Redirect of old URLs
  Remove node version from matrix
  Update to Node v20
  Update to Node v20
  fix lint
  add latest blog post
  update discord invite link
  remove holiday promo text
2024-01-31 14:10:51 +05:30
dependabot[bot] a3364e72ff
build(deps-dev): bump vite from 4.4.12 to 4.5.2
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.12 to 4.5.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-31 08:40:08 +00:00
Knut Sveidqvist 6fce617284 3358 Adding types for blockArrowHelper 2024-01-30 17:48:46 +01:00
Knut Sveidqvist 8fdf512b4c
Merge branch 'develop' into 3358-blocks-diagram 2024-01-30 16:53:46 +01:00
Knut Sveidqvist b99b1bfd0c #3358 Another set of review changes 2024-01-30 16:26:10 +01:00
Sidharth Vinod fcffa6ca4e
Merge branch 'develop' into feature/4653-add_actor-top_class_to_sequence_diagram 2024-01-30 20:51:52 +05:30
Sidharth Vinod 6fd69090ed
Merge branch 'master' into develop
* master:
  fix: Redirect of old URLs
  fix lint
  add latest blog post
  update discord invite link
  remove holiday promo text
2024-01-30 20:50:30 +05:30
Knut Sveidqvist 907006ff3d #3358 Some fixes 2024-01-30 16:07:19 +01:00
Knut Sveidqvist df9b801b0e #3358 Some fixes 2024-01-30 16:05:16 +01:00
Sidharth Vinod 726d633dd3
Use config from defaultConfig
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2024-01-30 20:00:54 +05:30
Knut Sveidqvist 010fc703eb
Update packages/mermaid/src/diagrams/block/blockTypes.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 14:46:14 +01:00
Knut Sveidqvist 8f8ce2f142 Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram 2024-01-30 14:37:53 +01:00
Knut Sveidqvist 452cb83ad7 #3358 Review changes 2024-01-30 14:37:35 +01:00
Knut Sveidqvist 2f8f9dd341
Update packages/mermaid/src/diagrams/block/blockDB.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 14:36:38 +01:00
Knut Sveidqvist 4a14d997d1
Update packages/mermaid/src/diagrams/block/blockRenderer.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 14:18:58 +01:00
Knut Sveidqvist 10237976f3
Merge branch 'develop' into 3358-blocks-diagram 2024-01-30 13:21:47 +01:00
Sidharth Vinod 80c20a72b2
Remove MermaidConfigWithDefaults 2024-01-30 14:25:44 +05:30
Sidharth Vinod 2d92ffb085
fix: Redirect of old URLs 2024-01-30 13:41:47 +05:30
Knut Sveidqvist 4823cf5df4
Update packages/mermaid/src/diagrams/block/blockDB.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 08:52:59 +01:00
Knut Sveidqvist dae8a13e8a
Update packages/mermaid/src/defaultConfig.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-30 08:51:47 +01:00
Sidharth Vinod 0b087b71dc
Merge branch 'develop' into feature/2776_katex_math 2024-01-30 12:57:04 +05:30
Sidharth Vinod ea8d7ec5cc
Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-01-30 12:56:36 +05:30
Sidharth Vinod 78f1631c8f
Organize imports 2024-01-30 10:04:42 +05:30
Sidharth Vinod ff6988e875
chore: Address review comments
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2024-01-30 09:51:40 +05:30
Ronid1 cddca04885 add actor-bottom to docs 2024-01-29 12:39:39 -08:00
Ronid1 f737c9f6f9 add actor-bottom class 2024-01-29 11:42:23 -08:00
Ronid1 7e86d03dc9 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/4653-add_actor-top_class_to_sequence_diagram 2024-01-29 11:28:01 -08:00
Knut Sveidqvist bfa8111e14 #3358 Third set of changes after review 2024-01-29 17:32:27 +01:00
Knut Sveidqvist 5aab2ba1dd Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram 2024-01-29 16:25:02 +01:00
Knut Sveidqvist 37d7c7e2dd #3358 Second set of changes after review 2024-01-29 16:22:48 +01:00
Knut Sveidqvist 1965f69a10
Update packages/mermaid/src/schemas/config.schema.yaml
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-29 15:29:26 +01:00
Sidharth Vinod 95dcd30324
Merge branch 'develop' into sidv/mindmapToTs 2024-01-29 16:53:21 +05:30
Sidharth Vinod 73293efcf3
Merge branch 'develop' into patch-2 2024-01-29 13:29:04 +05:30
Sidharth Vinod 4c551b2aca
Lint 2024-01-29 12:35:39 +05:30