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
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
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
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
Sidharth Vinod
248a7aff7a
Review comments.
2022-08-23 21:49:01 +05:30
Sidharth Vinod
32ba2d5ffe
Remove console.logs
2022-08-23 21:35:33 +05:30
Sidharth Vinod
1549eb20df
tsConversion: fix DiagramAPI
2022-08-22 13:18:50 +05:30
Sidharth Vinod
d365dacbf7
tsConversion: mermaidAPI
2022-08-22 11:10:30 +05:30
Sidharth Vinod
39aaf2f813
tsConversion: fix paths, add d.ts to output
2022-08-21 22:27:13 +05:30
Sidharth Vinod
6de66eaba3
Add trace logLevel
2022-08-21 09:42:30 +05:30
Sidharth Vinod
2e392232eb
Prettier
2022-08-20 16:39:35 +05:30
Sidharth Vinod
2f4af87bf7
Fix securityLevel docs
2022-08-20 16:22:48 +05:30
Lorin Thwaits
6635d4bc97
Grammatical touch-ups
2022-08-19 21:27:13 +01:00
Knut Sveidqvist
a89b6fd054
Merge branch 'master' into develop
2022-08-18 19:57:58 +02:00
Ashish Jain
db4ff451bf
Merge pull request #3328 from jayvdb/rm-doc-404
...
docs: Remove 404 links
2022-08-18 17:02:22 +02:00
John Vandenberg
18d44c643f
docs: Remove 404 links
...
Also fix a few cases that unnecessarily look like URLs.
2022-08-17 15:12:14 +08:00
John Vandenberg
d01929255c
Remove two ~HEAD docs
2022-08-17 14:52:52 +08:00
Knut Sveidqvist
808bcb8022
Updated version for the docs
2022-08-11 20:34:26 +02:00
Nam G VU
b0a459c8a1
official url from jetsbrain
2022-08-07 15:15:06 +07:00
Nam G VU
60f6bbd42a
add Jetsbrain/Pycharm to the list
2022-08-07 15:01:30 +07:00
Knut Sveidqvist
b7925936f8
Merge remote-tracking branch 'origin/release/9.1.4'
2022-08-04 20:37:16 +02:00
Ashish Jain
56c4637d1e
Merge branch 'develop' into patch-1
2022-08-04 18:46:38 +02:00
Ashish Jain
ee1ec3d6d0
Merge pull request #3268 from zaaath/develop
...
Fix broken links
2022-08-04 18:42:55 +02:00
Knut Sveidqvist
c3aad38628
Merge pull request #3272 from Olshansk/patch-1
...
Example of spaces in stateDiagram
2022-08-04 17:00:13 +02:00
Knut Sveidqvist
6f7670e5ff
Merge pull request #3271 from heyfirst/docs/fix/font-awesome
...
fix: add font-awesome css to docsify index.html
2022-08-04 16:58:08 +02:00
Andrii Dembitskyi
38d243c63f
Fix references to docs from readme
2022-08-03 16:29:36 -04:00
Daniel Olshansky
f5c2901b3f
Example of spaces in stateDiagram
...
This example was originally shown by https://github.com/aleneum in https://github.com/mermaid-js/mermaid/issues/1342 .
2022-07-31 14:49:43 -07:00
Kanisorn Sutham
dd4459f813
doc: add font-awesome version warning message
2022-07-31 21:08:27 +03:00
Kanisorn Sutham
01d84fdacf
fix: update font-awesome to version v5.9.0
2022-07-31 20:51:15 +03:00
Kanisorn Sutham
9f8024d836
fix: add font-awesome css to docsify index.html
2022-07-31 20:26:10 +03:00
Leo Toff
d4c1f14bd6
Fix broken links
...
Replace `./docs/<markdown_page.md>` with `./<markdown_page.md>`
2022-07-29 11:04:42 -07:00
Hunter Laux
5d5affca33
Fix typo
...
Missing 'r' in controller
2022-07-21 16:10:59 -07:00
Knut Sveidqvist
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
Knut Sveidqvist
e1de0873cd
Merge branch 'develop' into 3061_refactoring_and_modularisation
2022-07-18 16:04:56 +02:00
Knut Sveidqvist
4c30e03f1e
Using diagram api to add gitGraph
2022-07-18 16:00:03 +02:00
mmorel-35
0cc8537d7d
chore: update browsers list
2022-07-11 07:03:29 +00:00
ashishj
1ae2624197
Merge branch 'release/9.1.3'
2022-06-28 20:11:06 +02:00
ashishj
1509ee68be
Updated the release version to 9.1.4
2022-06-28 20:02:51 +02:00
Ashish Jain
1f4c1c3a6c
Merge pull request #3140 from mermaid-js/#3095-Gitgrph-Font-Size
...
#3095 Added support for commit & tag label font size
2022-06-28 19:11:16 +02:00
Ashish Jain
cc45f3ca01
Merge pull request #3151 from pinghe/develop
...
Add C4 Diagram. Compatible with C4-PlantUML syntax (2). #3038
2022-06-28 19:10:42 +02:00
yutotnh
0d6109c7a8
Merge branch 'develop' into fix-typo
2022-06-27 12:43:55 +09:00
Vardan
ef5c753e32
update doc typos/clarity ( #3145 )
...
* update doc typos/clarity
* missed fix
2022-06-26 11:12:35 +02:00
Sidharth Vinod
4b78a2106d
Update links to mermaid.live ( #3163 )
...
* chore: update browsers list
* Re enable markdown & jsdoc linting.
* Update links to `mermaid.live`
Co-authored-by: sidharthv96 <sidharthv96@users.noreply.github.com>
2022-06-24 07:41:22 +02:00
yutotnh
ca909edbed
fix: Typo for documents and comments
2022-06-22 12:39:10 +09:00
pinghe
0c5b4948cf
Update docs.
2022-06-20 16:04:30 +08:00
pinghe
b0d65169ab
Updated the documentation on how to use C4.
2022-06-18 23:45:21 +08:00
ashishj
e29c3d6125
#3095 Added support for commit & tag label font size
2022-06-14 20:36:26 +02:00
ashishj
ef3c1c878c
Merge branch 'release/9.1.2'
2022-06-14 19:44:21 +02:00
ashishj
3b8d74f1f9
Updated release version to 9.1.2
2022-06-14 19:30:31 +02:00
ashishj
113efd1150
Added placeholder docs fro C4C diagram
2022-06-14 18:27:15 +02:00
