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

800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benjamin Wheeler
43875564a0 Merge remote-tracking branch 'upstream/master' 2014-06-02 13:09:11 -04:00
Benjamin Wheeler
cfe5716d11 Revert "Added index tracking" 
This reverts commit 103052aa0fb8c32ad71d43a710e2d25763b55efa.
 2014-06-02 13:06:50 -04:00
Ciro Santilli
cac787f745 Typo benchmarks are below reference in README. 2014-05-05 21:43:35 +02:00
Christopher Jeffrey
1c188ebb55 [test] return proper exit code on tests passing. 2014-05-01 17:50:48 -05:00
Christopher Jeffrey
be314453bb Merge pull request #402 from webadeo/master 
support of bower with bower.json file
 2014-04-28 12:17:11 -05:00
clakech
9675ff2be6 support of bower with bower.json file 2014-04-28 19:09:37 +02:00
Christopher Jeffrey
980381b4ce Revert "Rename component.json to bower.json" 
This reverts commit 5c3593d1af8bac9cb1cc2b37285d3e86e98d87fc.
 2014-04-28 04:02:50 -05:00
Christopher Jeffrey
9ef0238bdc Merge pull request #398 from wzr1337/patch-1 
Rename component.json to bower.json
 2014-04-26 19:42:38 -05:00
Patrick
5c3593d1af Rename component.json to bower.json 
automated processes need to find bower.json file instead of deprecated component.json
 2014-04-26 21:09:13 +02: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
8beee33b81 add minified version of marked v0.3.2. fixes #293. 2014-04-26 07:10:04 -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
Christopher Jeffrey
4ed4cc9b6f Merge pull request #374 from zaggino/master 
Fixed issue when using custom RequireJS loader
 2014-03-26 12:38:52 -05:00
Martin Zagora
b422126696 Fixed issue when using custom RequireJS loader 2014-03-25 15:50:19 +11:00
Christopher Jeffrey
43db549e31 v0.3.2. closes #356. v0.3.2 2014-03-10 02:19:09 -05:00