Commit Graph

2241 Commits

Author SHA1 Message Date
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 ce9a9db33a
Merge branch 'develop' into next
* develop:
  Lint
  Remove echo
  RefTest
  Echo event
  Update cypress
  Fix applitools
2024-01-24 00:47:31 +05:30
Sidharth Vinod ec79ac200c
Lint 2024-01-23 23:53:48 +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 17066aab97
Merge branch 'master' of github.com:mermaid-js/mermaid into develop
* 'master' of github.com:mermaid-js/mermaid:
  docs: fix lint
  docs: move community to Discord
  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
2024-01-23 19:55:53 +05:30
Oleg A 427bcaa3f6
docs: fix lint 2024-01-23 19:53:42 +05:30
Oleg A 8fad1f55e2
docs: move community to Discord 2024-01-23 19:53:41 +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
Matheus Braga 679f77dea5
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2024-01-22 20:22:50 -03:00
Matheus Braga 1bad612c51
Merge branch 'develop' into feature/5114_add_parallel_commit_config 2024-01-22 20:19:52 -03:00
Matheus B 81825f22f5 Swap condition blocks to avoid using negation 2024-01-22 20:09:20 -03:00
Matheus B e668698b5c Reposition const declaration to ideal place 2024-01-22 19:56:25 -03: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
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
Sidharth Vinod 1f37b6c91b
Fix lint 2024-01-19 23:28:43 +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
Sidharth Vinod e8f655439d
Fix merge error 2024-01-19 13:59:53 +05:30
Sidharth Vinod c11093fa71
Update packages/mermaid/src/diagrams/flowchart/flowDb.ts
Co-authored-by: Alois Klink <alois@aloisklink.com>
2024-01-19 13:49:10 +05:30
Sidharth Vinod af7282511a
Merge branch 'next' into sidv/FlowDB_TS
* next: (194 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
  Draft release on master
  docs: Add release version
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Fix typo
  Run dev docs without npx
  Remove npx completely from run script
  Update docs
  Fix linters
  Removed volta requirement, leave pnpm only
  ...
2024-01-19 13:48:03 +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
Soren L. Hansen e0ee9b1bc0
Add more detailed docs for Gantt tasks 2024-01-19 09:34:20 +05:30
arukiidou be8faae68c
Update packages/mermaid/src/docs/syntax/flowchart.md
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2024-01-19 09:22:38 +05:30
arukiidou 04ebf0ddc9
Update flowchart.md #5195 2024-01-19 09:22:38 +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
renovate[bot] fb7cd9ca40
chore(deps): update all patch dependencies 2024-01-18 16:17:34 +00:00
Sidharth Vinod 781065dee4
Merge pull request #5205 from mathbraga/revert-5197-revert-5041-feature/4935_subgraph-title-margin-config-option
Revert "Revert 5041 feature/4935 subgraph title margin config option"
2024-01-18 16:10:05 +00:00
Sidharth Vinod 2525966853
Merge pull request #5132 from nirname/docs/2910_update-contributing-guidelines
Contribution documentation improvements
2024-01-18 15:59:47 +00:00
Alois Klink 8788b49351
Merge pull request #5192 from murdoa/bug/5191_fix_gantt_chart_padding_docs
Updated gantt chart docs to show all config options
2024-01-17 18:55:03 +00:00
Matheus B c77a6e156c Include logic for gitgraph with unconnected branches 2024-01-16 20:54:26 -03:00
Matheus B 02246f64d2 Include undefined on findClosestParent return types and update the function 2024-01-16 20:01:03 -03:00
Matheus B bf1edd99f9 Remove unnecessary argument on findClosestParent call 2024-01-16 19:37:52 -03:00
Matheus B 6f09bc7dc7 Use already defined const instead of method call 2024-01-16 19:34:16 -03:00
Matheus B 96ac2369b6 Change string concatenation to template literal 2024-01-16 15:36:31 -03:00
Matheus Braga 8c7edebe93
Revert "Revert 5041 feature/4935 subgraph title margin config option" 2024-01-16 13:21:31 -03:00
Sidharth Vinod aab7631a9f
Merge branch 'develop' into next
* develop: (62 commits)
  Draft release on master
  docs: Add release version
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Fix typo
  add inadvertent tracking removal
  update announcement bar
  Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
  v10.7.0
  10.6.2-rc.3
  docs: Remove broken integration
  chore: Minor cleanup of imperativeState
  chore(deps): update all minor dependencies
  adds corresponding change in docs/ecosystem
  Adds Unison programming language to community integrations list
  update verbiage
  update verbiage
  add jetbrains blog post
  additional updates
  Fixed parser/tests
  ...
2024-01-16 19:15:33 +05:30
Nikolay Rozhkov 36fdff8378 Merge branch 'develop' into docs/2910_update-contributing-guidelines 2024-01-15 13:17:47 +03:00
Sidharth Vinod d972ddd932
docs: Add release version 2024-01-15 14:27:48 +05:30
Sidharth Vinod 54307bb0f4
Merge branch 'develop' of github.com:mermaid-js/mermaid into release/10.7.0
* 'develop' of github.com:mermaid-js/mermaid:
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
2024-01-15 13:55:04 +05:30
Sidharth Vinod b3fa9167a0
Merge branches 'master' and 'release/10.7.0' of github.com:mermaid-js/mermaid into release/10.7.0
* 'master' of github.com:mermaid-js/mermaid:
  add inadvertent tracking removal
  update announcement bar

* 'release/10.7.0' of github.com:mermaid-js/mermaid:
2024-01-15 13:39:25 +05:30
Sidharth Vinod 7508d9adc5
Merge pull request #5198 from mermaid-js/revert-5017-bug/4946-fix-svg-order-sequence-participant
Revert "fix: render the participants in same order as they are created"
2024-01-15 07:56:39 +00:00
Sidharth Vinod 11542b3b5d
Revert "fix: render the participants in same order as they are created" 2024-01-15 13:22:00 +05:30
Sidharth Vinod b46da49f85
Revert "Feature/4935 subgraph title margin config option" 2024-01-15 13:08:58 +05:30
Nikolay Rozhkov f6b321d769 Removed volta requirement, leave pnpm only 2024-01-13 15:19:36 +03:00
Steph d6d465d207 add inadvertent tracking removal 2024-01-12 07:54:19 -08:00
steph c96cc21692 update announcement bar 2024-01-11 22:42:09 -08:00
Nikolay Rozhkov a3092fc174 Fixed dead link 2024-01-12 02:00:30 +03:00
Nikolay Rozhkov 21ecc28b40 Merge branch 'develop' into docs/2910_update-contributing-guidelines 2024-01-12 01:41:00 +03:00
Nikolay Rozhkov 7219d604a9 Updated contributing docs after review, minor fixes 2024-01-12 01:32:07 +03:00