Commit Graph

519 Commits

Author SHA1 Message Date
Estevão Soares dos Santos
94ec12b12d release 1.4.1 2016-05-17 21:33:56 +01:00
Estevão Soares dos Santos
6699f46779 Merge branch 'develop' of https://github.com/showdownjs/showdown into develop
# Conflicts:
#	dist/showdown.js
#	dist/showdown.js.map
#	dist/showdown.min.js
#	dist/showdown.min.js.map
2016-05-17 21:31:34 +01:00
Estevão Soares dos Santos
ddaacfc41a fix(tables): fix table heading separators requiring 3 dashes instead of 2
Closes #256
2016-05-17 21:27:40 +01:00
Estevão Soares dos Santos
e586201025 release 1.4.0 2016-05-13 16:28:47 +01:00
Estevão Soares dos Santos
77007181d8 Merge branch 'master' into develop 2016-04-26 19:19:00 +01:00
Estevão Soares dos Santos
478a0e4fca Merge pull request #251 from samb0t/case-insensitive-checkboxes
Support for case-insensitive checkboxes for render. [x] == [X]
2016-04-26 16:21:06 +01:00
Sam Bottoni
656aa98305 Support for case-insensitive checkboxes for render. [x] == [X] 2016-04-26 09:08:50 -05:00
Estevão Soares dos Santos
e0726a6e42 feature(evt_listeners): make globals var accessible to listeners 2016-03-20 17:08:44 +00:00
Estevão Soares dos Santos
452c4285f4 Update README.md 2016-03-20 16:48:42 +00:00
Estevão Soares dos Santos
7fabc78ff6 Merge pull request #248 from Hypercubed/patch-1
docs(readme): Added link to SystemJS/JSPM plugin
2016-03-20 16:46:54 +00:00
Jayson Harshbarger
70a6caaf4f docs(readme): Added link to SystemJS/JSPM plugin 2016-03-20 13:32:57 +09:00
Estevão Soares dos Santos
6e5073d977 chore: remove html beautify from tests 2016-02-02 00:29:06 +00:00
Estevão Soares dos Santos
6412eadf29 fix weird travis issue try 1 2016-02-01 03:56:22 +00:00
Estevão Soares dos Santos
ac89fb918b buiuld 2016-02-01 03:49:56 +00:00
Estevão Soares dos Santos
f58f014bc3 fix(tables): fix tables to match github's md spec
Now Leading and trailing pipes (|) are optional in tables

Closes #230
2016-01-25 05:24:54 +00:00
Estevão Soares dos Santos
8d0cf545b8 Merge branch 'master' into develop 2016-01-25 03:04:33 +00:00
Estevão Soares dos Santos
71a5873902 fix(HTMLParser): fix code tags parsing
Closes #231
2016-01-25 03:01:54 +00:00
Estevão Soares dos Santos
4c68452999 chore: remove stray console.log 2016-01-25 01:16:51 +00:00
Estevão Soares dos Santos
7d0436d210 fix(HTMLParser): fix ghCodeBlocks being parsed inside code tags
When using html pre/code tags to wrap github's fenced code block syntax,
showdown would parsed them instead of treating them like plain code.

Closes #229
2016-01-25 01:04:06 +00:00
Estevão Soares dos Santos
f4d50dc13b Merge pull request #228 from Amomo/patch-1
update license field in package.json
2016-01-20 05:28:53 +00:00
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