mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,231 Commits 165 Branches 144 Tags 340 MiB
Commit Graph

5231 Commits

Author SHA1 Message Date
Knut Sveidqvist 0779c39654 Border 2022-08-27 12:32:33 +02:00
Alois Klink b2f5ba3ee8
feat(git): allow custom merge commit ids 
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.

This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
 2022-08-25 23:42:39 +01:00
Valentin Valls ba4f7d2ceb Rework 'parseDuration' as a pure duration parsing 2022-08-25 23:15:28 +02:00
Valentin Valls 3315ae8382 Supports duration in decimal 2022-08-25 23:15:28 +02:00
Valentin Valls f7b8d1ac07 Create a more consistent 'parseDuration' 
- Remove 'durationToDate' which was not a usable function
 2022-08-25 23:15:28 +02:00
Amy Qualls 86b3a4f09e
Document line curve options 
An extremely basic MVC explaining that it is possible to adjust how lines in a flowchart are curved, while listing (some of?) the available options.

I doubt I've captured all of the curve options, but capturing the existence of curve options is a start.

Sources:

- https://github.com/mermaid-js/mermaid/issues/580#issuecomment-373929046 where a user references adding the feature to Mermaid
- Which references https://github.com/d3/d3-shape/blob/master/README.md#curves and I think is worth including here
 2022-08-25 12:01:55 -07:00
Sidharth Vinod a3dfc4c0e8
Remove `@ts-ignore`s. 
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
 2022-08-25 21:53:36 +05:30
Sidharth Vinod 15b160c553
Fix svgDraw return types 
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
 2022-08-25 12:41:32 +05:30
Sidharth Vinod 39980322bd
Add more tests 2022-08-25 11:59:01 +05:30
Sidharth Vinod 2f7930efb7
Fix nested types 
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
 2022-08-25 11:58:43 +05:30
Sidharth Vinod 5996e1e69d
Fix nested types 
Co-authored-by: FlorianWoelki <FlorianWoelki@gmx.de>
 2022-08-25 08:49:20 +05:30
Yash Singh cde3a7cf70
Merge pull request #3355 from vallsv/feature-ms-duration 2022-08-24 16:07:45 -07:00
Yash Singh 49eebc1c20
Merge pull request #3353 from FabAlchemy/develop 2022-08-24 16:06:38 -07:00
Valentin Valls 0583c4fa25 Added 'ms' duration 2022-08-24 22:26:39 +02:00
Fabien Savy a3ace00ed4 Fix font weight for messages in sequence diagrams 2022-08-24 17:07:56 +02:00
Sidharth Vinod c37ff47ee3
Add nested test 2022-08-24 12:33:32 +05:30
Sidharth Vinod 84148d4891
Remove failing test 2022-08-24 12:32:15 +05:30
Sidharth Vinod 60651fdfe0
Merge branch 'develop' into sidv/typescript 
* develop: (22 commits)
  Fix for build by revering jsdoc
  Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0"
  Review comments.
  Add test for handling parameter names that are "default"
  Add test for handling parameter names that are keywords
  Add test for handling trailing whitespaces
  Add first C4 parser test
  chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7
  chore(deps-dev): bump documentation from 13.2.0 to 14.0.0
  chore(deps-dev): bump terser-webpack-plugin from 5.3.4 to 5.3.5
  chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
  test(e2e): add array and generic attributes erDiagram test
  test(common): add generic parser test
  test(parser): add tests for generics and arrays in erDiagram
  feat: add array and generic symbols for erDiagram
  Lint markdown
  Fix prettier formatting in vscode
  Prettier
  Fix `securityLevel` docs
  Update README.md
  ...
 2022-08-24 11:38:23 +05:30
Sidharth Vinod 1efd5c7d58
Cleanup 2022-08-24 11:32:27 +05:30
Knut Sveidqvist fd70b862ed
Merge pull request #3332 from lorint/docs/grammatical_touch_ups 
Grammatical touch-ups to documentation
 2022-08-23 20:18:03 +02:00
Knut Sveidqvist 1c8035e029
Merge pull request #3333 from abergquist/patch-1 
Update README.md
 2022-08-23 20:10:38 +02:00
Knut Sveidqvist 11809e799b
Merge pull request #3334 from mermaid-js/sidv/fixDoc 
Add `sandbox` to `securityLevel` docs
 2022-08-23 20:10:06 +02:00
Knut Sveidqvist c50745323a
Merge pull request #3335 from FlorianWoelki/feature/3171_erDiagram_more_symbols 
Add generic and array symbols to `erDiagram`
 2022-08-23 20:07:06 +02:00
Knut Sveidqvist 2af91f5bbb
Merge pull request #3349 from dbartholomae/add_tests_for_c4_parser 
Add tests for C4 parser
 2022-08-23 19:49:41 +02:00
