From bd927b5b7a7056b5be619eb1e6e9142a847c0114 Mon Sep 17 00:00:00 2001 From: Fabian Korak Date: Sun, 16 Dec 2018 16:39:32 +0100 Subject: [PATCH 1/6] docs: Update Changelog.md (#623) Update the changelog to the same version the release-tag-system has --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a7eeac..ca25e09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ + +# [1.9.0](https://github.com/showdownjs/showdown/compare/1.8.7...1.9.0) (2018-11-10) + +Version 1.9.0 introduces a new feature, the Markdown to HTML converter. This feature is still experimental and is a partial backport of the new Reverse Converter planned for version 2.0. +### Bug Fixes + +* **italicsAndBold:** fix issue with consecutive spans ([#608](https://github.com/showdownjs/showdown/issues/608)) ([5c0d67e](https://github.com/showdownjs/showdown/commit/5c0d67e)), closes [#544](https://github.com/showdownjs/showdown/issues/544) +* **underline:** fix issue with consecutive spans ([81edc70](https://github.com/showdownjs/showdown/commit/81edc70)) + +### Features + +* **converter.makeMarkdown:** [EXPERIMENTAL] add an HTML to MD converter ([e4b0e69](https://github.com/showdownjs/showdown/commit/e4b0e69)), closes [#388](https://github.com/showdownjs/showdown/issues/388) [#233](https://github.com/showdownjs/showdown/issues/233) + + +# [1.8.7](https://github.com/showdownjs/showdown/compare/1.8.6...1.8.7) (2018-10-16) + +### Bug Fixes + +* **emojis:** fix emoji excessive size ([4aca41c](https://github.com/showdownjs/showdown/commit/4aca41c)) +* **gfm-codeblocks:** add support for spaces before language declaration ([24bf7b1](https://github.com/showdownjs/showdown/commit/24bf7b1)), closes [#569](https://github.com/showdownjs/showdown/issues/569) +leading space no longer breaks gfm codeblocks ([828c32f](https://github.com/showdownjs/showdown/commit/828c32f)), closes [#523](https://github.com/showdownjs/showdown/issues/523) + +* **images:** fix js error when using image references ([980e702](https://github.com/showdownjs/showdown/commit/980e702)), closes [#585](https://github.com/showdownjs/showdown/issues/585) +* **literalMidWordAsterisks:** now parses single characters enclosed by * correctly ([fe70e45](https://github.com/showdownjs/showdown/commit/fe70e45)), closes [#478](https://github.com/showdownjs/showdown/issues/478) +* **mentions:** allow for usernames with dot, underscore and dash ([dfeb1e2](https://github.com/showdownjs/showdown/commit/dfeb1e2)), closes [#574](https://github.com/showdownjs/showdown/issues/574) +* **nbsp:** fix replacing of nbsp with regular spaces ([8bc1f42](https://github.com/showdownjs/showdown/commit/8bc1f42)) + + +# [1.8.6](https://github.com/showdownjs/showdown/compare/1.8.5...1.8.6) (2017-12-22) + +### Features + +* **splitAdjacentBlockquotes:** add option to split adjacent blockquote blocks ([da328f2](https://github.com/showdownjs/showdown/commit/da328f2)), closes [#477](https://github.com/showdownjs/showdown/issues/477) + + + # [1.8.5](https://github.com/showdownjs/showdown/compare/1.8.4...1.8.5) (2017-12-10) From 4af13e5e762f1a4c187cf42f1eced169521dd609 Mon Sep 17 00:00:00 2001 From: Liu Xinyu Date: Tue, 18 Dec 2018 06:40:32 +0800 Subject: [PATCH 2/6] chore: add vue-showdown (#630) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4c6008a..a2a87ab 100644 --- a/README.md +++ b/README.md @@ -404,6 +404,10 @@ If you're using TypeScript you maybe want to use the types from [DefinitelyTyped Integration with SystemJS can be obtained via the third party ["system-md" plugin](https://github.com/guybedford/system-md). +## Integration with VueJS + +To use ShowdownJS as a Vue component quickly, you can check [vue-showdown](https://vue-showdown.js.org/). + ## XSS vulnerability Showdown doesn't sanitize the input. This is by design since markdown relies on it to allow certain features to be correctly parsed into HTML. From 5bac7e0564a2a97ecd33d5179e7cf1f2e8964114 Mon Sep 17 00:00:00 2001 From: Joshua Cline Date: Sat, 26 Jan 2019 19:38:51 -0800 Subject: [PATCH 3/6] Escaped the
in README.md (#645) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2a87ab..30e431c 100644 --- a/README.md +++ b/README.md @@ -310,7 +310,7 @@ var defaultOptions = showdown.getDefaultOptions(); by 4 spaces for them to be nested, effectively reverting to the old behavior where 2 or 3 spaces were enough. **(since v1.5.0)** - * **simpleLineBreaks**: (boolean) [default false] Parses line breaks as
, without + * **simpleLineBreaks**: (boolean) [default false] Parses line breaks as `
`, without needing 2 spaces at the end of the line **(since v1.5.1)** ```md From cfca8cbce6ebaf8264597ab7b27b49bda0f4d130 Mon Sep 17 00:00:00 2001 From: Sibiraj <20282546+sibiraj-s@users.noreply.github.com> Date: Sat, 2 Feb 2019 06:44:52 +0530 Subject: [PATCH 4/6] docs: update README.md (#652) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 30e431c..a1d5a4d 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,9 @@ The NuGet Packages can be [found here](https://www.nuget.org/packages/showdownjs You can also use one of several CDNs available: -* github CDN +* jsDelivr - https://cdn.rawgit.com/showdownjs/showdown//dist/showdown.min.js + https://cdn.jsdelivr.net/npm/showdown@/dist/showdown.min.js * cdnjs From 33bba54535d6fcdde5c82d2ec4d7a3bd951b5bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Mon, 18 Mar 2019 03:33:16 +0000 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a1d5a4d..7518101 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ If you like our work and find our library useful, please donate through [patreon ## License ShowdownJS v 2.0 is release under the MIT version. -Previous versions are release under GPL 2.0 +Previous versions are release under BSD. ## Who uses Showdown (or a fork) From caab5bb7bc617c1721967bd1a12c633927f2aafb Mon Sep 17 00:00:00 2001 From: Jammerware Date: Sat, 2 Nov 2019 14:58:07 -0400 Subject: [PATCH 6/6] fix: Add rel="noopener noreferrer" to links when openLinksInNewWindow is on Add rel="noreferrer" to links when openLinksInNewWindow is on. Also add noopener when openLinksInNewWindow is on. Closes #670 --- src/subParsers/makehtml/links.js | 2 +- .../features/#379.openLinksInNewWindow-breaks-em-markdup.html | 4 ++-- .../cases/features/openLinksInNewWindow/simple-cases.html | 4 ++-- .../makehtml/cases/features/openLinksInNewWindow/simple.html | 4 ++-- .../features/openLinksInNewWindow/simplifiedAutoLink.html | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/subParsers/makehtml/links.js b/src/subParsers/makehtml/links.js index 2c97baa..0988621 100644 --- a/src/subParsers/makehtml/links.js +++ b/src/subParsers/makehtml/links.js @@ -117,7 +117,7 @@ // to external links. Hash links (#) open in same page if (options.openLinksInNewWindow && !/^#/.test(url)) { // escaped _ - target = ' target="¨E95Eblank"'; + target = ' rel="noopener noreferrer" target="¨E95Eblank"'; } // Text can be a markdown element, so we run through the appropriate parsers diff --git a/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html b/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html index ab837e3..9d22dee 100644 --- a/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html +++ b/test/functional/makehtml/cases/features/#379.openLinksInNewWindow-breaks-em-markdup.html @@ -1,2 +1,2 @@ -

My link is important

-

My link is important

+

My link is important

+

My link is important

diff --git a/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html index c62a155..f20e2af 100644 --- a/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html +++ b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple-cases.html @@ -1,2 +1,2 @@ -

foo

-

a link http://www.google.com

+

foo

+

a link http://www.google.com

diff --git a/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html index c62a155..f20e2af 100644 --- a/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html +++ b/test/functional/makehtml/cases/features/openLinksInNewWindow/simple.html @@ -1,2 +1,2 @@ -

foo

-

a link http://www.google.com

+

foo

+

a link http://www.google.com

diff --git a/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html b/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html index c23bf68..6dff350 100644 --- a/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html +++ b/test/functional/makehtml/cases/features/openLinksInNewWindow/simplifiedAutoLink.html @@ -1 +1 @@ -

this is http://www.google.com autolink

+

this is http://www.google.com autolink