mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,129 Commits 167 Branches 138 Tags 338 MiB
Commit Graph

5129 Commits

Author SHA1 Message Date
ashishj 4a0321fe3e Merge branch 'master' into develop 2022-05-10 20:52:20 +02:00
ashishj 48eb871ab5 #3023 Updated the directives documention 2022-05-10 20:51:55 +02:00
Knut Sveidqvist e306fcc795 merge 2022-05-10 20:37:39 +02:00
Knut Sveidqvist 3a2650dc6d Merge branch 'applitools' 2022-05-10 20:34:29 +02:00
Knut Sveidqvist eadbf595ba Adding applitools to inegration tests 2022-05-10 20:33:55 +02:00
ashishj 20c4a68aa8 Merging release 9.1.0 to develop 2022-05-10 18:51:21 +02:00
ashishj 8889b05d29 Updating the release version to 9.1.0 2022-05-10 18:28:14 +02:00
Knut Sveidqvist 5ec5ebf94b #2951 Fix for styling issue on labes when using htmlLabels in legacy flowcharts 2022-05-10 17:45:16 +02:00
Knut Sveidqvist 6cea0fd835 #2951 Fix for styling issue on labes when using htmlLabels in legacy flowcharts 2022-05-10 17:45:12 +02:00
Knut Sveidqvist 4fabf91e16
Merge pull request #3016 from mermaid-js/dependabot/npm_and_yarn/develop/husky-8.0.0 
chore(deps-dev): bump husky from 7.0.4 to 8.0.0
 2022-05-10 17:05:44 +02:00
Knut Sveidqvist 8ed7ea6b36
Merge pull request #3015 from mermaid-js/dependabot/npm_and_yarn/develop/eslint-8.15.0 
chore(deps-dev): bump eslint from 8.14.0 to 8.15.0
 2022-05-10 17:05:31 +02:00
Knut Sveidqvist 99f0eecb86
Merge pull request #3014 from mermaid-js/dependabot/npm_and_yarn/develop/webpack-dev-server-4.9.0 
chore(deps-dev): bump webpack-dev-server from 4.8.1 to 4.9.0
 2022-05-10 17:05:17 +02:00
Knut Sveidqvist 996e8ef9b8
Merge pull request #3013 from mermaid-js/dependabot/npm_and_yarn/develop/babel-jest-28.1.0 
chore(deps-dev): bump babel-jest from 28.0.3 to 28.1.0
 2022-05-10 17:01:19 +02:00
Knut Sveidqvist 734cef9017
Merge pull request #3004 from timmaffett/parse_parseError_fixes 
fix mermaidAPI.parse() behavior to match documentation, add tests to ensure behavior matches docs
 2022-05-10 17:00:22 +02:00
dependabot[bot] 0856d2e82c
chore(deps-dev): bump babel-jest from 28.0.3 to 28.1.0 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 28.0.3 to 28.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v28.1.0/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 01:23:21 +00:00
dependabot[bot] a8000bf51b
chore(deps-dev): bump webpack-dev-server from 4.8.1 to 4.9.0 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.8.1 to 4.9.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 01:22:45 +00:00
dependabot[bot] 24f181afc8
chore(deps-dev): bump eslint from 8.14.0 to 8.15.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.14.0 to 8.15.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.14.0...v8.15.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 01:20:15 +00:00
Yash-Singh1 97cc8a4afe docs: add coffeescript highlighting 2022-05-09 18:17:04 -07:00
Yash-Singh1 4c1cf345fc chore: rm classDiagram debug file 2022-05-09 18:05:18 -07:00
mmorel-35 01cdd28938 chore: update browsers list 2022-05-09 07:03:52 +00:00
dependabot[bot] 7198b6884c
chore(deps-dev): bump husky from 7.0.4 to 8.0.0 
Bumps [husky](https://github.com/typicode/husky) from 7.0.4 to 8.0.0.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v7.0.4...v8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 07:02:28 +00:00
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
Ashish Jain da548f1970
Merge pull request #3008 from mermaid-js/2732_accesible_charts 
2732 accesible charts
 2022-05-06 18:43:43 +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
Knut Sveidqvist c883631e50
Merge pull request #3005 from lexmin0412/doc/update-zh-readme 
Doc/update zh readme
 2022-05-06 17:11:54 +02:00
张乐 4269125838 docs(README.zh-CN): add tutorials link 2022-05-06 03:24:44 +08:00
张乐 0a0c5cae94 docs(README.zh-CN): update Chinese README 2022-05-06 03:10:10 +08: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 0df80d2b52 fix parseError documentation to match reality 2022-05-05 11:49:27 -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
dependabot[bot] 8060fd8890
chore(deps-dev): bump @babel/core from 7.17.9 to 7.17.10 (#2996) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-04 16:57:35 -07:00
Yuriy Husnay d740fa5acf add support for branch ordering 2022-05-04 18:04:41 +03:00
Knut Sveidqvist ae0570e4cd
Merge pull request #2991 from mermaid-js/dependabot/npm_and_yarn/develop/babel/preset-env-7.17.10 
chore(deps-dev): bump @babel/preset-env from 7.16.11 to 7.17.10
 2022-05-04 07:25:21 +02:00
dependabot[bot] f0563c861a
chore(deps-dev): bump @babel/preset-env from 7.16.11 to 7.17.10 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.11 to 7.17.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.10/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-03 05:52:48 +00:00
Knut Sveidqvist d75455aca3
Merge pull request #2999 from Lance-DC/patch-1 
Fix typos in gitgraph.md
 2022-05-03 07:48:34 +02:00
Knut Sveidqvist 721e737918
Merge pull request #2992 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/cli-16.2.4 
chore(deps-dev): bump @commitlint/cli from 16.2.3 to 16.2.4
 2022-05-03 07:47:35 +02:00
Knut Sveidqvist 97e64f0125
Merge pull request #2993 from mermaid-js/dependabot/npm_and_yarn/develop/lint-staged-12.4.1 
chore(deps-dev): bump lint-staged from 12.4.0 to 12.4.1
 2022-05-03 07:47:18 +02:00
Knut Sveidqvist 40992e857e
Merge pull request #2994 from mermaid-js/dependabot/npm_and_yarn/develop/eslint-plugin-jsdoc-39.2.9 
chore(deps-dev): bump eslint-plugin-jsdoc from 39.2.8 to 39.2.9
 2022-05-03 07:47:06 +02:00
Knut Sveidqvist 97cf52976f
Merge pull request #2997 from mermaid-js/dependabot/npm_and_yarn/develop/commitlint/config-conventional-16.2.4 
chore(deps-dev): bump @commitlint/config-conventional from 16.2.1 to 16.2.4
 2022-05-03 07:46:33 +02:00
Knut Sveidqvist a2ffad8f97
Merge pull request #2998 from mermaid-js/dependabot/npm_and_yarn/develop/cypress-9.6.0 
chore(deps-dev): bump cypress from 9.5.4 to 9.6.0
 2022-05-03 07:46:21 +02:00