Permalink
Commits on Aug 12, 2014
  1. Set layout to null to suppress warning

    Not applied in 0f16604.
    yous committed Aug 12, 2014
  2. Merge pull request #1628 from yous/patch-octopress-filter

    Use `octopress-hooks` and `octopress-date-format`
    committed Aug 12, 2014
  3. Use `octopress-hooks` and `octopress-date-format`

    Not applied in 73e5404.
    
    Fix #1622.
    yous committed Aug 12, 2014
  4. Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-f…

    …ormat'"
    
    This reverts commit 181d620.
    parkr committed Aug 12, 2014
Commits on Aug 10, 2014
  1. Merge pull request #1622 from raysrashmi/ry-updating-gems

    remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
    parkr committed Aug 10, 2014
Commits on Aug 7, 2014
Commits on Jul 31, 2014
  1. Delete Gemfile.lock

    Follow-up to #1617
    parkr committed Jul 31, 2014
  2. Merge pull request #1617 from nickhammond/patch-1

    .gitignore Gemfile.lock per previous commit
    parkr committed Jul 31, 2014
Commits on Jul 24, 2014
  1. .gitignore Gemfile.lock per previous commit

    Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again.
    
    06c0439
    nickhammond committed Jul 24, 2014
Commits on Jul 19, 2014
  1. Merge pull request #1609 from alindeman/patch-1

    Fixes load path issues with ruby-based git credential helpers
    parkr committed Jul 19, 2014
  2. Fixes load path issues with ruby-based git credential helpers

    Otherwise, we get errors like this (with boxen, e.g.):
    
    ```
    /opt/boxen/bin/boxen-git-credential:23:in `require': cannot load such file -- boxen/config (LoadError)
            from /opt/boxen/bin/boxen-git-credential:23:in `<main>'
    Username for 'https://github.com':
    ```
    alindeman committed Jul 19, 2014
Commits on Jun 24, 2014
  1. Merge pull request #1592 from yous/patch-4

    Update `paginate_path` comment based on default value
    parkr committed Jun 24, 2014
Commits on Jun 21, 2014
  1. Merge pull request #1589 from imathis/jekyll-2

    Jekyll 2.0 compatability
    committed Jun 21, 2014
Commits on Jun 16, 2014
  1. Merge pull request #1586 from simonewebdesign/master

    Refactoring addSidebarToggler()
    parkr committed Jun 16, 2014
Commits on Jun 15, 2014
Commits on May 23, 2014
  1. Merge pull request #1567 from howiehu/fix-gist-url-bug

    Update gist tag url to githubusercontent.com
    parkr committed May 23, 2014
  2. fix script_url_for url bug

    howiehu committed May 23, 2014
Commits on May 18, 2014
  1. Merge pull request #1563 from tsmacdonald/master

    Use correct time in log message for Github deploy
    parkr committed May 18, 2014
Commits on May 17, 2014
Commits on Apr 4, 2014
  1. Merge pull request #1489 from duckpuppy/fix-update_style

    Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
    parkr committed Apr 4, 2014
Commits on Mar 9, 2014
  1. Merge pull request #1515 from rythie/master

    A couple of changes to make octopress more friendly when hosted using HTTPS
    committed Mar 9, 2014
Commits on Mar 7, 2014
Commits on Mar 4, 2014
  1. Merge pull request #1506 from duckpuppy/handle-multiple-redirects

    gist_plugin: Handle multiple redirects, stopping if we find a circular r...
    parkr committed Mar 4, 2014
Commits on Mar 1, 2014
Commits on Feb 25, 2014