Commit Graph

3889 Commits

Author SHA1 Message Date
Knut Sveidqvist c04aac4ae0
Merge pull request #2255 from mermaid-js/2253_class_diagram_v2_fixes
2253 class diagram v2 fixes
2021-08-19 19:31:29 +02:00
Ashish Jain 798a0ad783 Fix for broken Pie Diagram for d3 v6 upgrade 2021-08-19 19:04:14 +02:00
Matthieu MOREL 935cc3b098
use right tag for andymckay/labeler 2021-08-19 18:55:42 +02:00
Ashish Jain 5ef2ad5536 Fix for classDiagram-v2 support for cardinality 2021-08-19 18:48:19 +02:00
Ashish Jain 0276a67417 Fix for classDiagram-v2 support for generics using '~' & method emphasis 2021-08-19 18:00:49 +02:00
Ashish Jain 46a3d10e8a Fix for classDiagram-v2 support for generics using '~' 2021-08-19 17:51:22 +02:00
Knut Sveidqvist d09dea7e5e
Merge pull request #2224 from mmorel-35/2196_fix_e2e
2196 fix e2e
2021-08-19 16:47:47 +02:00
MOREL Matthieu 55faa3cb1a yarn build and adapt e2e tests
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-18 16:49:00 +02:00
Reet Ghosh d9a9eb56a7
Fixed Unequal Arrow Bug 2021-08-17 22:52:10 +05:30
Yash Singh 5237729a6d
Add nano to integrations 2021-08-15 13:44:28 -07:00
RonaldZielaznicki 3383da514a Update ER Diagram to have keys and comments.
Update ER Diagrams to have keys and comments.
2021-08-12 16:18:54 -04:00
Knut Sveidqvist 3d7091a9e2 Merge branch 'master' of github.com:mermaid-js/mermaid 2021-08-11 18:32:15 +02:00
Knut Sveidqvist d1759228cc Updated banner 2021-08-11 18:32:12 +02:00
Knut Sveidqvist 768536b9e2
Adding banner for the book about Mermaid 2021-08-11 18:28:35 +02:00
Ashish Jain 8f0b19f427 Updated banner position for the mermaid book 2021-08-11 18:28:25 +02:00
Knut Sveidqvist 972f6a0ea9 Merge branch 'master' of github.com:mermaid-js/mermaid 2021-08-11 18:25:10 +02:00
Knut Sveidqvist 9c55dec6ba Merge branch 'master' of github.com:mermaid-js/mermaid 2021-08-11 18:23:00 +02:00
Knut Sveidqvist 06715be05f Banner for Mermaid book 2021-08-11 18:22:56 +02:00
Ashish Jain 8f8169b8e4 Added Mermaid book banners 2021-08-11 18:14:24 +02:00
Ashish Jain 313aa11528 Added Mermaid book banners 2021-08-11 17:57:49 +02:00
Knut Sveidqvist 2ccd9feae7 Merge branch 'master' into develop 2021-08-07 18:43:01 +02:00
Knut Sveidqvist fa3735b033 Adding landing page for book 2021-08-07 18:36:19 +02:00
Daniel Sitnik adfceaf20b
add Codedoc plugin 2021-08-06 11:19:23 -03:00
Knut Sveidqvist 8af36b742e Merge branch 'master'
Conflicts:
	dist/mermaid.core.js
	dist/mermaid.core.js.map
	dist/mermaid.js
	dist/mermaid.js.map
	dist/mermaid.min.js
	dist/mermaid.min.js.map
2021-08-05 20:08:37 +02:00
Knut Sveidqvist a670b67844 Merge branch 'release/8.11.4' 2021-08-05 19:58:47 +02:00
Knut Sveidqvist e8fc810b8d Release build 2021-08-05 19:57:24 +02:00
Knut Sveidqvist b6648283c2 Removed some log statements 2021-08-05 19:53:11 +02:00
Knut Sveidqvist b29979bfd9 Fix for broken test 2021-08-05 18:58:42 +02:00
Knut Sveidqvist 7e346a56ff Lint fix 2021-08-05 18:18:18 +02:00
Knut Sveidqvist 719480cf76 Updated preview version to 7 2021-08-05 18:05:24 +02:00
Knut Sveidqvist 92f1b9c079 Beta preview version 2021-08-05 17:42:55 +02:00
Knut Sveidqvist c0831ecef6 Using Whitelist in all places 2021-08-05 17:35:28 +02:00
Knut Sveidqvist d3ae43c4ba Version update 2021-08-05 07:42:52 +02:00
Knut Sveidqvist a4e01dd8e9 preview version 2021-08-05 01:15:34 +02:00
Knut Sveidqvist 88e195408c Lint fixes 2021-08-05 01:13:13 +02:00
Knut Sveidqvist f77ae2b045 Switch preview release 2021-08-05 01:08:26 +02:00
Knut Sveidqvist 655ff2675e #2219 Excluding using a black list as well 2021-08-05 01:07:35 +02:00
Knut Sveidqvist 37fae09ce4 #2219 Validating directives agains list of legal configuration keys 2021-08-05 01:05:34 +02:00
Knut Sveidqvist 711fb7d748 #2219 UnFrezing object to not cause other downstream issues 2021-08-05 00:52:10 +02:00
Knut Sveidqvist f8891beb0a #2219 Frezing object to protect the prototype 2021-08-05 00:40:21 +02:00
Knut Sveidqvist 61a401b119 Merge branch 'mmorel-35-2177_dependency_updates_bis' into develop 2021-08-04 20:07:03 +02:00
Knut Sveidqvist 5dd78c18da Updated mermaid bundles 2021-08-04 20:04:47 +02:00
Knut Sveidqvist eb4ac5c103 Merge 2021-08-04 20:02:16 +02:00
Knut Sveidqvist af7f5d0aaf Merge branch 'release/8.11.3' 2021-08-04 19:25:59 +02:00
Knut Sveidqvist 7275b215b8 Release 8.11.3 2021-08-04 19:24:50 +02:00
Knut Sveidqvist 6fa6503515 Merge branch '2219_prototype_handling' into develop 2021-08-03 20:23:13 +02:00
Knut Sveidqvist 73ff972789 #2219 Moving check earlier in the chain for better effect 2021-08-03 20:10:15 +02:00
dependabot[bot] a51bfd6a04
Bump @babel/preset-env from 7.14.8 to 7.14.9 (#41)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.8 to 7.14.9.
- [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.14.9/packages/babel-preset-env)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-02 12:38:08 +02:00
dependabot[bot] b8cda6616f
Bump @babel/eslint-parser from 7.14.7 to 7.14.9 (#42)
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.14.7 to 7.14.9.
- [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.14.9/eslint/babel-eslint-parser)

---
updated-dependencies:
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-02 12:37:55 +02:00
dependabot[bot] 1aa5388aaf
Bump @percy/cli from 1.0.0-beta.61 to 1.0.0-beta.62 (#40)
Bumps [@percy/cli](https://github.com/percy/cli/tree/HEAD/packages/cli) from 1.0.0-beta.61 to 1.0.0-beta.62.
- [Release notes](https://github.com/percy/cli/releases)
- [Commits](https://github.com/percy/cli/commits/v1.0.0-beta.62/packages/cli)

---
updated-dependencies:
- dependency-name: "@percy/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-01 08:46:20 +02:00