Commit Graph

838 Commits (5d2db07c44307c03261411286e4657751cc8789e)
 

Author SHA1 Message Date
Brandon Mathis 5d2db07c44 Merge pull request from Blaisorblade/patch-1
Add link to add site to the wiki
Brandon Mathis 7da3902324 Merge pull request from muescha/patch-1
leave some hints about OP3.0
Brandon Mathis 52aa0d2524 Merge pull request from blbradley/rakefile-cname-sourcedir
Rakefile: use source_dir when setting url via CNAME
Brandon Mathis 2e730f96be Merge pull request from VincentTam/jquery-ref
Fix the way of loading the local copy of jQuery
Vincent Tam 137195384e Fix the way of loading the local copy of jQuery
Deleted the dot at the beginning of the path in the script that called the local copy of jQuery.
Brandon Mathis 514ed5eb9f Google broke old site-search method, this fixes it
Brandon Bradley 818301c17b Rakefile: use source_dir when setting url via CNAME
Parker Moore 3345fa5897 Merge pull request from tangledhelix/feature-windows-ampersand
Fix 1656 - & needs specific quoting under Windows. Closes .
Dan Lowe 5a2f6481c8 Fix 1656 - & needs specific quoting under Windows
muescha 01065de7c2 leave some hints about OP3.0 (not mentioned on imathis/octopress and not at octopress.org )
Paolo G. Giarrusso 22bde7ed2e Add link to add site to the wiki
So that more people will do it and it'll take less time. As long as we trust people, that's good.
Parker Moore c6c5b74f4d Merge pull request from Darkhogg/patch-1
Fixed setup_github_pages failing and not properly writing url to _config.yml
Parker Moore c434de5977 Merge pull request from kamatari/fix-rake-clean
enable wildcard of rm_rf
Masahiro Kamata 9b43210b8a enable wildcard of rm_rf
Brandon Mathis 6bd719fd96 Fixed issue with RubyPants and the Octopress hooks filter
Brandon Mathis c9e0078d65 Merge pull request from yous/patch-layout
Set layout to null to suppress warning
ChaYoung You 2d40f51bd2
Set layout to null to suppress warning
Not applied in 0f1660437b.
Brandon Mathis 0f1660437b Set layout to null to avoid page defaults.
Brandon Mathis bb06eec777 Merge pull request from yous/patch-octopress-filter
Use `octopress-hooks` and `octopress-date-format`
ChaYoung You 3d0e85730d
Use `octopress-hooks` and `octopress-date-format`
Not applied in 73e540409c.

Fix .
Brandon Mathis 73e540409c Support octopress-hooks and octopress-date-format
Parker Moore 18784a4cb0 Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'"
This reverts commit 181d620c1c.
Parker Moore ce458d8b9e Merge pull request from raysrashmi/ry-updating-gems
remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
Rashmi Yadav 181d620c1c remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
Parker Moore 6a099bfdb9 Delete Gemfile.lock
Follow-up to 
Parker Moore f4d17ca45d Merge pull request from nickhammond/patch-1
.gitignore Gemfile.lock per previous commit
Nick Hammond ed0412bef8 .gitignore Gemfile.lock per previous commit
Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again.

06c0439705
Parker Moore c977b91e40 Merge pull request from alindeman/patch-1
Fixes load path issues with ruby-based git credential helpers
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