Jeff Williams e7752cde18 Merge branch 'master' into parsimony ...

Conflicts:
	lib/jsdoc/name.js
	lib/jsdoc/src/handlers.js
	lib/jsdoc/src/parser.js
	lib/jsdoc/tag/dictionary/definitions.js
	lib/jsdoc/util/templateHelper.js
	package.json
	test/specs/documentation/alias.js
	test/specs/documentation/modules.js
	test/specs/tags/augmentstag.js
	test/specs/tags/overviewtag.js

2013-10-21 08:42:29 -07:00

..

async

create a fake async file I/O method (fs.readFile); use it in a test as a proof of concept

2012-10-23 22:06:33 -07:00

catharsis

update catharsis to fix issues with repeatable types (#502)

2013-10-14 09:32:20 -07:00

crypto-browserify

replace events and MD5 modules with equivalent Node.js shims

2012-10-30 22:49:04 -07:00

esprima

esprima parser (currently disabled)

2013-10-21 08:02:03 -07:00

js2xmlparser

replace JSON-to-XML serializer

2012-10-15 20:47:08 -07:00

jshint

update jshint module; move to node_modules

2012-10-15 20:54:17 -07:00

markdown

fix for markdown links that use a reserved word as link text, like [constructor]{@link ...} (#249)

2013-01-23 08:52:35 -08:00

marked

Add support for marked markdown parser

2013-04-19 14:59:06 -07:00

taffydb

update TaffyDB; move to node_modules

2012-10-15 05:22:13 -07:00

underscore

use underscore.js for templates instead of a customized subset

2012-10-16 05:34:50 -07:00

wrench

update 'wrench' module; move to node_modules

2012-10-15 06:01:39 -07:00

jsdoc

add a jsdoc symlink to node_modules

2013-05-02 20:26:35 -07:00