1b0b1227b6
Resolves E2E testing issues and issue #5343
2024-02-29 06:45:20 -06:00
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
619f097f1a
Merge branch 'develop' into git-graph-merge-commit
2024-02-29 07:57:09 +05:30
af3d728a72
Merge branch 'develop' into feature/3173_implement_until_keyword_in_gantt
2024-02-27 12:35:38 +05:30
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
4336b91dbd
Fix color and arrow for merge commit
2024-02-16 17:12:39 +01:00
4a4e96cfbd
Merge branch 'develop' into feature/2776_katex_math
2024-02-13 10:56:46 +05:30
f5555245f9
Mermaid version 10.8.0
2024-02-02 08:53:29 +01:00
d3c5b02008
Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid into 3358-blocks-diagram
2024-02-01 10:41:11 +01:00
16149abcc0
#3358 Fix after review
2024-02-01 10:40:39 +01:00
13d0b61757
Merge branch 'develop' into 3358-blocks-diagram
2024-01-31 15:08:09 +01:00
ebc59d8227
Merge branch 'develop' into feature/2776_katex_math
2024-01-31 15:21:13 +05:30
b99b1bfd0c
#3358 Another set of review changes
2024-01-30 16:26:10 +01:00
df9b801b0e
#3358 Some fixes
2024-01-30 16:05:16 +01:00
4a04ce6bf8
Update cypress/integration/rendering/block.spec.ts
...
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2024-01-30 14:49:14 +01:00
10237976f3
Merge branch 'develop' into 3358-blocks-diagram
2024-01-30 13:21:47 +01:00
f737c9f6f9
add actor-bottom class
2024-01-29 11:42:23 -08:00
37d7c7e2dd
#3358 Second set of changes after review
2024-01-29 16:22:48 +01:00
069a132fe1
revert changes on existing e2e tests; add new e2e test for nez until keyword
2024-01-27 16:05:35 +00:00
c1b5d527df
modify invalid e2e test for gantt chart
2024-01-27 13:24:12 +00:00
280525b4b1
merge develop; resolve minor conflicts in docs/syntax/gantt.md
2024-01-27 12:27:34 +00:00
9fadf621a8
adapt e2e tests to include new 'until' keyword in gantt chart
2024-01-27 12:05:23 +00:00
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
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
36c196e80b
add test
2024-01-26 14:07:12 -08:00
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
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
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
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
c85b24862d
Merge branch 'develop' into 3358-blocks-diagram
2024-01-22 14:19:30 +01:00
fe89b9510d
#3358 Adjusting docs and a bug fix for nested blocks
2024-01-22 14:14:54 +01:00
e7c52bbf59
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges
2024-01-21 13:20:24 -03:00
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
8fd268d59b
add sequenceDiagram link e2e test
2024-01-19 16:10:23 -03:00
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
d96425d19e
#3358 Reviving arrow heads after merging develop
2024-01-19 14:57:45 +01:00
a964af67ec
Handle edge cases in E2E
2024-01-19 19:04:25 +05:30
1285e59080
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges
2024-01-19 13:18:45 +05:30
cb0ee5aa41
Use pixelmatch for image comparison
2024-01-19 13:17:14 +05:30
95ebb4aaec
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges
2024-01-19 12:46:17 +05:30
d2c82c1802
Use cache to store snapshots
2024-01-19 12:06:53 +05:30
223c8c92cb
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges
2024-01-18 20:59:24 -03:00
d075766760
#3358 Doc updates after viewing the page
2024-01-18 18:03:37 +01:00
bf64509216
Merge branch 'develop' into 3358-blocks-diagram
2024-01-18 17:07:34 +01:00
1230da7fc7
#3358 Some cleanup
2024-01-18 15:31:14 +01:00
a0d328d734
#3358 Removed logging, fixed som tests
2024-01-18 14:28:14 +01:00
bbc7fe6163
#3358 Fix for width of composite blocks
2024-01-18 10:22:09 +01:00
9213afbacd
Add tests for gitgraphs with unconnected branches
2024-01-16 20:55:42 -03:00
8c7edebe93
Revert "Revert 5041 feature/4935 subgraph title margin config option"
2024-01-16 13:21:31 -03:00
b46da49f85
Revert "Feature/4935 subgraph title margin config option"
2024-01-15 13:08:58 +05:30
rowanfr