codewalker/marked
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
762 Commits 1 Branch 191 Tags
Commit Graph

432 Commits

Author SHA1 Message Date
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
Benjamin Wheeler
55ea824910 Added ability to specify a custom sanitize method 2014-06-02 13:14:35 -04:00
Christopher Jeffrey
7be4193249 fix html comments, again. fixes #381 and #389. 
Original commit:
da05668ddd
 2014-04-26 07:39:16 -05:00
Christopher Jeffrey
3ad276bcc5 Revert "fix html comments. fixes #381 and #389." 
This reverts commit 288a6478e229ceead86a5587782bc5d16885d0e5.
 2014-04-26 07:35:47 -05:00
Christopher Jeffrey
288a6478e2 fix html comments. fixes #381 and #389. 2014-04-26 07:29:31 -05:00
Christopher Jeffrey
dc3b344e82 pass error to callback on highlight error. fixes #377. 2014-03-27 06:35:04 -05:00
Christopher Jeffrey
7bdaa54c51 Revert "set token.escaped properly for sync highlighting. see #375." 
This reverts commit a7ab0f408e0f5645dd5bc6c308895a90dca54274.
 2014-03-26 14:26:17 -05:00
Christopher Jeffrey
6b60db3457 clean up new module check 
- custom setup of RequireJS provides 'exports' variable without 'module'
  function loadExtension @
  https://github.com/adobe/brackets/blob/master/src/utils/ExtensionLoader.js
 2014-03-26 13:02:45 -05:00
Christopher Jeffrey
a7ab0f408e set token.escaped properly for sync highlighting. see #375. 2014-03-26 13:01:58 -05:00
Martin Zagora
b422126696 Fixed issue when using custom RequireJS loader 2014-03-25 15:50:19 +11:00
Christopher Jeffrey
0e6e780f11 comment. 2014-03-10 00:59:52 -05:00
Christopher Jeffrey
ea37585b9a Revert "rough implementation of task lists. see #107 #111." 
This reverts commit 26cef98d7261cb8330c07eceff250254124f20d8.
 2014-03-10 00:59:32 -05:00
Christopher Jeffrey
b5b4683179 Revert "use renderer for task lists. see #107 #111." 
This reverts commit a5e39a6a59a91a7c8fa88e9113ba4dde7264e33b.
 2014-03-10 00:59:17 -05:00
Christopher Jeffrey
a5e39a6a59 use renderer for task lists. see #107 #111. 2014-02-25 23:55:24 -06:00
Christopher Jeffrey
26cef98d72 rough implementation of task lists. see #107 #111. 2014-02-25 23:52:11 -06:00
Christopher Jeffrey
bcf206e6d7 fix double gfm autolinks. fixes #56. 2014-02-23 07:17:43 -06:00
Christopher Jeffrey
05a740cf6c fix regression caused by merge conflict. 2014-02-23 06:18:28 -06:00
Christopher Jeffrey
e6082a0f6a Merge branch 'def_hr_fixes' 
Conflicts:
	lib/marked.js
 2014-02-20 19:58:30 -06:00
Christopher Jeffrey
49006dd949 implement xhtml option for self-closing elements. fixes #330. 2014-02-11 15:26:45 -06:00
Christopher Jeffrey
613bf6ac63 ensure javascript: protocols are not encoded in entities and references. 2014-01-10 01:46:05 -06:00
Christopher Jeffrey
cd507dd55a rely on options passed to the renderer object. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
5e716661fe completely escape fenced code. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
904c71b771 sanitize javascript: links. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
32714af056 escape lang class. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
96f1f35628 do not tokenize emails as html. fixes #329 again. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
0e1ac14bc5 do not tokenize emails as html. fixes #329. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
b9b941ebea Revert "see #302. remove all obsolete features. keep things easy to revert." 
This reverts commit f9c90b0cdb15d6a3ef087b79364b979fb8ef81bb.

Revert "Fix test cases. Since we have removed the headerPrefix option. There"

This reverts commit 509b284c7cc09232562c89a91453797ab88fd73f.
 2013-12-23 08:00:35 -06:00
Christopher Jeffrey
e0489a5b8b minor refactor. remove useless args. 2013-12-05 17:07:16 -06:00
Christopher Jeffrey
f9c90b0cdb see #302. remove all obsolete features. keep things easy to revert. 2013-12-04 06:25:16 -06:00
Christopher Jeffrey
bc1f59a950 enable all obsolete features. 2013-12-04 06:18:26 -06:00