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

1071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Benjamin Wheeler
103052aa0f Added index tracking 2014-02-26 17:01:03 -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
90ed0e3545 fix doc formatting. 2014-02-20 22:01:56 -06:00
Christopher Jeffrey
f25dad2e4c add doc/ and some documentation of markdown inconsistencies. 2014-02-20 21:41:05 -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
Jason Karns
c1beaa637c typo in readme 2014-02-06 10:46:53 -05:00
Christopher Jeffrey
52e445f6ee v0.3.1 v0.3.1 2014-01-31 17:00:36 -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
d075681d49 Merge pull request #327 from juliantaylor/man-hyphen 
Fix minus used as hyphen in manpage
 2014-01-02 15:01:59 -08:00
Julian Taylor
9e30e57fa6 Fix minus used as hyphen in manpage 
Closes gh-231
 2014-01-02 23:46:28 +01:00
Chris Wren
f9c479b432 Merge pull request #324 from chjj/readme 
Updated README for 0.3.0 api
 2013-12-29 10:20:25 -08:00
ChrisWren
5e74e768a6 Updated README for 0.3.0 api 2013-12-29 10:16:38 -08:00
Chris Wren
dd9ea9a0a8 Added license to package.json, Fixes #313 2013-12-28 16:09:34 -08:00
Christopher Jeffrey
6700ad26b9 Merge pull request #318 from comutt/fix_readme_for_highlighting 
Modified REAMDE: Renderer.blockcode is not correct
 2013-12-24 20:22:49 -08:00
KOMATSU Seiji
3909989a2f Modified REAMDE: Renderer.blockcode is not correct 2013-12-25 03:46:17 +09:00
Christopher Jeffrey
5a982b9c81 v0.3.0 v0.3.0 2013-12-24 08:08:54 -06:00
Christopher Jeffrey
3150aeea38 Merge pull request #315 from mikeal/master 
Make the example in the readme work.
 2013-12-23 06:06:36 -08:00