Commit Graph

1119 Commits

Author SHA1 Message Date
Sidharth Vinod 70df6bbbca
Merge branch 'develop' into next
* develop:
  Resolves E2E testing issues and issue #5343
2024-03-01 12:20:45 +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
rowanfr 1b0b1227b6
Resolves E2E testing issues and issue #5343 2024-02-29 06:45:20 -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 af3d728a72
Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt 2024-02-27 12:35:38 +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
Bruno Macherel 4336b91dbd Fix color and arrow for merge commit 2024-02-16 17:12:39 +01:00
Sidharth Vinod 4a4e96cfbd
Merge branch 'develop' into feature/2776_katex_math 2024-02-13 10:56:46 +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
Knut Sveidqvist f5555245f9 Mermaid version 10.8.0 2024-02-02 08:53:29 +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
Knut Sveidqvist b99b1bfd0c #3358 Another set of review changes 2024-01-30 16:26:10 +01:00
Knut Sveidqvist df9b801b0e #3358 Some fixes 2024-01-30 16:05:16 +01:00
Knut Sveidqvist 4a04ce6bf8
Update cypress/integration/rendering/block.spec.ts
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2024-01-30 14:49:14 +01:00
Knut Sveidqvist 10237976f3
Merge branch 'develop' into 3358-blocks-diagram 2024-01-30 13:21:47 +01:00
Ronid1 f737c9f6f9 add actor-bottom class 2024-01-29 11:42:23 -08:00
Knut Sveidqvist 37d7c7e2dd #3358 Second set of changes after review 2024-01-29 16:22:48 +01:00
Franck Zagala 069a132fe1 revert changes on existing e2e tests; add new e2e test for nez until keyword 2024-01-27 16:05:35 +00:00
Franck Zagala c1b5d527df modify invalid e2e test for gantt chart 2024-01-27 13:24:12 +00:00
Franck Zagala 280525b4b1 merge develop; resolve minor conflicts in docs/syntax/gantt.md 2024-01-27 12:27:34 +00:00
Franck Zagala 9fadf621a8 adapt e2e tests to include new 'until' keyword in gantt chart 2024-01-27 12:05:23 +00:00
Sidharth Vinod d1178c490b
Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (47 commits)
  Changes to gantt.html 1. Added a Gantt diagram that demonstrates to users that hashtages and semicolons can be added to titles, sections, and task data. Changes to gantt.spec.js 1. Added unit tests to ensure that semicolons and hashtags didn't break the functionality of the gantt diagram when used in titles, sections or task data. Changes to /parser/gantt.spec.js 1. Added rendering tests to ensure that semicolons and hashtags in titles, sections, and task data didn't break the rendering of Gantt diagrams.
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  add sequenceDiagram link e2e test
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Delete docs/syntax/gantt.html
  Add more detailed docs for Gantt tasks
  Update docs
  ...
2024-01-27 12:49:35 +05:30
Ronid1 9ee5667580 Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/4653-add_actor-top_class_to_sequence_diagram 2024-01-26 14:08:13 -08:00
Ronid1 36c196e80b add test 2024-01-26 14:07:12 -08:00
Sidharth Vinod 91907fe0eb
Merge pull request #5095 from FutzMonitor/issue1981
Changes to Gantt Parsers to allow hashes and semicolons to titles, sections, and task data.
2024-01-26 17:21:58 +00:00
Sidharth Vinod 9bedfa2033
Merge pull request #5160 from vitorsss/fix/4212_actor_menus_sequence_diagram_popup
[Fix] Sequence diagram actor menu popup
2024-01-26 17:16:27 +00:00
FutzMonitor 59264a33d7 Changes to gantt.html
1. Added a Gantt diagram that demonstrates to users that hashtages and semicolons can be added to titles, sections, and task data.
Changes to gantt.spec.js
1. Added unit tests to ensure that semicolons and hashtags didn't break the functionality of the gantt diagram when used in titles, sections or task data.
Changes to /parser/gantt.spec.js
1. Added rendering tests to ensure that semicolons and hashtags in titles, sections, and task data didn't break the rendering of Gantt diagrams.
2024-01-26 11:48:48 -05:00
Sidharth Vinod 5cc20b5e44
Merge branch 'next' into feat/948_packetDiagram
* next: (316 commits)
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
  Fix applitools
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  ...
2024-01-24 00:58:55 +05:30
Sidharth Vinod ba46747cb0
Merge branch 'develop' into next
* develop: (35 commits)
  docs: fix lint
  docs: move community to Discord
  Swap condition blocks to avoid using negation
  Reposition const declaration to ideal place
  Change repetitive values into consts
  docs: fix swimm link
  Fix Update Browserslist
  Use pnpm/action-setup@v2
  Fix lint
  Delete docs/syntax/gantt.html
  Add more detailed docs for Gantt tasks
  Update docs
  Update packages/mermaid/src/docs/syntax/flowchart.md
  Update flowchart.md #5195
  Add tests for gitgraphs with unconnected branches
  Include logic for gitgraph with unconnected branches
  Include undefined on findClosestParent return types and update the function
  Remove unnecessary argument on findClosestParent call
  Use already defined const instead of method call
  Fix pnpm-lock by resetting it, sorry!
  ...
