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

1899 Commits

Author SHA1 Message Date
ashishj 3cb926727c Fixing failing test cases 2022-05-06 20:14:36 +02:00
Knut Sveidqvist 6528a0cfb6
Merge pull request #3010 from mermaid-js/GitGraph_mainBranchOrdering 
Added support to change the position of the main branch
 2022-05-06 19:48:05 +02:00
Knut Sveidqvist 65143a0182 #2732 Regression fixes for accessibility 2022-05-06 19:42:40 +02:00
ashishj 3ef7d6fbc6 Added support to change the position of the main branch 2022-05-06 19:37:32 +02:00
Tim Maffett c8e5525899
Merge branch 'develop' into parse_parseError_fixes 2022-05-06 09:24:49 -07:00
Knut Sveidqvist 3b94850084
Merge branch 'develop' into 2732_accesible_charts 2022-05-06 18:10:23 +02:00
Knut Sveidqvist d8682cfb5f #2732 rendering the title and descr fields for the gitGraph 2022-05-06 17:40:40 +02:00
Ashish Jain 1602755330
Merge pull request #3002 from husa/feature/2937-gitgraph-branch-ordering 
GitGraph: add support for branch ordering
 2022-05-06 17:38:06 +02:00
Knut Sveidqvist 572b29b35f Merge branch 'develop' into 2732_accesible_charts 2022-05-06 17:17:59 +02:00
Tim Maffett f7c28ff31e
Merge branch 'mermaid-js:develop' into parse_parseError_fixes 2022-05-05 11:52:23 -07:00
Tim Maffett ca8080a371 add more test for mermaidAPI.parse() to ensure it matches documented behavior 2022-05-05 11:50:11 -07:00
Tim Maffett 67b6414693 fix parse() to match spec (return true if valid, false if invalid (and a parseError handler is defined)) 2022-05-05 11:48:53 -07:00
Tim Maffett 8210e3c80a add setParseErrorHandler,check for undefined mermaidAPI before using 2022-05-05 11:47:46 -07:00
dependabot[bot] 52fbc604b8
chore(deps-dev): bump jest from 27.5.1 to 28.0.3 (#2995) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yash-Singh1 <saiansh2525@gmail.com>
 2022-05-04 17:42:11 -07:00
Yuriy Husnay d740fa5acf add support for branch ordering 2022-05-04 18:04:41 +03:00
Knut Sveidqvist ed56e4858a Cleanup 2022-04-30 16:14:43 +02:00
Knut Sveidqvist fdd7af9089 Adding acc to gitGrapg parser 2022-04-30 16:06:53 +02:00
Knut Sveidqvist e917347b81 Removing logging, cleanup 2022-04-30 15:54:03 +02:00
Knut Sveidqvist 3baf31695e Updated user state diagram parsing with the new syntax 2022-04-30 15:50:02 +02:00
Knut Sveidqvist ae91f794d6 Updated user journey diagram parsing with the new syntax 2022-04-30 15:44:03 +02:00
Knut Sveidqvist 34ffe2790b Updated sequence diagram parsing with the new syntax 2022-04-30 15:35:34 +02:00
Knut Sveidqvist a642ae356c Updated requirement diagram parsing with the new syntax 2022-04-30 15:22:51 +02:00
Knut Sveidqvist a401e44180 Updated pie parsing with the new syntax + fix for flowDb 2022-04-30 15:13:28 +02:00
Knut Sveidqvist 8372d4952e Updated gantt parsing with the new syntax 2022-04-30 15:07:13 +02:00
Knut Sveidqvist 5f4b7ae369 Updated er diagrams with the new syntax 2022-04-30 15:00:50 +02:00
Knut Sveidqvist 5e6b4d73e1 Updated classdiagrams with the new syntax 2022-04-30 14:54:24 +02:00
Knut Sveidqvist 85e157f0d3 Updated flowcharts with the new syntax 2022-04-30 11:36:00 +02:00
Tim Maffett 0127238645 protect config.js from attempting to use invalid theme name 2022-04-29 17:46:19 -07:00
Yash-Singh1 dc53699a96 chore: fix a few security vulnerabilities 2022-04-28 19:29:56 -07:00
ashishj b30790cac4 Added default new line in the diagram text before parsing for special case where code is trimmed 2022-04-28 20:09:42 +02:00
Knut Sveidqvist d914e23626 Fix for hideUnusedParticipants 2022-04-28 18:45:18 +02:00
ashishj 386f3c7ce9 Merge branch 'develop' into feature/hideUnusedParticipants_1210 2022-04-28 17:38:48 +02:00
Hans Petersen 3fcc43efdd Sequence autonumbering and Git fix options parsing 2022-04-28 14:25:25 +02:00
ashishj 170ed89e9e Merge branch 'master' into develop 2022-04-21 22:08:29 +02:00
ashishj b472fb4f73 Retain attribute dominant-baseline in DOMpurify sanitization 2022-04-21 22:02:11 +02:00
ashishj a6299d8334 Fix for broken gitGraph for Mermaid Live Editor 2022-04-21 21:33:49 +02:00
Knut Sveidqvist c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update 
Removal of vulnerability
 2022-04-21 21:25:08 +02:00
Knut Sveidqvist df87ab8818 Fix for vulnerability 2022-04-21 21:11:48 +02:00
Ashish Jain a3e6d3cd76
Merge pull request #2954 from husa/feature/2936-gitgraph-pathed-branch-name 
GitGraph: add support for "pathed" branches. fix #2936
 2022-04-21 20:11:39 +02:00
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