Permalink
Commits on Jun 11, 2012
  1. Merge pull request jekyll#574 from tombell/remove-rbx-travisci

    Tom Preston-Werner
    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 jekyll#568 from tombell/travis-ci

    Tom Preston-Werner
    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. Add travis-ci configuration file

    tombell committed May 31, 2012
    * Tests against: 1.9.3, 1.9.2, 1.8.7, rbx-18mode
    * Fixes jekyll#387
  2. 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 jekyll#563
Commits on Apr 29, 2012
  1. avoiding to call site_payload one time per each post and page. Speed …

    lucagrulla authored and tmm1 committed 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
  2. Fixed helper inclusion in redcarpet test

    mkaito authored and mojombo committed Nov 1, 2011
Commits on Feb 27, 2012
Commits on Jan 29, 2012
  1. Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll i…

    mojombo committed Jan 29, 2012
    …nto simensen-PluginsAsArray
Commits on Jan 23, 2012
  1. Merge pull request jekyll#472 from nfm/patch-1

    mojombo committed Jan 23, 2012
    Update Posterous migrator to take an api_token
  2. Update history.

    mojombo committed Jan 23, 2012
  3. Merge branch 'post_url' of https://github.com/thatguystone/jekyll int…

    mojombo committed Jan 23, 2012
    …o thatguystone-post_url
Commits on Jan 22, 2012
  1. Merge pull request jekyll#446 from ossxp-com/patch-1

    mojombo committed Jan 22, 2012
    Invalid migrator for WordPress because of a typo.
  2. Merge pull request jekyll#419 from vjt/master

    mojombo committed Jan 22, 2012
    Exception handler in Convertible references nonexisting method .name
  3. Merge pull request jekyll#460 from kendagriff/master

    mojombo committed Jan 22, 2012
    RSS Migrator
  4. Merge pull request jekyll#426 from joshbrown/master

    mojombo committed Jan 22, 2012
    Added a Joomla migrator
  5. Merge pull request jekyll#368 from jacius/wordpress

    mojombo committed Jan 22, 2012
    Greatly improved and extended the wordpress.rb migrator.
  6. Merge pull request jekyll#384 from voxpelli/drupal-alias-redirect

    mojombo committed Jan 22, 2012
    Added redirects for Drupal posts' URL-aliases