1039 Commits

Author SHA1 Message Date
Josh Bruce
753a7bd04a 0.3.7 2017-12-01 12:54:48 -05:00
Josh Bruce
635e45cc68
Merge pull request #960 from chjj/github-templates
Add issue template
2017-12-01 12:38:33 -05:00
Josh Bruce
d24427ef3b Add issue template 2017-12-01 12:38:11 -05:00
Josh Bruce
90376c0bcc 0.3.9 2017-12-01 11:23:34 -05:00
Josh Bruce
2f1ba440b5 0.3.8 2017-12-01 11:23:31 -05:00
Josh Bruce
02437f68c5 0.3.7 2017-12-01 11:23:27 -05:00
Josh Bruce
e5b2998326 Initial commit 2017-12-01 11:17:22 -05:00
Richard Gibson
82de6baed0 Document the xhtml option 2017-10-06 20:40:21 -04:00
Jeremy Blalock
c51038abc5 Updates tests 2017-02-10 10:23:46 -08:00
Jeremy Blalock
f06d62d4d6 Makes link text show up even if link is dangerous 2017-02-08 11:00:20 -08:00
Matt Austin
8f9d0b72f5 Merge pull request #844 from chjj/data_link_fix
added data link fix to prevent xss
2017-01-20 09:47:29 -08:00
Matt Austin
cd2f6f5b70 added data: link fix to prevent xss 2017-01-19 15:03:37 -08:00
Matt Austin
38f1727ffe Merge pull request #728 from nehero/patch-1
Update readme example to reflect defaults
2016-09-08 10:10:39 -07:00
Christopher Jeffrey
eddec20467
v0.3.6 v0.3.6 2016-07-29 20:09:38 -07:00
Matt Austin
fd0d1a2935 Merge pull request #592 from matt-/xss_html_entities
XSS with HTML entities
2016-07-29 12:07:57 -07:00
Matt Austin
0fa05b6f66 Merge pull request #1 from rsp/fix/xss_html_entities_semicolon
Optional semicolon in html entities regex
2016-07-15 13:19:46 -04:00
Rafał Pocztarski
31c77995d5 add optional semicolon in html entities regex
and make non-capturing group out of (\w+) that was not used in the function
(only the entire surrounding group is used as a whole)
The semicolon is outside of the capturing group so the input to the
function is the same as before.
See this comment:
https://github.com/chjj/marked/pull/592/files/2cff859#r70888592
2016-07-15 13:08:12 +02:00
Matt d'Entremont
e8525b2ff4 Update README to account for npm run-script usage 2016-07-08 16:04:04 -03:00
Matt d'Entremont
34323df83a Remove "preferGlobal" from "package.json" file
- Add instructions for installing the cli tool
2016-07-08 15:57:07 -03:00
Matt Wisniewski
930555a723 small typo
I think this is a typo, figured I'd put in a PR just in case.
2016-04-20 13:58:55 -04:00
Ozzie Neher
6470e8bd1c Update readme example to reflect defaults
Changed sanitize default from true to false in the example.
2016-03-14 16:56:15 -06:00
Otto Jongerius
ff032bd83e Values in example do not always match defaults. 2016-01-24 16:00:58 +11:00
Federico Soave
f9e817d9fb return null on non-string input 2015-11-15 19:46:57 +01:00
Christopher Jeffrey
88ce4df47c v0.3.5 v0.3.5 2015-07-31 02:38:48 -07:00
Christopher Jeffrey
b5781fd488 update marked.min.js. 2015-07-31 02:38:33 -07:00
Christopher Jeffrey
dca6e8077e remove robotskirt from devDeps. fixes #633. 2015-07-31 02:36:19 -07:00
Christopher Jeffrey
18fb6a639a fix 2 failing tests. see #616. 2015-07-31 02:26:13 -07:00
Christopher Jeffrey
aae62c3395 place new tests in test/new. 2015-07-31 02:22:36 -07:00
Christopher Jeffrey (JJ)
91dcdcbbce Merge pull request #616 from papandreou/fix/emptyCodeBlocks
Fixed parsing of empty code blocks.
2015-07-30 18:08:07 -07:00
Andreas Lind
92acf2fc0c Re-fixed parsing of empty code blocks after the previous fix. 2015-07-30 01:32:34 +02:00
Andreas Lind
1d43cad577 code blocks: Don't ignore trailing newlines at the end.
Unfortunately, the problem this is fixing cannot easily be demonstrated
by a test, because the test suite removes all whitespace before comparing
the actual and expected renderings for some odd reason.
2015-07-30 00:09:49 +02:00
Christopher Jeffrey
cb4981c553 v0.3.4 v0.3.4 2015-07-29 03:16:23 -07:00
Christopher Jeffrey
a37bd643f0 prevent catastrophic backtracking on em rule. fixes #497. 2015-07-29 03:09:00 -07:00
Vincent Woo
7640e74748 Fix small typo occur[r]ed 2015-07-22 19:49:00 -07:00
Giancarlo
46876e047b Update year in README 2015-07-15 12:47:55 -05:00
Andreas Lind
85cfbb6852 Added test for a code block with a single empty line as well. 2015-07-07 11:25:20 +02:00
Andreas Lind
3ec548a488 Fixed parsing of empty code blocks.
Fixes #615
2015-07-07 10:42:05 +02:00
铁哥
d93df87f24 Update marked.js
it seems this argument is NOT used.
2015-06-26 18:33:33 +08:00
Matt Austin
2cff85979b added explicit matching for HTML entities to prevent XSS 2015-05-19 14:15:28 -07:00
Christopher Jeffrey
49b7eaca76 Merge remote-tracking branch 'ledsun/gfm_hashtag' 2015-05-07 18:37:58 -07:00
Christopher Jeffrey
7dca210613 sanitizer. see #468. 2015-05-07 18:33:53 -07:00
Christopher Jeffrey (JJ)
e91a45c895 Merge pull request #468 from trinketapp/master
Ability to provide a custom sanitize routine
2015-05-07 18:31:05 -07:00
Christopher Jeffrey (JJ)
7ff2f1d56a Merge pull request #540 from karland/patch-1
Smartypants &ndash and &mdash
2015-05-07 18:22:07 -07:00
Christopher Jeffrey (JJ)
b952bac1d5 Merge pull request #542 from dchest/nomangle
Add -mangle/-no-mangle to enable/disable mangling of email addresses.
2015-05-07 18:21:23 -07:00
Christopher Jeffrey (JJ)
e17afa3b6e Merge pull request #552 from minecrafter/fix-minor-typo
Fix tiny typo
2015-05-07 18:17:02 -07:00
Christopher Jeffrey (JJ)
fc45f46387 Merge pull request #567 from aspyatkin/patch-1
Correct version in bower.json
2015-05-07 18:15:07 -07:00
Christopher Jeffrey (JJ)
d2dd631f61 Merge pull request #553 from minecrafter/add-gulpfile
Add a Gulpfile
2015-05-07 18:14:48 -07:00
Christopher Jeffrey (JJ)
de7e1872bc Merge pull request #560 from callahad/v0.3.3-min
Update marked.min.js to v0.3.3
2015-05-07 18:14:01 -07:00
Christopher Jeffrey (JJ)
ea8e5e25f5 Merge pull request #569 from lwansbrough/master
Added support for manual text node rendering
2015-05-07 18:10:57 -07:00
Christopher Jeffrey (JJ)
2c914bc928 Merge pull request #585 from jgermade/master
allowing dot before extension
2015-05-07 18:01:17 -07:00