Permalink
Commits on Mar 25, 2013
  1. @parkr

    Merge pull request #883 from liliakai/0.12.1-release

    Avoid breaking change in latest directory_watcher
    parkr committed Mar 25, 2013
  2. Avoid breaking change in latest directory_watcher

    We need to be a little more pressimistic about the directory_watcher
    gem, since it's latest version (1.5) breaks jekyll's --auto option.
    
    Fixes jekyll/jekyll#882.
    Lilia Markham committed Mar 25, 2013
Commits on Feb 19, 2013
  1. @parkr

    Release 0.12.1

    parkr committed Feb 19, 2013
  2. @parkr

    Update date in gemspec

    parkr committed Feb 19, 2013
  3. @parkr
  4. @parkr
  5. @parkr
  6. @parkr
  7. @parkr
  8. @parkr

    Update dependencies: kramdown, rake, shoulda, cucumber, redcarpet

    Kramdown: 0.13.4 => 0.14.1
    Rake: 0.9 => 10.0.3
    Shoulda: 2.11 => 3.3.2
    Redcarpet: 2.1.1 => 2.2.2
    parkr committed Feb 19, 2013
  9. @parkr
Commits on Dec 22, 2012
  1. @mojombo

    Release 0.12.0

    mojombo committed Dec 22, 2012
Commits on Dec 16, 2012
  1. @mojombo

    Update history.

    mojombo committed Dec 16, 2012
  2. @mojombo

    Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/…

    …jekyll into zimbatm-fix/front-matter-regexp
    mojombo committed Dec 16, 2012
  3. @mojombo

    Clean up default config spec.

    mojombo committed Dec 16, 2012
  4. @mojombo

    Merge branch 'master' of https://github.com/Neil-Smithline/jekyll int…

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

    Update history.

    mojombo committed Dec 16, 2012
  6. @mojombo
  7. @mojombo
Commits on Dec 15, 2012
  1. @mojombo

    Update history.

    mojombo committed Dec 15, 2012
  2. @mojombo

    Merge branch 'redcarpet-update' of https://github.com/tombell/jekyll

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

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

    petedmarsh committed Dec 7, 2012
Commits on Nov 13, 2012
  1. @tombell

    Only pass first class to Pygments

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

    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
  1. @tombell
Commits on Jun 29, 2012
  1. @Neil-Smithline
Commits on Jun 11, 2012
  1. Merge pull request #574 from tombell/remove-rbx-travisci

    Update travis-ci configuration file
    Tom Preston-Werner committed Jun 11, 2012
  2. @tombell
  3. @mojombo

    Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll

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

    Add travis-ci configuration file
    Tom Preston-Werner committed Jun 11, 2012
  5. @mojombo

    Merge branch 'custom-layout-directory' of https://github.com/tombell/…

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

    Fix up a few TomDocs.

    mojombo committed Jun 6, 2012
  2. @mojombo

    Simplify Site#read_layouts.

    mojombo committed Apr 24, 2012