mirrors/marked
1
0
Fork 0
mirror of https://github.com/markedjs/marked synced 2024-11-23 18:02:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
723 Commits 2 Branches 181 Tags 22 MiB
1a71ae06bf
Commit Graph

411 Commits

Author SHA1 Message Date
Federico Soave
1a71ae06bf new blockquote rule: match any paragraph-like content up to next line (laziness rule), or anything on the current line. Change paragraph rule accordingly, and make it non-greedy 2018-01-19 03:58:30 +01:00
Federico Soave
9400980e16 paragraph rule: link defs cannot interrupt a paragraph 2018-01-19 03:25:33 +01:00
Federico Soave
a5c4889cf0 link def labels cannot contain balanced brackets 2018-01-19 03:25:33 +01:00
Federico Soave
f2ebbd1601 first link definition takes precedence 2018-01-19 03:25:33 +01:00
Federico Soave
d7597f1732 allow link definitions in blockquotes too 2018-01-19 03:25:33 +01:00
Federico Soave
c3e005908e new rule for link definitions: allow for special chars in label and title, multiline 2018-01-19 03:25:33 +01:00
Federico Soave
38f1b01036 allow escaped or balanced square brackets in shortcut reflinks 2018-01-19 03:25:33 +01:00
Federico Soave
2c11624736 preserve trailing newlines in code fences 2018-01-12 18:02:49 +01:00
Josh Bruce
3175599eae
Merge pull request #612 from guotie/patch-1 
Update marked.js
 2018-01-09 22:44:29 -05:00
Костя Третяк
bff566720d
Revert 98ac7a4395 and a477d1d0e2 2018-01-08 19:50:03 +02:00
Josh Bruce
4a5cf949ec
Merge pull request #852 from jeremyblalock/master 
Make erroneous / dangerous links display as text only

Slated for 0.3.10
 2018-01-05 18:27:22 -05:00
Josh Bruce
99eee90c91
Merge pull request #991 from learykara/patch-3 
Declare undeclared variables
 2018-01-05 17:55:15 -05:00
Kara Leary
14fca790fc
add 'use strict' to top of function 2018-01-05 06:19:25 -10:00
Josh Bruce
398bb715c7
Merge pull request #993 from smhg/fix-ie8-regex 
Support older regex engines
 2018-01-04 22:33:28 -05:00
Josh Bruce
08d25126d9
Merge pull request #977 from KostyaTretyak/parser-fix 
Parser fix
 2018-01-04 22:02:23 -05:00
Federico Soave
1949dfdf21 handle escaped brackets in link description 2018-01-03 01:56:38 +01:00
Костя Третяк
13e97eb56b
Fix auto_links secure 
Related to https://github.com/chjj/marked/pull/814
 2018-01-02 19:05:01 +02:00
smhg
d978de4f50 support older regex engines 2018-01-01 14:52:55 +01:00
Kara Leary
115b65e082
declare undeclared variables 
fix for https://github.com/chjj/marked/issues/990
 2017-12-27 12:11:37 -10:00
Josh Bruce
e10429e6b9
Merge pull request #629 from vincentwoo/patch-1 
Fix small typo occur[r]ed
 2017-12-25 17:08:42 -05:00
Tony Brix
cb72584c5d escape non-mangled xss 
fixes #926
 2017-12-22 23:13:53 -06:00
Tony Brix
6d1901ff71 sanatize uppercase hexidecimal 
fixes #925
 2017-12-22 22:59:23 -06:00
Tony Brix
858464b1a3 Merge branch 'pr/974' into pr/958 2017-12-22 10:46:48 -06:00
Костя Третяк
98ac7a4395
Fixed https://github.com/chjj/marked/issues/465 2017-12-18 23:42:06 +02:00
Josh Bruce
e5b2998326 Initial commit 2017-12-01 11:17:22 -05:00
Jeremy Blalock
f06d62d4d6 Makes link text show up even if link is dangerous 2017-02-08 11:00:20 -08:00
Matt Austin
cd2f6f5b70 added data: link fix to prevent xss 2017-01-19 15:03:37 -08: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
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
Christopher Jeffrey
18fb6a639a fix 2 failing tests. see #616. 2015-07-31 02:26:13 -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
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
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)
ea8e5e25f5 Merge pull request #569 from lwansbrough/master 
Added support for manual text node rendering
 2015-05-07 18:10:57 -07:00
Jesús Germade
443278fa90 allowing dot before extension 2015-05-02 09:00:55 +02:00
Lochlan Wansbrough
3bd399d647 Added support for manual text node rendering 2015-04-05 20:14:32 -07:00
Dmitry Chestnykh
202fa62c3f Add -mangle/-no-mangle to enable/disable mangling of email addresses. 
To keep the "standard"/previous behaviour, mangling is on by default.
 2015-02-02 15:12:48 +01:00
karland
22442aa033 Smartypants &ndash and &mdash 
Hi,

according to [Gruber's
Smartypants](http://daringfireball.net/projects/smartypants/)
`--` result in an `–`(\u2013) and `---` in an `—`(\u2n14).

As far as I can tell, `marked` converts `--` into `—`
 2015-01-28 18:01:36 +01:00
Adam Baldwin
3c19114493 blacklist vbscript: fixes #492 2015-01-22 20:05:18 -08:00
ledsun
c3e3a89ecf Fix to heading regular expression for GFM #201. 2014-11-18 13:38:15 +09:00