2024-01-23 20:01:40 +05:30
Sidharth Vinod 05e17c0bf0
Merge pull request #5161 from mathbraga/feature/5114_add_parallel_commit_config
Feature/5114 add parallel commit config
2024-01-23 04:40:24 +00:00
Knut Sveidqvist c85b24862d Merge branch 'develop' into 3358-blocks-diagram 2024-01-22 14:19:30 +01:00
Knut Sveidqvist fe89b9510d #3358 Adjusting docs and a bug fix for nested blocks 2024-01-22 14:14:54 +01:00
Matheus Braga e7c52bbf59
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-21 13:20:24 -03:00
Matheus B 2401f334ec Merge branch 'develop' of https://github.com/mathbraga/mermaid into feature/5114_add_parallel_commit_config 2024-01-20 21:07:53 -03:00
Vitor Soares Silva 8fd268d59b
add sequenceDiagram link e2e test 2024-01-19 16:10:23 -03:00
Sidharth Vinod 832e3f5d49
Merge branch 'develop' into next 2024-01-19 23:24:37 +05:30
Sidharth Vinod 413de284ed
Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (130 commits)
  Cleanup e2e.yml
  Ignore push events on merge queue
  Remove ::
  Remove ::
  Remove ::
  Debug
  Debug
  Remove spec selector
  Handle edge cases in E2E
  Always run combineArtifacts
  Fix error message
  Fix cache save
  Update cache key
  Notify users
  Flatten uploaded images
  Flatten uploaded images
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  ...
2024-01-19 19:59:33 +05:30
Knut Sveidqvist d96425d19e #3358 Reviving arrow heads after merging develop 2024-01-19 14:57:45 +01:00
Sidharth Vinod a964af67ec
Handle edge cases in E2E 2024-01-19 19:04:25 +05:30
Sidharth Vinod 58b6cf0174
Merge branch 'develop' into next
* develop: (50 commits)
  Use pixelmatch for image comparison
  Run all tests
  Fix lint
  Update lockfile
  E2E test
  Use cache to store snapshots
  chore(deps): update all patch dependencies
  Change string concatenation to template literal
  Revert "Revert 5041 feature/4935 subgraph title margin config option"
  build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5
  Run dev docs without npx
  Remove npx completely from run script
  Update docs
  Fix linters
  Removed volta requirement, leave pnpm only
  Fixed dead link
  build
  Update docs
  Updated contributing docs after review, minor fixes
  Updated gantt chart docs to show all config options
  ...
2024-01-19 13:46:10 +05:30
Sidharth Vinod 1285e59080
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-19 13:18:45 +05:30
Sidharth Vinod cb0ee5aa41
Use pixelmatch for image comparison 2024-01-19 13:17:14 +05:30
Sidharth Vinod 95ebb4aaec
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-19 12:46:17 +05:30
Sidharth Vinod d2c82c1802
Use cache to store snapshots 2024-01-19 12:06:53 +05:30
Matheus Braga 223c8c92cb
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-18 20:59:24 -03:00
Knut Sveidqvist d075766760 #3358 Doc updates after viewing the page 2024-01-18 18:03:37 +01:00