Commit Graph

699 Commits

Author SHA1 Message Date
Amo Chen
b1b49bafc1 update license field in package.json 2016-01-20 10:46:43 +08:00
Estevão Soares dos Santos
e8852a83bb refactor: clean regex helper functions 2016-01-02 01:16:40 +00:00
Estevão Soares dos Santos
c97f1dc6b1 feat(markdown="1"): enable parsing markdown inside HTML blocks
Enable parsing markdown inside HTML blocks if those blocks have an attribute called markdown="1".
This feature is EXPERIMENTAL! As such, the behavior might change on future releases.

Closes #178
2016-01-02 01:08:17 +00:00
Estevão Soares dos Santos
2746949d7d fix(hashHTMLBlock): fix issue with html breaking markdown parsing
Closes #220
2016-01-01 23:33:33 +00:00
Estevão Soares dos Santos
1011c0f7ac Merge pull request #225 from adamcarr/master
fix(amd): remove define module name as it breaks aliasing the module name
2015-12-26 02:17:29 +00:00
Adam Carr
74470ededa removing define module name as it breaks aliasing the module name 2015-12-22 20:24:53 -08:00
Estevão Soares dos Santos
5669317fe4 fix(strikethrough): Fix strikethrough issue with escaped chars
Closes #214
2015-10-30 01:00:30 +00:00
Estevão Soares dos Santos
f81789f0fb release: release 1.3.0 2015-10-19 03:27:54 +01:00
Estevão Soares dos Santos
f4cb29e05a Merge branch 'develop' into feature/event_mediator
Conflicts:
	dist/showdown.js
	dist/showdown.js.map
	dist/showdown.min.js
	dist/showdown.min.js.map
	src/converter.js
	src/subParsers/blockGamut.js
	src/subParsers/codeSpans.js
2015-10-19 03:20:20 +01:00
Estevão Soares dos Santos
e86aea8183 fix(literalMidWordUnderscores): fix different behavior with asterisks
Closes #198
2015-10-19 03:09:50 +01:00
Estevão Soares dos Santos
5b1f716151 chore: normalize test names 2015-10-19 02:50:32 +01:00
Estevão Soares dos Santos
a0da0a60b2 chore: small test fix for #196 2015-10-19 02:35:08 +01:00
Estevão Soares dos Santos
3097bd45c2 feat(hashHTMLSpans): Add support for hashing span elements
This feature enables hashing span elements that should not be touched by
showdown. For instance, `<code>` tags in markdown source should not be
parsed by showdown, so the text inside them remains unchanged.
This is made possible by a new exciting internal feature,
matchRecursiveRegExp.

Closes #196, Closes #175, Partially reverts 5f043ca
2015-10-19 01:55:35 +01:00
Estevão Soares dos Santos
0416218d27 Merge branch 'master' into develop 2015-10-18 20:48:44 +01:00
Estevão Soares dos Santos
7aeed3c8ae Merge pull request #197 from twitwi/test-for-issue-196
chore: add test for issue #196
2015-10-18 20:46:14 +01:00
Estevão Soares dos Santos
e928622664 chore: add grunt task to add newline to end of built files
Closes #202
2015-10-14 21:44:19 +01:00
Estevão Soares dos Santos
8ebb25e486 fix(simpleautolink): fix mail simpleAutoLink to ignore urls with @ symbol
Urls with @ symbol will not be incorrectly converted to mail addressed

Closes #204
2015-10-07 04:46:28 +01:00
Rémi Emonet
ab902eacdf fixing test as, in code blocks, markdown should automatically escape
still the issue is there
2015-09-01 01:24:11 +02:00
Rémi Emonet
2b17dc9944 adding test for issue #196 2015-09-01 00:18:32 +02:00
Estevão Soares dos Santos
c4e82d855e Merge pull request #188 from stevemao/changelog
Changelog
2015-08-27 05:38:32 +01:00
Estevão Soares dos Santos
64009b2ced bump version and changelog 2015-08-27 05:25:02 +01:00
Estevão Soares dos Santos
cf2a70c966 Merge branch 'develop' 2015-08-27 05:23:41 +01:00
Estevão Soares dos Santos
50256233eb fix(tables): fix md tables being parsed inside indented code blocks.
Closes #193
2015-08-27 03:41:59 +01:00
Estevão Soares dos Santos
ed2cf595b0 fix(blockQuote): fix 'github style codeblocks' not being parsed inside 'blockquote'
Closes #192
2015-08-25 21:10:49 +01:00
Estevão Soares dos Santos
b81c416a31 docs(README.md): add libraries that use showdown 2015-08-23 03:31:55 +01:00
Estevão Soares dos Santos
e754668814 Merge branch 'hotfix/#191' into develop 2015-08-23 03:12:43 +01:00
Estevão Soares dos Santos
3df706248f fix(blockGamut): fix for headings inside blockquotes
The spec states that you can be lazy and only put the `>` before the first line of a hard-wrapped paragraph.
It also states that blocquotes can contain any other md element inside.
This means headings and horizontal rules should be included in the blockquote but, right now, are treated as
independent entities

