Permalink
Commits on Dec 16, 2012
  1. Update history.

    mojombo committed Dec 16, 2012
  2. Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/…

    mojombo committed Dec 16, 2012
    …jekyll into zimbatm-fix/front-matter-regexp
  3. Clean up default config spec.

    mojombo committed Dec 16, 2012
  4. Merge branch 'master' of https://github.com/Neil-Smithline/jekyll int…

    mojombo committed Dec 16, 2012
    …o Neil-Smithline-master
  5. Update history.

    mojombo committed Dec 16, 2012
Commits on Dec 15, 2012
  1. Update history.

    mojombo committed Dec 15, 2012
  2. Merge branch 'redcarpet-update' of https://github.com/tombell/jekyll

    mojombo committed Dec 15, 2012
    …into tombell-redcarpet-update
  3. Merge pull request #683 from petedmarsh/master

    Tom Preston-Werner committed Dec 15, 2012
    Add license to gemspec
Commits on Dec 7, 2012
  1. Add license to gemspec

    petedmarsh committed Dec 7, 2012
Commits on Nov 13, 2012
  1. Only pass first class to Pygments

    tombell committed Nov 13, 2012
    This prevents an exception if something like the following is used:
    
    ~~~ {foo bar}
    some code
    ~~~
  2. Update pygments.rb version

    tombell committed Nov 13, 2012
Commits on Aug 14, 2012
  1. Better error reporting on Liquid exceptions

    Will Brady committed Aug 14, 2012
Commits on Aug 13, 2012
Commits on Jun 29, 2012
Commits on Jun 11, 2012
  1. Merge pull request #574 from tombell/remove-rbx-travisci

    Tom Preston-Werner committed Jun 11, 2012
    Update travis-ci configuration file
  2. Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll

    mojombo committed Jun 11, 2012
     into tombell-switch-to-pygmentsrb
  3. Merge pull request #568 from tombell/travis-ci

    Tom Preston-Werner committed Jun 11, 2012
    Add travis-ci configuration file
  4. Merge branch 'custom-layout-directory' of https://github.com/tombell/…

    mojombo committed Jun 11, 2012
    …jekyll into tombell-custom-layout-directory
    
    Conflicts:
    	lib/jekyll/site.rb
Commits on Jun 6, 2012
  1. Fix up a few TomDocs.

    mojombo committed Jun 6, 2012
  2. Simplify Site#read_layouts.

    mojombo committed Apr 24, 2012
Commits on May 31, 2012
  1. No longer need pygments locally

    tombell committed May 31, 2012
  2. Swap out albino for pygments.rb

    tombell committed May 31, 2012
  3. Add travis-ci configuration file

    tombell committed May 31, 2012
    * Tests against: 1.9.3, 1.9.2, 1.8.7, rbx-18mode
    * Fixes #387
  4. Allow a custom 'layouts' directory

    tombell committed May 31, 2012
    * Add 'layouts' option to change the dir from '_layouts' to anything relative
      to the source directory
    * Add cucumber scenario for testing an alternative directory '_theme'
    * Closes #563
Commits on May 25, 2012
  1. Front-matter should be at start of file

    zimbatm committed May 25, 2012
    It's the theme of the moment ; regexp checking.
    
    Just in case we have two line start with --- in the file, we want to
    make sure it's not interpreted as a front-matter.
Commits on Apr 29, 2012
  1. avoiding to call site_payload one time per each post and page. Speed …

    lucagrulla committed with tmm1 Mar 3, 2012
    …site creation up of a 20%.
Commits on Apr 24, 2012
  1. Update History.

    mojombo committed Apr 24, 2012
Commits on Apr 23, 2012
  1. Merge branch 'master' of https://github.com/daneharrigan/jekyll into …

    mojombo committed Apr 23, 2012
    …daneharrigan-master
    
    Conflicts:
    	lib/jekyll.rb