1071 Commits

Author SHA1 Message Date
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
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
Alexander Pyatkin
598fac46c4 Correct version in bower.json 2015-04-05 17:10:20 +04:00
Dan Callahan
e669b642b8 Update marked.min.js to v0.3.3
Used Uglify-js v2.4.17

Exact command line: `uglifyjs lib/marked.js --comments="/Copyright/" --mangle --compress > marked.min.js`
2015-03-16 02:05:14 -05:00
Tux
835f4a62b5 Add a Gulpfile
This currently just handles updating marked.min.js, but Gulp allows for more functionality to be added over time.
2015-02-26 00:38:16 -05:00
Marquee
6a39c78c41 Fix tiny typo 2015-02-26 00:14:13 -05: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
Christopher Jeffrey
2b5802f258 v0.3.3 v0.3.3 2015-01-25 15:51:07 -08:00
Christopher Jeffrey (JJ)
f49db7cbdf Merge pull request #537 from evilpacket/no-vbscript
blacklist vbscript: fixes #492
2015-01-25 14:19:40 -08: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
Scott González
3e02a69921 Merge pull request #414 from cirosantilli/usage-browser
Add browser usage to README.
2014-09-19 10:16:13 -04:00
Ciro Santilli
81373b37bf Add browser usage to README. 2014-09-19 15:43:20 +02:00
Alf Eaton
c3f1284b39 Use the correct default value for "sanitize"
The text implies that these are the default options, but the  default option for sanitize is "false".
2014-08-30 17:39:22 +01:00
Peter Dave Hello
a5c5fcc438 Use svg instead of png to get better image quality 2014-08-28 20:47:48 +08:00
Eric Theise
1f0a49d18e fix "typographic" typo in README.md 2014-08-10 13:42:36 -07:00
Benjamin Wheeler
55ea824910 Added ability to specify a custom sanitize method 2014-06-02 13:14:35 -04:00