mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,766 Commits 158 Branches 138 Tags 344 MiB
Commit Graph

1860 Commits

Author SHA1 Message Date
Ashish Jain 1947af0693
Merge pull request #2955 from husa/feature/2934-gitgraph-support-merge-tags 
GitGraph. Support tags for merge commits
 2022-04-21 20:09:31 +02:00
ashishj 8966639e65 Fix for broken gitGraph for Mermaid Live Editor 2022-04-21 18:16:22 +02:00
Mindaugas Laganeckas 473aced449
Add initThrowsErrors() (#2379) 
* Add initThrowsErrors()

* Update mermaid.js

* Update mermaid.js
 2022-04-19 17:21:10 +02:00
Yuriy Husnay 3f812326a6 gitgraph #2934 support tags for merge commits 2022-04-19 18:02:41 +03:00
Yuriy Husnay 99a8c0d152 fix #2936 add support for "pathed" branches 
allow "/" in branch names
 2022-04-19 17:42:02 +03:00
Yash-Singh1 4c93870580 feat: add hideUnusedParticipants and some cleanup 2022-04-14 19:19:18 -07:00
Yash Singh 37f6a42de8
fix: clear state before error; closes #2931 (#2932) 2022-04-12 19:04:00 -07:00
Knut Sveidqvist 0935fb0790 Lint fix 2022-04-12 07:40:01 +02:00
Knut Sveidqvist cda21c50ac
Merge branch 'develop' into kh-user-journey 2022-04-12 07:36:33 +02:00
Knut Sveidqvist 7aa037ee60
Merge pull request #2917 from therzka/accessible-state-diagrams 
feat: add accDescription field to state diagrams
 2022-04-12 07:31:55 +02:00
Knut Sveidqvist 491933f114 Link fix 2022-04-12 07:26:18 +02:00
Knut Sveidqvist 6052636a62
Merge branch 'develop' into cg-sanitize 2022-04-12 07:20:31 +02:00
Knut Sveidqvist 7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access 
feat: Add accessibility fields to requirements diagram
 2022-04-12 07:19:40 +02:00
Knut Sveidqvist e48d60f4cf Linting changes to fix build 2022-04-12 07:16:14 +02:00
Knut Sveidqvist 4f833db2d0
Merge pull request #2913 from lindseywild/feat/flowchart-accessibility 
feat: adds title and description to flowchart
 2022-04-12 07:09:10 +02:00
Knut Sveidqvist 266bce45f2
Merge pull request #2912 from el-mapache/feat/gantt-diagram-accessibility 
Adds accDescription to Gantt, draws tags to svg
 2022-04-12 07:06:41 +02:00
Kate Higa a7527e6f88 fix test issue to ensure description is clearable 2022-04-08 13:35:48 -07:00
Kate Higa 6a57c99335 fix lint issues 2022-04-08 13:24:33 -07:00
Kate Higa 6b4eaa185e add journey tests for accDescription 2022-04-08 13:07:52 -07:00
Kate Higa 81b982ac20 feat: add accDescription along with test page 2022-04-08 12:57:42 -07:00
Tali Herzka 897c4259ed add title getters and setters, add spec for stateDiagram-v2 2022-04-08 18:44:22 +00:00
Tali Herzka 9eb18e78c3 add title to jison 2022-04-08 18:43:57 +00:00
Tali Herzka c1a17d9fce revert change to accessibility.js 2022-04-08 18:42:37 +00:00
Tali Herzka df993f977c add/remove semicolons 2022-04-08 18:03:31 +00:00
Cory Gwin 5452cedc51 always use the same setup 2022-04-08 13:38:57 +00:00
Tali Herzka 49409241bc Add accDescription field to state diagrams 2022-04-07 21:35:13 +00:00
Adam B e5345f209c Sanitize user input for accessibility nodes 
* Adds accDescription to demos/gantt.html
 2022-04-07 15:34:53 -04:00
ashishj 0c5252594e Merge branch 'master' into develop 2022-04-07 21:06:04 +02:00
Lindsey Wild e2ec7fd653 feat: adds text sanitization, refactors function 2022-04-07 14:58:36 -04:00
Lindsey Wild 7a5149e39e feat: adds title and description to flowchart 2022-04-07 14:42:13 -04:00
Cory Gwin d36f45ec58 feat: add sanitization consistently 2022-04-07 18:36:30 +00:00
Knut Sveidqvist 380688c16a
Merge pull request #2879 from adam-hotait/develop 
fix(sequencediagram): draw arrowheads on top of activation boxes
 2022-04-07 20:33:17 +02:00
Cory Gwin 1d269f07e3
Update src/diagrams/requirement/requirementRenderer.js 
Co-authored-by: Lindsey Wild <35239154+lindseywild@users.noreply.github.com>
 2022-04-07 14:22:47 -04:00
ashishj 8b29fbe98e Updating Gitgraph docs 2022-04-07 20:13:15 +02:00
Cory Gwin 3d7cb212c0 feat: Add accessibility fields to requirements diagram 2022-04-07 18:02:48 +00:00
Knut Sveidqvist f2e77917d7
Merge pull request #2911 from gwincr11/cg-class-diagram-accessibility 
Class diagram accessibility
 2022-04-07 19:57:27 +02:00
Knut Sveidqvist bed475b229
Merge pull request #2914 from mermaid-js/1252_gitgraph_reinvented 
#1252 Adding configuration options and some cleanup, swich of graphType
 2022-04-07 18:35:59 +02:00
Knut Sveidqvist 87b56bdd9a #1252 Adding confuration options and some cleanup, swicth of graphType from git to gitGraph 2022-04-07 18:22:06 +02:00
Adam B 65b0b83625 Adds accDescription, draws tags to svg 2022-04-07 10:05:54 -04:00
Cory Gwin bfca242958 feat(:accessibility): Add accessibility fields to class chart 2022-04-07 13:56:23 +00:00
Adam Hotait d3ba48a1b7
fix(sequencediagram): draw arrowheads on top of activation boxes 2022-04-04 13:00:59 +02:00
Knut Sveidqvist 44877545e5
Merge pull request #2832 from gwincr11/cg-accessibility 
ER and Sequence Chart Accessibility
 2022-03-31 21:01:31 +02:00
ashishj 57ac111d05 Added commit types in renderer 2022-03-31 20:52:27 +02:00
ashishj 51e9a6b3aa Added sanitization for gitGraph 2022-03-31 20:12:06 +02:00
Knut Sveidqvist 3ccf027f42 Removing random label for merge commits 2022-03-31 20:06:31 +02:00
ashishj 12c63ff007 Finalizing GitGraph with directives, theming & docs 2022-03-31 19:37:36 +02:00
Knut Sveidqvist f6421734a2 Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-31 19:16:31 +02:00
Knut Sveidqvist be92c70b1b Autofix 2022-03-31 19:15:01 +02:00
Cory Gwin 50f522ae5c feat: adding more accessibility tooling 2022-03-31 13:21:56 +00:00
Knut Sveidqvist 22aca7b3ee #1252 Adding background on commit labels 2022-03-25 08:56:22 +01:00
Knut Sveidqvist c0335cf5fb #1252 Adding support for tags 2022-03-24 20:25:22 +01:00
ashishj a29e2e6baa Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-24 17:29:36 +01:00
dependabot[bot] 17857d3ea9
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31 (#2822) 
* chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31

Bumps [prettier-plugin-jsdoc](https://github.com/hosseinmd/prettier-plugin-jsdoc) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/hosseinmd/prettier-plugin-jsdoc/releases)
- [Changelog](https://github.com/hosseinmd/prettier-plugin-jsdoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hosseinmd/prettier-plugin-jsdoc/compare/v0.3.30...v0.3.31)

---
updated-dependencies:
- dependency-name: prettier-plugin-jsdoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update config.js

* Update defaultConfig.js

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
 2022-03-21 21:45:45 +01:00
Ashish Jain a9194d4eaa Added test cases for error handling 2022-03-17 20:40:35 +01:00
Knut Sveidqvist 4023be1e84 Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented 2022-03-17 20:07:30 +01:00
Knut Sveidqvist b78b371025 Added theming support for gitgraph 2022-03-17 20:07:27 +01:00
Ashish Jain 501e62894b Added gitGraph jest test cases 2022-03-17 19:07:57 +01:00
Ashish Jain c1dead1187 Added branch, merge and checkout error handling scenarios 2022-03-17 19:06:31 +01:00
Ashish Jain 01970d2bbd fix broken rendering for math error 2022-03-17 19:05:19 +01:00
Ashish Jain 243f2b28cd fix for gitGraph (:) and spaces (new line) issue 2022-03-17 19:04:37 +01:00
Knut Sveidqvist 9f7130a3e6 Merge branch 'develop' into 1252_gitgraph_reinvented 2022-03-17 18:03:40 +01:00
Knut Sveidqvist b84cd155dd
Merge pull request #2831 from gwincr11/cg-custom-dompurify-config 
Add dompurify config option
 2022-03-17 18:01:19 +01:00
Knut Sveidqvist 0a8a0790cf Renedring fix in an edge case 2022-03-17 17:35:45 +01:00
Cory Gwin 0181cbf743 feat(accessibility): add accessibility attributes to sequence diagrams 2022-03-17 16:18:10 +00:00
Cory Gwin c6c9b88292 feat(config): add dompurify config option 2022-03-17 14:34:52 +00:00
kerwin612 4f5cab7f4c fix: autonumber bug 2022-03-11 16:32:04 +08:00
Ashish Jain 7bd9286a9b fix checkout if branch already exist 2022-03-10 20:08:26 +01:00
Knut Sveidqvist 781b239d0d Lint fixes 2022-03-10 19:58:56 +01:00
Knut Sveidqvist 2b3f99d0e9 Draft handling of occupied lanes 2022-03-10 19:54:19 +01:00
Knut Sveidqvist 4ff3b23da5 feat: adding highlight and reverse commit types and some pathfinding 2022-03-10 19:34:49 +01:00
Ashish Jain 9ddf138683 fix check if branch already exist 2022-03-10 18:34:50 +01:00
Knut Sveidqvist 8cb548d30d Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented 2022-03-03 19:58:47 +01:00
Knut Sveidqvist b1fab6ffcd Theming changes for base theme 2022-03-03 19:58:43 +01:00
Ashish Jain 5a8c372666 update gitgraph jison 2022-03-03 19:58:28 +01:00
Ashish Jain 56a1c27907 added merge commit type 2022-03-03 19:10:34 +01:00
Knut Sveidqvist 7e041dd921 Arrows colored by branch and skip of arrow heads 2022-03-03 18:56:27 +01:00
Knut Sveidqvist 1f175d2d84 Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented 2022-03-03 17:30:00 +01:00
Knut Sveidqvist b110567517 Bends of the lines when branching 2022-03-03 17:29:14 +01:00
Dirkjan Bussink 7b0c3c3cd5
fix: update to latest version of sanitize-url 
There's been a bunch of security issues in the older versions of sanitize-url that this resolves.
 2022-03-03 15:26:12 +01:00
Ashish Jain bc9ff496f2 Clean up gitg=Graph JISON 2022-02-24 19:55:16 +01:00
Cory Gwin 4ec1c608a3
small bug with the id on the title 2022-02-24 13:31:27 -05:00
Ashish Jain 14464f9fba merge develop to current branch 2022-02-24 19:24:42 +01:00
Ashish Jain 286f6e52f0 Adding sanitization to input fields for Pie chart 2022-02-24 19:17:37 +01:00
Ashish Jain 908b704a42
Merge pull request #2747 from gwincr11/cg-pie-chart-accessibility 
feat: add accessibility title and description to pie chart
 2022-02-24 19:00:07 +01:00
Ashish Jain f95de5c6d9
Merge pull request #2740 from Guy-Adler/feature/2391_double_circle 
Double Circle Node Shape
 2022-02-24 18:45:50 +01:00
Ashish Jain 933efd0dda replace mock data with real 2022-02-24 18:40:22 +01:00
Knut Sveidqvist 4753ae8ac0 feature: adding arrows to the git graph 2022-02-24 18:08:09 +01:00
Cory Gwin 0b815c7782 feat: add accessibility title and description to pie chart 
* Reuse the title as the title element
* Add description to the parser and then render
 2022-02-23 02:23:57 +00:00
Knut Sveidqvist cc826289c6 Rendering commits and commit labels 2022-02-17 20:14:05 +01:00
Ashish Jain 7098bf9185 fix: update mockDB 2022-02-17 19:41:54 +01:00
Knut Sveidqvist 43854a2921 Merge branch 'master' into develop 2022-02-17 18:25:00 +01:00
Ashish Jain ffc6cae7f5 fix: adding gitgraph to default config 2022-02-17 18:12:17 +01:00
Ashish Jain 40f95a5dc1 chore: merge branch 'develop' into 1252_gitgraph_reinvented 2022-02-17 17:48:48 +01:00
Guy Adler 04454cece0
fix: changed open and close markers as recommended 
chnged from `()(` and `())` to `(((` and `)))`
 2022-02-17 17:22:38 +01:00
Guy Adler d8c7a2894e
test: removed unit test for double circle in the flowRendererv1 
The feature is only available using flowRendererv2, which does not have unit tests.
 2022-02-17 10:37:07 +01:00
Guy Adler 1e4be4eb6a
removed unnecessary console.log 2022-02-16 23:53:08 +01:00
Guy Adler e1f0e69263
feat(flowchart): implement double circle node 
The implementation uses two circles, inside each other.
A double circle node is opend with `()(` and closed with `)()`.
 2022-02-16 23:05:46 +01:00
Daniel Bartholomae 74b1219d62
fix(2689): use correct default sans-serif fonts for actors and tasks 
The previous default font, Open-Sans, does not exist (it is Open Sans).
A generic font family must not be in quotes.
There is no changes to tests, as tests set font-family to Courier
for reproducability.

Fixes 2689
See https://fonts.google.com/specimen/Open+Sans
and https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
 2022-02-15 14:21:04 +01:00
Ashish Jain bb2dd2f5f3 getting there 2022-02-10 20:32:21 +01:00
Knut Sveidqvist 882ba03fcb fix: handling diagram width in sandbox mode 2022-02-03 19:54:24 +01:00