Permalink
Commits on Nov 4, 2014
  1. Merge branch 'jashkenas'

    committed Nov 4, 2014
Commits on Nov 3, 2014
  1. Merge pull request #310 from wjdenny/patch-1

    Update README
    keithamus committed Nov 3, 2014
  2. Update README

    added description for custom marked options
    wjdenny committed Nov 3, 2014
Commits on Oct 22, 2014
  1. Merge pull request #307 from schliden/patch-1

    Update languages.json
    keithamus committed Oct 22, 2014
  2. Update languages.json

    Add support for classic asp
    schliden committed Oct 22, 2014
Commits on Oct 1, 2014
  1. Merge pull request #300 from thriqon/master

    documenting custom templates and the need for stylesheets
    jashkenas committed Oct 1, 2014
Commits on Sep 17, 2014
  1. Merge pull request #301 from abstracthat/master

    add jade and stylus to languages
    keithamus committed Sep 17, 2014
Commits on Sep 12, 2014
Commits on Jul 28, 2014
  1. Merge pull request #295 from arthuredelstein/master

    Add .jsm suffix for Mozilla JavaScript modules
    keithamus committed Jul 28, 2014
Commits on Jul 26, 2014
  1. Merge pull request #297 from dduan/master

    added swift to language list
    jashkenas committed Jul 26, 2014
  2. added swift to language list

    dduan committed Jul 26, 2014
Commits on Jul 25, 2014
  1. Add .jsm suffix for Mozilla JavaScript modules

    These modules are traditionally suffixed .jsm instead of .js. See for example:
    https://stackoverflow.com/questions/2591368/jsm-vs-js-files
    arthuredelstein committed Jul 25, 2014
Commits on Jul 18, 2014
  1. Merge pull request #294 from mikkergimenez/patch-1

    Adding ".yaml" for yaml
    keithamus committed Jul 18, 2014
Commits on Jul 17, 2014
  1. Adding ".yaml" for yaml

    mikkergimenez committed Jul 17, 2014
Commits on Jul 1, 2014
  1. Merge pull request #291 from cscott/patch-1

    docco.parse: Don't crash if config parameter is default value.
    keithamus committed Jul 1, 2014
  2. Don't crash if config={}

    The signature of `docco.parse` is `(source, code, config={})` but `getLanguage` crashes if config is {}.  Fix this.
    
    This is a regression which appeared in bb4df75 (docco 0.6.3).  In docco 0.6.2 the signature of `docco.parse` was `(source, code)` and it didn't crash.
    cscott committed Jul 1, 2014
Commits on Jun 12, 2014
  1. Merge pull request #290 from grn/master

    Cakefile and CLI bug fixes
    jashkenas committed Jun 12, 2014
  2. Fix the -m/--marked option

    The argument to -m/--marked is a JSON file name containing additional
    optins that should be passed to Marked. The problem was that the
    default value of the command line option, as specified in the defaults
    objects, was set to an empty object which definitely isn't a valid file
    name. The result was an attempt to fs.readFileSync({}) which obviously
    raised an exception.
    
    This commit fixes the problem by setting the default value of
    -m/--marked to null.
    Grzegorz Niewisiewicz committed Jun 12, 2014
  3. Fix the install target

    This commit fixes two problems related to cake install.
    
    Firstly it was assumed that the prefix directory contains a
    subdirectory named bin. When it didn't exist the script failed when
    creating a symlink to docco. The problem is fixed by creating the bin
    subdirectory.
    
    Secondly an attempt to install (i.e. cp -rf) a directory named lib was
    made. However the project doesn't contain such subdirectory. It was
    removed from the list of directories to copy.
    Grzegorz Niewisiewicz committed Jun 12, 2014
Commits on Jun 7, 2014
  1. Merge pull request #289 from kenkouot/master

    Add support for TypeScript in languages.json
    keithamus committed Jun 7, 2014
Commits on Jun 6, 2014
  1. Add support for TypeScript in languages.json

    Kenneth Kouot committed Jun 6, 2014
Commits on Jun 4, 2014
  1. Merge pull request #288 from wilco42/markedOptions

    Add -m option to allow user specified marked options
    keithamus committed Jun 4, 2014
  2. Add -m option to allow user specified marked options

    Allow the user to override marked options for things like enabling github
    flavored markdown with line breaks.
    refs: https://github.com/chjj/marked#usage
    
    Invoked via:
    docco -m marked.json <filename.ext>
    
    Sample marked.json file:
    {
      "gfm": true,
      "breaks": true,
      "smartypants": true
    }
    Mike Tanaka committed Jun 4, 2014
Commits on May 23, 2014
  1. Merge pull request #286 from somethingkindawierd/patch-1

    Adds support for React's .jsx extension
    keithamus committed May 23, 2014
Commits on May 15, 2014
  1. Merge pull request #283 from ajthor/c-language

    feat: add support for plain C
    keithamus committed May 15, 2014
Commits on May 14, 2014
  1. feat: add support for plain C

    Add support for plain C files. C++ was allowed, but C was not.
    ajthor committed May 14, 2014
Commits on Apr 25, 2014
Commits on Apr 22, 2014
  1. Merge pull request #280 from shadowhand/sort-languages

    Sort languages.json alphabetically for clarity
    jashkenas committed Apr 22, 2014
Commits on Apr 17, 2014
  1. Merge branch 'jashkenas'

    committed Apr 17, 2014
Commits on Apr 14, 2014
  1. Merge pull request #241 from aarbelaiz/add-glsl-support

    Added OpenGL Shading Language(GLSL) to the language list
    keithamus committed Apr 14, 2014