rowanfr
d0a008566e
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-03-22 19:50:26 -05:00
JingyuMarcelLee
de89355a49
Recommitted Changed due to polluted branch
2024-03-20 01:20:20 -04:00
rowanfr
ae29dd124c
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-03-06 12:06:06 -06:00
Ronid1
703460ea95
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into feature/4661_gantt_customize_days_of_weekend
2024-03-06 09:09:42 -08:00
ilyes-ced
1059dd389f
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-03-06 13:13:19 +00:00
Ronid1
19e049642b
add unit and integration tests
2024-03-05 11:18:49 -08:00
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
ilyes-ced
67e482ff97
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-02-29 21:53:59 +00:00
Alois Klink
8862d63377
Merge branch 'develop' into origin/3258_Flowchart_nodeSpacing_Subgraph
2024-02-29 16:27:13 +00:00
ilyes-ced
fc7427536c
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-02-29 13:08:58 +00:00
rowanfr
1b0b1227b6
Resolves E2E testing issues and issue #5343
2024-02-29 06:45:20 -06: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
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
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
ilyes-ced
af7364bdf9
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-02-14 18:21:51 +00:00
Sidharth Vinod
4a4e96cfbd
Merge branch 'develop' into feature/2776_katex_math
2024-02-13 10:56:46 +05:30
ilyes-ced
f1aa6fff9c
some fixes
2024-02-11 18:56:33 +00:00
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
ilyes-ced
8ad056b8a2
1 tiny typo
2024-02-07 01:20:04 +00:00
ilyes-ced
17959f648a
various fixes + add unit tests for parsed styles
2024-02-07 00:21:33 +00:00
Ronid1
f846e7719e
add tests
2024-02-06 15:12:13 -08:00
ilyes-ced
42589a0034
Merge branch 'develop' into feature/add-point-styling-quadrant-to-charts
2024-02-05 15:42:44 +00:00
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
7d0faa3fed
Merge branch 'develop' into bug/4358_suppress_error_rendering
2024-01-26 23:29:27 +05:30
Sidharth Vinod
4256177531
chore: Remove cy.viewport
2024-01-26 23:07:13 +05:30
Sidharth Vinod
327530fb9d
Merge branch 'develop' into pr/rhysd/4359
...
* develop: (171 commits)
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
Fix Update Browserslist
Use pnpm/action-setup@v2
Fix lint
Cleanup e2e.yml
Ignore push events on merge queue
Remove ::
Remove ::
Remove ::
...
2024-01-26 23:05:16 +05:30
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