Knut Sveidqvist 08793e0b50
Merge pull request #3352 from mermaid-js/fix_for_build 
Fix for build by revering jsdoc
 2022-08-23 19:37:12 +02:00
Knut Sveidqvist db961ecefe Fix for build by revering jsdoc 2022-08-23 19:30:15 +02:00
Knut Sveidqvist d3ae5e3e10
Merge pull request #3350 from mermaid-js/revert-3344-dependabot/npm_and_yarn/develop/documentation-14.0.0 
Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0"
 2022-08-23 19:17:45 +02:00
Knut Sveidqvist 576445847c
Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0" 2022-08-23 18:32:20 +02:00
Sidharth Vinod 248a7aff7a
Review comments. 2022-08-23 21:49:01 +05:30
Sidharth Vinod a8042f622f
Merge branch 'sidv/typescript' of https://github.com/mermaid-js/mermaid into sidv/typescript 
* 'sidv/typescript' of https://github.com/mermaid-js/mermaid:
  Update src/config.ts
 2022-08-23 21:35:43 +05:30
Sidharth Vinod 32ba2d5ffe
Remove console.logs 2022-08-23 21:35:33 +05:30
Knut Sveidqvist 9ef3164991
Merge pull request #3342 from mermaid-js/dependabot/npm_and_yarn/develop/prettier-plugin-jsdoc-0.4.1 
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
 2022-08-23 17:51:44 +02:00
Knut Sveidqvist b0b54f48f9
Merge pull request #3343 from mermaid-js/dependabot/npm_and_yarn/develop/terser-webpack-plugin-5.3.5 
chore(deps-dev): bump terser-webpack-plugin from 5.3.4 to 5.3.5
 2022-08-23 17:51:31 +02:00
Knut Sveidqvist 35ba62bae2
Merge pull request #3344 from mermaid-js/dependabot/npm_and_yarn/develop/documentation-14.0.0 
chore(deps-dev): bump documentation from 13.2.0 to 14.0.0
 2022-08-23 17:50:49 +02:00
Knut Sveidqvist ea0e9aa7f4
Merge pull request #3345 from mermaid-js/dependabot/npm_and_yarn/develop/eslint-plugin-jest-26.8.7 
chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7
 2022-08-23 17:49:10 +02:00
Daniel Bartholomae 8c56f68a06 Add test for handling parameter names that are "default" 2022-08-23 16:15:38 +02:00
Daniel Bartholomae 2cf9348f53 Add test for handling parameter names that are keywords 2022-08-23 16:12:16 +02:00
Daniel Bartholomae d97ce7eab8 Add test for handling trailing whitespaces 2022-08-23 16:12:16 +02:00
Daniel Bartholomae 0c8f7163db Add first C4 parser test 2022-08-23 16:12:16 +02:00
Knut Sveidqvist 0e0802a588
Update src/config.ts 
Agree!

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
 2022-08-22 17:48:09 +02:00
Sidharth Vinod 9a0d5e31b7
fix: review comments 2022-08-22 17:12:05 +05:30
Sidharth Vinod 6291e4dcdd
fix detectType 2022-08-22 13:30:10 +05:30
Sidharth Vinod 9f49259bca
fix detectType 2022-08-22 13:29:55 +05:30
Sidharth Vinod 4885e7b7f1
fix detectType 2022-08-22 13:29:25 +05:30
Sidharth Vinod a2469b6984
Merge branch 'develop' into sidv/typescript 
* develop:
  chore: update browsers list
 2022-08-22 13:22:17 +05:30
Sidharth Vinod 1549eb20df
tsConversion: fix DiagramAPI 2022-08-22 13:18:50 +05:30
Sidharth Vinod c245a2da07
tsConversion: rename DiagramAPI 2022-08-22 12:59:23 +05:30
mmorel-35 6e16369d85 chore: update browsers list 2022-08-22 07:04:25 +00:00
dependabot[bot] 8caeeccea3
chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 26.8.2 to 26.8.7.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v26.8.2...v26.8.7)

---
updated-dependencies:
- dependency-name: eslint-plugin-jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 07:03:36 +00:00
dependabot[bot] 102542b4e7
chore(deps-dev): bump documentation from 13.2.0 to 14.0.0 
Bumps [documentation](https://github.com/documentationjs/documentation) from 13.2.0 to 14.0.0.
- [Release notes](https://github.com/documentationjs/documentation/releases)
- [Changelog](https://github.com/documentationjs/documentation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/documentationjs/documentation/compare/v13.2.0...v14.0.0)

---
updated-dependencies:
- dependency-name: documentation
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 07:03:21 +00:00