Permalink
Commits on Aug 27, 2010
  1. Merge git://github.com/smith/pintura

    kriszyp committed Aug 27, 2010
    Conflicts:
    	engines/node/lib/jsgi/static.js
  2. remove comment

    kriszyp committed Aug 27, 2010
  3. Move head into pintura

    kriszyp committed Aug 27, 2010
  4. Merge git://github.com/dvv/pintura

    kriszyp committed Aug 27, 2010
    Conflicts:
    	lib/jsgi/rest-store.js
    	lib/media/html.js
    	lib/media/url-encoded.js
  5. Create memory store properly

    kriszyp committed Aug 27, 2010
Commits on Aug 25, 2010
  1. Remove unnecessary parameter

    kriszyp committed Aug 25, 2010
  2. fixes for hatom

    deanlandolt committed Aug 25, 2010
Commits on Aug 23, 2010
  1. Only test source if it exists

    kriszyp committed Aug 23, 2010
Commits on Aug 18, 2010
  1. Remove content-length if the object's content-type doesn't match the …

    kriszyp committed Aug 18, 2010
    …conneg's selection for content-type
  2. Remove unnecessary logic

    kriszyp committed Aug 18, 2010
Commits on Aug 16, 2010
Commits on Aug 14, 2010
  1. renamed cjsTemplate to templify

    Dustin Machi committed Aug 14, 2010
  2. Merge remote branch 'upstream/master'

    Dustin Machi committed Aug 14, 2010
  3. html-transformer shouldnt' return a psuedo object, just send the resu…

    Dustin Machi committed Aug 14, 2010
    …ltant data. delete content-length header in html media as it has changed from transformation and templating
Commits on Aug 13, 2010
Commits on Aug 12, 2010
  1. Remove unnecessary file

    kriszyp committed Aug 12, 2010
  2. Corrections to content negotiations with alternates, and added saveFi…

    kriszyp committed Aug 12, 2010
    …le and loadFile handlers
  3. Merge git://github.com/dmachi/pintura

    kriszyp committed Aug 12, 2010
    Conflicts:
    	lib/media/html.js
  4. make some adjustments per kris' suggestions and move html transformer…

    Dustin Machi committed Aug 12, 2010
    …s from perstore to pintura
  5. update html media handler for tempaltes

    Dustin Machi committed Aug 12, 2010
Commits on Aug 11, 2010
  1. Merge git://github.com/dmachi/pintura

    kriszyp committed Aug 11, 2010
    Conflicts:
    	lib/jsgi/media.js
    	lib/media.js