Commit Graph

807 Commits (00d15913220b25ebe55c581d557069d6833cf44b)
 

Author SHA1 Message Date
Andy Lindeman 00d1591322 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':
```
Parker Moore 4fdae37e42 Merge pull request from yous/patch-4
Update `paginate_path` comment based on default value
ChaYoung You 7e044b498e Update `paginate_path` comment based on default value
Brandon Mathis 9d0c54e3e6 Removed date plugin, added excerpt separator default
Brandon Mathis a0229b2c9c Replaced date plugin with jekyll-date-format
Brandon Mathis 72ea6042e3 Merge pull request from imathis/jekyll-2
Jekyll 2.0 compatability
Brandon Mathis 06c0439705 No longer including Gemfile.lock. Turns out that was a bad idea.
Brandon Mathis 2f47c00b48 Added jekyll-sitemap, jekyll-date-format, and updated gems
Brandon Mathis 52f9119645 Initial update to be compatible with Jekyll 2
Parker Moore 695fe922a9 Merge pull request from simonewebdesign/master
Refactoring addSidebarToggler()
Simone e95d15d584 Refactoring addSidebarToggler()
Parker Moore 9bc4bb02ee Merge pull request from howiehu/fix-gist-url-bug
Update gist tag url to githubusercontent.com
Hu Hao 24fdbbbcfa fix script_url_for url bug
Hu Hao dca0c7500f Update gist tag url to githubusercontent.com
Parker Moore ff1b10d0bc Merge pull request from tsmacdonald/master
Use correct time in log message for Github deploy
Timothy Macdonald c23be69915 Use correct time in log message for Github deploy
Parker Moore f6ed4125b5 Merge pull request from duckpuppy/fix-update_style
Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Brandon Mathis affa3ffb82 Merge pull request from rythie/master
A couple of changes to make octopress more friendly when hosted using HTTPS
Richard Cunningham ec1fbccd64 Use HTTPS for google webfonts when on HTTPS site
Richard Cunningham 15e4418aed Default to HTTPS for google searches
Parker Moore b86880352b Merge pull request from duckpuppy/handle-multiple-redirects
gist_plugin: Handle multiple redirects, stopping if we find a circular r...
Patrick Aikens a66e031166 gist_plugin: Handle multiple redirects, stopping if we find a circular reference
Brandon Mathis 0ead88e6c2 Fixed the expand_url filter. Finally.
Thanks @larryprice
Brandon Mathis 1321423383 Removed accidental call to expand_url
Brandon Mathis 028769b73f Ignore protocol relative '//' urls.
Patrick Aikens c139f680e1 Fix typo in update_style copy command
Patrick Aikens 51ad614bd2 Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Brandon Mathis fe6ef744ed Merge pull request from Haacked/windows-code-page-fix
Set the codepage to 65001 before generating
Parker Moore 8f51bdc0fd Add note about current stable version of Octopress to README.
Fixes .
Parker Moore 78defff9e1 Merge pull request from wickedshimmy/patch-1
Fix spelling error
Matt Enright 33b92bdfbb Fix spelling error
Phil Haack 3477eaf834 chcp only needs to run once
Haacked 21d26da1b6 Add check for running on Windows
Haacked cf4af1d825 Set the codepage to 65001 before generating
Parker Moore 64ba603225 Merge pull request from IQAndreas/cleanup-date
Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
Andreas Renberg (IQAndreas) 408cade21f Rename 'data' to 'date_attributes'
Prevents ambiguity, since there is already a `date` property defined in
the instance.
Parker Moore 1230e01884 Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  removing border from iframe in jsFiddle plugin
  * properly escaped site title and post/page title in the RSS feeds;
  * consistently convert page and post titles to titlecase if site.titlecase is true;
rcmdnk 7f26224bb8 Allow no last space for gist number only in gist tag
Closes 
Parker Moore d577da7c0a Merge pull request from axiac/fixed-titlecase-usage
Fixed titlecase usage
Parker Moore cf4bdae818 Merge pull request from vernak2539/removing_frame_from_jsFiddle_iframe
Removing border from iframe in jsFiddle plugin
Parker Moore abc9ef5113 Move '/.' back to first arg in :update_style
Rel 
Parker Moore 4a3c160a17 Merge pull request from blake41/master
Fix update styles rake task
Parker Moore a1896c5126 Merge pull request from masondesu/patch-1
Fixed typo in path to jQuery fallback
Parker Moore 133921ecbf Merge pull request from TheChymera/master
changed sidebar content color so that it does not all change color on hover
J. B. Rainsberger b57935d42c Include timezone offset in new post template for YAML Front-Matter
Closes .
Horea Christian a94e02b6ed changed sidebar content color so that it does not all change color on hover.
Parker Moore e01dc8ae27 Merge pull request from AlexVPopov/patch-1
Fix a typo in Readme.markdown
AlexVPopov 519c0db07a Fix a typo in Readme.markdown
Alex Vernacchia 2f12296619 removing border from iframe in jsFiddle plugin
Valentin VALCIU c4dff251dc * properly escaped site title and post/page title in the RSS feeds;