Closes #191
2015-08-23 03:11:11 +01:00
Estevão Soares dos Santos
b6c8b497db docs(lists.js): fix missing jsdoc parameter 2015-08-23 02:46:04 +01:00
Estevão Soares dos Santos
636fd5959d docs(converter.js): fix return type of Converter function 2015-08-23 02:21:00 +01:00
Estevão Soares dos Santos
7dc3fb1d25 fix(simpleAutoLinks): fix emails being treated as simple urls
Closes #187
2015-08-11 05:58:54 +01:00
Steve Mao
22e3d644e1 feat(release): use grunt-conventional-github-releaser
You need to set environment variable `GH_TOKEN` as your github token and make sure you run it after you have pushed your tag.
2015-08-11 11:39:51 +10:00
Steve Mao
247176d283 chore(deps): bump grunt-conventional-changelog
There are a ton of bug fixes and nice new features.
2015-08-11 11:38:29 +10:00
Estevão Soares dos Santos
cb0509b4a2 fix test 2015-08-03 03:49:03 +01:00
Estevão Soares dos Santos
2734326e19 feat(eventDispatcher): add an event dispatcher to converter 2015-08-03 03:47:49 +01:00
Estevão Soares dos Santos
ea6031a25f release 1.2.2 2015-08-02 16:09:04 +01:00
Estevão Soares dos Santos
7720c88bfc fix(lists): fix github code blocks not being parsed inside lists
Fix ghCodeBlocks not being correctly parsed inside lists. Also, as a side
effect, fixes issues with consecutive lists and extra paragraphs being
added into lists.

Closes #142, Closes #183, Closes #184
2015-08-01 21:05:28 +01:00
Estevão Soares dos Santos
086c41de54 release 1.2.1 2015-07-22 18:47:51 +01:00
Estevão Soares dos Santos
eeccee7038 Merge branch 'develop' 2015-07-22 18:29:00 +01:00
Estevão Soares dos Santos
7d0a1813f8 Merge branch 'master' into develop 2015-07-22 18:28:10 +01:00
Estevão Soares dos Santos
f3d74fe65c Merge pull request #181 from showdownjs/tivie-patch-2
feat(subParser/tables.js): add support for md span elements in table headers

Closes #179
2015-07-22 18:26:58 +01:00
Estevão Soares dos Santos
789dc1806a feat(subParser/tables.js): add support for md span elements in table headers
+ tests

Closes #179
2015-07-22 18:21:20 +01:00
Estevão Soares dos Santos
bf4798a728 docs(README.md): fix typo 2015-07-21 21:01:47 +01:00
Estevão Soares dos Santos
a3b5946ec9 docs(README.md): change table example 2015-07-21 13:42:15 +01:00
Estevão Soares dos Santos
1ebb08484d docs(README.md): add examples to image dimensions 2015-07-16 20:55:55 +01:00
Estevão Soares dos Santos
107bdb7b2f Update README.md 2015-07-15 11:15:39 +01:00
Estevão Soares dos Santos
932610839f Merge pull request #176 from dipskakadiya/master
Updated readme.md
2015-07-15 11:09:40 +01:00
Dipesh
e5f886b670 Updated readme.md
in Example of Setting options -> Locally, While creating showdown.Converter object closing '}' is missing
2015-07-15 11:45:54 +05:30
Estevão Soares dos Santos
b88bdbedc8 docs(README.md): add reference to option smoothLivePreview 2015-07-14 21:47:02 +01:00
Estevão Soares dos Santos
358613ad54 Merge pull request #175 from tivie/master
Several fixes for bugs found against ghost testcase
2015-07-14 21:44:29 +01:00
Estevão Soares dos Santos
9ab2af0e89 build 2015-07-14 21:17:27 +01:00