Permalink
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. Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll

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

    Add travis-ci configuration file
    Tom Preston-Werner committed Jun 11, 2012
  4. 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. 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

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

    * 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
    tombell committed May 31, 2012
Commits on Apr 29, 2012
  1. avoiding to call site_payload one time per each post and page. Speed …

    …site creation up of a 20%.
    lucagrulla committed with tmm1 Mar 3, 2012
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 …

    …daneharrigan-master
    
    Conflicts:
    	lib/jekyll.rb
    mojombo committed Apr 23, 2012
Commits on Feb 27, 2012
Commits on Jan 29, 2012
  1. Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll i…

    …nto simensen-PluginsAsArray
    mojombo committed Jan 29, 2012
Commits on Jan 23, 2012
  1. Properly select dotfiles during directory scan.

    Fixes #363.
    Fixes #431.
    Fixes #377.
    mojombo committed Jan 23, 2012
  2. Merge pull request #472 from nfm/patch-1

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

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

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

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

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

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

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

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

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