From b8ef76f130adad83f5a3db7c07d18d9be737e2ff Mon Sep 17 00:00:00 2001 From: SilvM Date: Mon, 19 Apr 2021 10:11:01 +0800 Subject: [PATCH 1/3] Add joplin to integrations https://joplinapp.org/markdown/#diagrams --- docs/integrations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations.md b/docs/integrations.md index 8a60d2a4f..c3a621cd6 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -9,6 +9,7 @@ They also serve as proof of concept, for the variety of things that can be built - [GitLab](https://docs.gitlab.com/ee/user/markdown.html#diagrams-and-flowcharts) (**Native support**) - [Azure Devops](https://docs.microsoft.com/en-us/azure/devops/project/wiki/wiki-markdown-guidance?view=azure-devops#add-mermaid-diagrams-to-a-wiki-page) (**Native support**) +- [Joplin](https://joplinapp.org) (**Native support**) - [GitHub](https://github.com) - [Github action: Compile mermaid to image](https://github.com/neenjaw/compile-mermaid-markdown-action) - [svg-generator](https://github.com/SimonKenyonShepard/mermaidjs-github-svg-generator) From 646a76570f2bd8682c624269f6acdcf02a30a1fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Apr 2021 15:38:22 +0000 Subject: [PATCH 2/3] Bump ssri from 6.0.1 to 6.0.2 Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9fe973712..38eeae851 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4711,9 +4711,9 @@ fecha@^2.3.3: integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== figures@^1.7.0: version "1.7.0" @@ -9813,9 +9813,9 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" From 9734bfc4a035c9d171e4c65fe2ab880dc3d67de1 Mon Sep 17 00:00:00 2001 From: Aniston Date: Wed, 21 Apr 2021 01:29:12 +0200 Subject: [PATCH 3/3] dateFormat must not have ':' --- docs/theming.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/theming.md b/docs/theming.md index 1b7cc87a5..70adc4a99 100644 --- a/docs/theming.md +++ b/docs/theming.md @@ -461,7 +461,7 @@ classDiagram ### Gantt ``` gantt - dateFormat :YYYY-MM-DD + dateFormat YYYY-MM-DD title Adding GANTT diagram functionality to mermaid excludes :excludes the named dates/days from being included in a charted task.. section A section @@ -491,7 +491,7 @@ gantt ```mermaid gantt - dateFormat :YYYY-MM-DD + dateFormat YYYY-MM-DD title Adding GANTT diagram functionality to mermaid excludes :excludes the named dates/days from being included in a charted task.. section A section