Commit Graph

900 Commits (dcb8a9a595ebf5d64703aa868f1907bc432913b8)
 

Author SHA1 Message Date
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;
Valentin VALCIU a79855d1c3 * consistently convert page and post titles to titlecase if site.titlecase is true;
Brandon Mathis 74d7238934 Merge pull request from aleiphoenix/master
fix minor mis-spelling
AR 628e0e4d9a fix minor mis-spelling
Andreas Renberg (IQAndreas) 797aeb5074 Call overridden version of `to_liquid` and remove duplicate code
Make sure to call "overidden" method which keeps us nice and compatible
so we don't need to keep up with whatever Jekyll usually does, and make
sure to include it in our overriden method.

I have had it with these monkey-patching methods in this Monday-to-
Friday language!

Add method `liquid_date_attributes`.

Cleanup the Post and Page overrides to be more similar.
Brandon Mathis 4fd754a762 Removed space to fix HAML compatibility on include_code.
Brandon Mathis 050c393a4e Merge pull request from kAworu/master
make codeblock play nice with HAML
Parker Moore c5141ef70d Merge pull request from pfista/master
Use a protocol-relative url to load disqus over https or http
Michael Pfister f11df1b6ac removed superfluous parentheses
Michael Pfister 556fa9fe4d Use a protocol-relative url to load disqus over https or http
Alexandre Perrin 9225798c0b Merge branch 'master' of https://github.com/imathis/octopress