Commit Graph

9633 Commits

Author SHA1 Message Date
Knut Sveidqvist fe89b9510d #3358 Adjusting docs and a bug fix for nested blocks 2024-01-22 14:14:54 +01:00
Sidharth Vinod 7b624667fa
Merge pull request #5219 from Yokozuna59/yokozuna/fix-broken-link
docs: fix swimm link
2024-01-22 08:03:56 +00: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 3e87412e97 Merge branch 'feature/5114_add_parallel_commit_config' of https://github.com/mathbraga/mermaid into feature/5114_add_parallel_commit_config 2024-01-20 21:13:44 -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
Matheus B 4f60a27472 Change repetitive values into consts 2024-01-20 20:57:58 -03:00
Reda Al Sulais 2bbdd15031 docs: fix swimm link 2024-01-20 13:30:49 +03:00
Vitor Soares Silva c226358f65
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup 2024-01-19 16:24:54 -03:00
Vitor Soares Silva 8fd268d59b
add sequenceDiagram link e2e test 2024-01-19 16:10:23 -03:00
Sidharth Vinod b91624cb63
Merge pull request #5066 from Ronid1/docs/4974_reorder_integration_links
Docs/4974 reorder integration links
2024-01-19 18:10:58 +00:00
Sidharth Vinod 54f2452406
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
* 'develop' of github.com:mermaid-js/mermaid:
  Use pnpm/action-setup@v2
  Fix pnpm-lock by resetting it, sorry!
  chore: update browsers list
  Update update-browserlist.yml
  Update update-browserlist.yml to install pnpm
  Update update-browserlist.yml to fix deprecation and action fails
2024-01-19 23:47:14 +05:30
Sidharth Vinod 84a18a1858
Fix Update Browserslist 2024-01-19 23:47:07 +05:30
Sidharth Vinod 5b2a10e592
Merge pull request #5151 from Abrifq/patch-4
Update update-browserlist.yml to fix deprecation and action fails
2024-01-19 23:42:20 +05:30
Sidharth Vinod 8820c7baf1
Merge branch 'develop' into patch-4 2024-01-19 23:39:27 +05:30
Sidharth Vinod 1e70b3817e
Use pnpm/action-setup@v2 2024-01-19 23:38:27 +05:30
Sidharth Vinod 1f37b6c91b
Fix lint 2024-01-19 23:28:43 +05:30
Sidharth Vinod c080522102
Merge branch 'develop' into issue1981 2024-01-19 23:18:53 +05:30
Sidharth Vinod d95fdfee94
Merge branch 'develop' into pr/Ronid1/5066
* develop: (122 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 23:15:52 +05:30
Vitor Soares Silva d74025bd80
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup 2024-01-19 13:40:30 -03:00
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
Sidharth Vinod d0224b23b0
Cleanup e2e.yml 2024-01-19 19:47:42 +05:30
Sidharth Vinod 6334516639
Merge branch 'combineImages' into develop
* combineImages:
  Ignore push events on merge queue
2024-01-19 19:47:12 +05:30
Sidharth Vinod aadf32ab3e
Ignore push events on merge queue 2024-01-19 19:45:55 +05:30
Sidharth Vinod 6424f823b2
Merge pull request #5213 from mermaid-js/combineImages
Optimise caching of test results
2024-01-19 14:09:03 +00:00
Sidharth Vinod 8bfb269b37
Remove :: 2024-01-19 19:33:59 +05:30
Sidharth Vinod 3935f6b389
Remove :: 2024-01-19 19:31:25 +05:30
Sidharth Vinod f5dd24bce4
Remove :: 2024-01-19 19:29:45 +05:30
Knut Sveidqvist d96425d19e #3358 Reviving arrow heads after merging develop 2024-01-19 14:57:45 +01:00
Sidharth Vinod 279e31bc55
Debug 2024-01-19 19:23:13 +05:30
Sidharth Vinod f1fc874da8
Debug 2024-01-19 19:20:39 +05:30
Sidharth Vinod a871a68f3c
Remove spec selector 2024-01-19 19:05:06 +05:30
Sidharth Vinod a964af67ec
Handle edge cases in E2E 2024-01-19 19:04:25 +05:30
Sidharth Vinod 6f205f89b2
Always run combineArtifacts 2024-01-19 16:58:19 +05:30
Sidharth Vinod 35b3192c2b
Fix error message 2024-01-19 16:58:19 +05:30
Sidharth Vinod be4721b24d
Fix cache save 2024-01-19 16:58:19 +05:30
Sidharth Vinod a9a8a208a6
Update cache key 2024-01-19 16:58:19 +05:30
Sidharth Vinod f58a86d747
Notify users 2024-01-19 16:58:19 +05:30
Sidharth Vinod 4ce5d07125
Flatten uploaded images 2024-01-19 16:58:18 +05:30
Sidharth Vinod 658af081ee
Flatten uploaded images 2024-01-19 14:42:51 +05:30
Sidharth Vinod fdfa917cdb
Merge branch 'develop' into feature/5114_add_parallel_commit_config 2024-01-19 14:12:08 +05:30
Sidharth Vinod 46552faa2e
Merge branch 'develop' into fix/4212_actor_menus_sequence_diagram_popup 2024-01-19 14:10:30 +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 97f9919250
Merge pull request #5210 from sidharthv96/sidv/e2e
E2E test
2024-01-19 12:24:41 +05:30
Sidharth Vinod d6e738ac4c
Run all tests 2024-01-19 12:21:51 +05:30
Sidharth Vinod 91a63933ec
Merge branch 'develop' into sidv/e2e
* develop:
  Fix lint
2024-01-19 12:17:45 +05:30
Sidharth Vinod 448756ab54
Fix lint 2024-01-19 12:17:20 +05:30
Sidharth Vinod 7805e05495
Update lockfile 2024-01-19 12:15:01 +05:30
Sidharth Vinod 98782d3a1f
Merge branch 'develop' into sidv/e2e 2024-01-19 12:11:45 +05:30