Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: TonnyXu/octopress
...
head fork: TonnyXu/octopress
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Feb 20, 2012
Roman Yepishev Raise RuntimeError when gist is unavailable ef8392e
Commits on Feb 21, 2012
Roman Yepishev Convert to integer before comparing. data.code is String 7ebc0a0
Commits on Feb 24, 2012
Chris Miller Fix for bottom margin in nested lists. d38f9f8
Commits on Feb 26, 2012
@treyhunner treyhunner Add EditorConfig file for Ruby files 05f54ab
@treyhunner treyhunner Add EditorConfig file for classic theme 0996e56
Commits on Jun 19, 2012
@vyper vyper Added stringex and changed to use #to_url for create directory. To do…
…n't receive error in url to accented characters.
d102dcd
Commits on Jul 12, 2012
@earaya earaya optimized order of styles and scripts in header b9191cc
Commits on Nov 08, 2012
@vyper vyper Upgrade ruby version e1020ed
Commits on Jan 30, 2013
@sjml sjml Update plugins/pygments_code.rb
Making it so the build doesn't fail if a bad lexer is passed to the code highlighting.
9293ecc
@rretsiem rretsiem Async load of Facebook JS
added async switch = TRUE to loader.
According to Google PageSpeed the Facebook JS was not loaded async which blocks rendering of the page as long as the JS isn't fully loaded.
d5b491f
Commits on Jan 31, 2013
@sjml sjml Update plugins/pygments_code.rb
Giving a more helpful error message instead of silently failing.
35e23f5
Commits on Feb 13, 2013
@floydpink floydpink fixed issue #949 using @alexkirmse's patch 510c6d6
Commits on Feb 15, 2013
@floydpink floydpink Fixed issue with mobile nav choosing the last option by default. Fixes 43751b7
Commits on Feb 18, 2013
@schwern schwern Use the Github API repo sorting.
The Github API can sort by pushed time, no need to do it manually.
http://developer.github.com/v3/repos/#list-user-repositories

This is both more efficient, Github does the sorting, but it also
fixes a bug.  Because the list of results are paginated, if you have
more than a page's worth of repositories it will only sort that page.
This results in a false view of what has been recently pushed.

For a good example, try my github account "schwern" with and
without this patch.
cc93e6f
Commits on Feb 19, 2013
@parkr parkr Merge pull request #1031 from schwern/github_repo_sorting
Use the Github API repo sorting.
8fada73
Commits on Feb 20, 2013
@parkr parkr Use HTML5 '&' character to connect query params in GitHub API call. #… cc5f508
Commits on Feb 22, 2013
@parkr parkr It's 2013. Hi, MIT License. 4790b93
Commits on Feb 24, 2013
@vyper vyper Merge branch 'master' of github.com:imathis/octopress
Conflicts:
	plugins/category_generator.rb
2fe9da9
Commits on Feb 25, 2013
@joneslee85 joneslee85 Bump sinatra to 1.3.5 960145f
Commits on Feb 28, 2013
@parkr parkr Merge pull request #1074 from joneslee85/bump-sinatra
Bump sinatra to 1.3.5
f4f4282
Commits on Mar 05, 2013
@parkr parkr Merge pull request #438 from roman-yepishev/gist_error
Raise RuntimeError when gist is unavailable - #437
51905b6
@parkr parkr Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. 407a242
@parkr parkr Merge pull request #448 from NSError/list-fix
Fix for bottom margin in nested lists.
e7a9b3f
@parkr parkr Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. de8e79f
@parkr parkr Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. #438
  Fix for bottom margin in nested lists.
7f4cf25
@parkr parkr Merge pull request #452 from treyhunner/topic/editorconfig
Add EditorConfig files to define indentation styles
880b0fb
@parkr parkr Merge pull request #629 from vyper/master
Added stringex and changed to use #to_url for create directory.
e2596c0
@parkr parkr Merge pull request #664 from earaya/master
Styles & scripts optimization in the document head
524e337
Commits on Mar 06, 2013
@parkr parkr Merge pull request #990 from sjml/patch-1
Generate can fail if Pygments can't parse a code block
392e32b
@parkr parkr Merge pull request #991 from rretsiem/patch-2
Async load of Facebook JS
16c18e4
@parkr parkr Added .gitattributes file to keep CRLF's out of the codebase. 3548752
@parkr parkr Merge branch 'master' of github.com:imathis/octopress
* 'master' of github.com:imathis/octopress:
  Update plugins/pygments_code.rb
  Async load of Facebook JS
  Update plugins/pygments_code.rb
  Upgrade ruby version
  optimized order of styles and scripts in header
  Added stringex and changed to use #to_url for create directory. To don't receive error in url to accented characters.
cf5e909
Commits on Mar 09, 2013
@imathis imathis Removed Twitter and Ender.js. Added jQuery and updated Modernizr 9801354
Commits on Mar 10, 2013
@peterboni peterboni Mobile nav fixed.
Now shows links instead of 'undefined'.
dee2900
@imathis imathis removed Twitter configuration for timeline and follow buton which are…
… no longer integrated
4157cda
@imathis imathis Fixed GitHub jsonp call. Closed #1118 c35ff7b
@imathis imathis Merge pull request #1116 from peterboni/patch-1
Mobile nav fixed.
1c79199
@imathis imathis added config_tag plugin for integration of configuration into templates 2bec7f8
Commits on Mar 11, 2013
@imathis imathis Improved: config_tag plugin is much more flexible now and can be used…
… by other plugins directly through the config_tag method
05db158
@imathis imathis Added sass-globbing, allowing plugin stylesheets to be auto-imported …
…from the assets/stylesheets/plugins directory
9364f37
@imathis imathis fixed addSidebarToggler where index and section were flip-flopped 75cc24c
Commits on Mar 23, 2013
@joelclermont joelclermont Enable inline PHP syntax highlighting
Pygments has a "startinline" option which is only relevant for the PhpLexer. It allows syntax highlighting without the opening <?php tag. I believe this option is ignored for every other lexer.

Could you either set this to true by default using the proposed change? Or could this be exposed as a setting somewhere in _config.yml? I can't think of a reason someone would not want this enabled.
1a1c868
Commits on Apr 04, 2013
@imathis imathis fixed mobile navigation 49a27c9
@imathis imathis fixed video wrapping js 7dfba9a
Commits on Apr 09, 2013
@imathis imathis Allowing dashes in code names. Closes #1166 3ab22cb
@imathis imathis Accepting all non-whitespace characters as language names for Pygment…
…s code highlighting
afca876
@imathis imathis Added support for deploying to github.io 1bd2b62
@imathis imathis Sinatra now correctly returns code 404 when a page is not found. Closes 09558c6
Commits on May 07, 2013
@imathis imathis Updated RDiscount, added footnotes and other extensions 11a1ba6
@imathis imathis Removed a couple of buggy filters on RDiscount (for now) 21985f2
@imathis imathis Footnotes styling updates ac5d253
Commits on May 09, 2013
@imathis imathis Recent posts sidebar now correctly observes titlecase settings e83dfcc
Commits on May 11, 2013
@kAworu kAworu Fix codeblock rendering with HAML when there is a filetype defined. fe28c0b
Commits on May 23, 2013
@vinc vinc Added !default to $img-border 6d3eb3f
Commits on May 31, 2013
@erizhang erizhang add https protocol supporting during rake setup_github_pages f5bb4dd
Commits on Jun 11, 2013
@elbowdonkey elbowdonkey Adjusted JsFiddle plugin to detect jsFiddle versions.
Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't
render the desired tab order properly since the regex pattern was
being capturing the /5 as part of the first of the tabs.
46be4c8
@elbowdonkey elbowdonkey Revised the regex for JsFiddle plugin after further testing. a2ee7a0
Commits on Jun 15, 2013
@imathis imathis Merge pull request #1267 from vinc/feature-default
Added !default to $img-border
2292fc0
@imathis imathis Merge pull request #1275 from erizhang/add_https_support
add https protocol supporting during rake setup_github_pages
82e2473
@parkr parkr Merge pull request #1281 from elbowdonkey/master
Allow for JsFiddle versions.
84ee8d0
@myoung34 myoung34 The gist hashes have changed. They include letters now 3cac6b9
@parkr parkr Merge pull request #1282 from myoung34/gist-fix
The gist hashes have changed. They include letters now
0e2bff1
Commits on Jun 23, 2013
@imathis imathis Github Pages deployment is now using `git add -A` for compatability w…
…ith Git 1.8.2+
bc67475
Commits on Jun 25, 2013
@SamWhited SamWhited Use protocol relative URL for Twitter 27dcfa1
@SamWhited SamWhited Fix second Twitter URL to be protocol relative 0978977
Commits on Jun 26, 2013
@parkr parkr Merge pull request #1286 from SamWhited/master
Use protocol relative URL's for Twitter
1bcfe84
Commits on Jul 02, 2013
@imathis imathis updated Sass to 3.2 dbdf64e
@stevenharman stevenharman Use HTTPS for Rubygems
It is now recommended to use HTTPS for connecting to Rubygems.
7b52209
@parkr parkr Merge pull request #1291 from stevenharman/patch-1
Use HTTPS for Rubygems
b8a981d
Commits on Jul 09, 2013
@imathis imathis Merge pull request #1141 from joelclermont/patch-1
Enable inline PHP syntax highlighting
64bb9a3
Commits on Jul 13, 2013
@ndbroadbent ndbroadbent Fix http generated images path when using Compass sprites
Otherwise compass uses '/source/images' for the sprite image URL
7a4feb1
@parkr parkr Deprecate 1.9.2, add 2.0.0 :) bd2caad
@parkr parkr Merge pull request #1298 from imathis/deprecate-192-whoops
Deprecate 1.9.2, add 2.0.0
d85c241
@imathis imathis Merge pull request #1297 from ndbroadbent/patch-1
Fix http generated images path when using Compass sprites
2432f99
Commits on Jul 15, 2013
Blake Johnson update style rake task to copy from new sass to old sass folder. it s…
…eems like it was backwards before which makes no sense
b19dbff
Commits on Jul 16, 2013
@daphotron daphotron Remove redundant reset-html5, global-reset already calls reset-html5 9627982
@parkr parkr Merge pull request #1300 from daphotron/master
Remove redundant reset-html5 call
9cf6b5f
Commits on Jul 25, 2013
@masondesu masondesu Fixed typo in path to jQuery fallback
The `libs` folder was typoed as `lib`
fc37d92
Commits on Aug 21, 2013
@rslifka rslifka Use source/CNAME (if it exists) to set _config.yml url property def01cb
Commits on Aug 22, 2013
@rslifka rslifka Extract method f56cbb5
Commits on Aug 23, 2013
@rslifka rslifka Improved readability 7f19c78
@rslifka rslifka Removed outdated ruby version manager configurations; update to .ruby…
…-version
56a1868
@rslifka rslifka Let's use the specified format - https://gist.github.com/fnichol/1912050
af8c4ca
@imathis imathis Merge pull request #1328 from sharethrough/master
Use the CNAME from /source when (re)generating _config.yml
b7756c4
@parkr parkr Merge pull request #1330 from rslifka/master
Use version-manager-agnostic Ruby version specification
b030e0c
@imathis imathis Fixed setup_github_pages success message. #1328 77dc6a1
@imathis imathis Fixed blog_url for personal github pages projects. #1328 a604dce
Commits on Aug 29, 2013
@imathis imathis Set a fixed version for directory_watcher gem. 3e1707d
Commits on Sep 04, 2013
@parkr parkr Update Gemfile.lock. f75547f
Commits on Sep 19, 2013
@parkr parkr Remove .ruby-version file and add note to README regarding minimum Ru…
…by version.


@imathis - look ok?

Closes #1365.
9c41abf
@nagimov nagimov ".git" added to sample string with SSH repository URL
Octopress does not work with a repo URL like a "git@github.com:your_username/your_username.github.io" ("ERROR: repository not found" error appears).
It is necessary to add ".git" to the end of this line.
d7a4bf5
Commits on Sep 20, 2013
@parkr parkr Merge pull request #1367 from nagimov/patch-1
".git" added to sample string with SSH repository URL
f0674c6
@aleiphoenix aleiphoenix fix old style gist url not found issue cbf4b65
Commits on Sep 27, 2013
@kAworu kAworu Merge branch 'master' of https://github.com/imathis/octopress 8bfd5ef
Commits on Sep 30, 2013
@treyhunner treyhunner Add proper disqus identifier comment count links
Fixes #277
4cc7682
Commits on Oct 03, 2013
@kAworu kAworu Fix Disqus over https.
  Forcing http:// as protocol will make Disqus fail when server over
  https for security reasons.
0a1b94d
@parkr parkr Merge pull request #1384 from kAworu/fix-disqus-over-https
Fix Disqus over https.
8aa851e
Commits on Oct 06, 2013
@parkr parkr Merge branch 'fix-gist-plugin' of git://github.com/aleiphoenix/octopr…
…ess into aleiphoenix-fix-gist-plugin

* 'fix-gist-plugin' of git://github.com/aleiphoenix/octopress:
  fix old style gist url not found issue
6a7cced
@parkr parkr Clean up Gist redirection. e692d8e
@parkr parkr Error handling FTW f43163b
@parkr parkr Merge pull request #1385 from imathis/aleiphoenix-fix-gist-plugin
Handle Gists returning 302's
ff71657
Commits on Oct 07, 2013
@kAworu kAworu Merge branch 'master' of https://github.com/imathis/octopress 9225798
Commits on Oct 10, 2013
@pfista pfista Use a protocol-relative url to load disqus over https or http 556fa9f
@pfista pfista removed superfluous parentheses f11df1b
@parkr parkr Merge pull request #1390 from pfista/master
Use a protocol-relative url to load disqus over https or http
c5141ef
Commits on Oct 12, 2013
@imathis imathis Merge pull request #1254 from kAworu/master
make codeblock play nice with HAML
050c393
@imathis imathis Removed space to fix HAML compatibility on include_code. 4fd754a
Commits on Oct 19, 2013
@IQAndreas IQAndreas 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.
797aeb5
Commits on Oct 24, 2013
@aleiphoenix aleiphoenix fix minor mis-spelling 628e0e4
@imathis imathis Merge pull request #1399 from aleiphoenix/master
fix minor mis-spelling
74d7238
Commits on Oct 28, 2013
@axiac axiac * consistently convert page and post titles to titlecase if site.titl…
…ecase is true;
a79855d
@axiac axiac * properly escaped site title and post/page title in the RSS feeds; c4dff25
@vernak2539 vernak2539 removing border from iframe in jsFiddle plugin 2f12296
Commits on Oct 31, 2013
@AlexVPopov AlexVPopov Fix a typo in Readme.markdown 519c0db
@parkr parkr Merge pull request #1405 from AlexVPopov/patch-1
Fix a typo in Readme.markdown
e01dc8a
Commits on Nov 01, 2013
@TheChymera TheChymera changed sidebar content color so that it does not all change color on…
… hover.
a94e02b
Commits on Nov 17, 2013
@jbrains jbrains Include timezone offset in new post template for YAML Front-Matter
Closes #1419.
b57935d
Commits on Nov 18, 2013
@parkr parkr Merge pull request #1406 from TheChymera/master
changed sidebar content color so that it does not all change color on hover
133921e
@parkr parkr Merge pull request #1301 from masondesu/patch-1
Fixed typo in path to jQuery fallback
a1896c5
@parkr parkr Merge pull request #1299 from blake41/master
Fix update styles rake task
4a3c160
@parkr parkr Move '/.' back to first arg in :update_style
Rel #1299
abc9ef5
@parkr parkr Merge pull request #1402 from vernak2539/removing_frame_from_jsFiddle…
…_iframe

Removing border from iframe in jsFiddle plugin
cf4bdae
@parkr parkr Merge pull request #1400 from axiac/fixed-titlecase-usage
Fixed titlecase usage
d577da7
@rcmdnk rcmdnk Allow no last space for gist number only in gist tag
Closes #1394
7f26224
@parkr parkr 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;
1230e01
@IQAndreas IQAndreas Rename 'data' to 'date_attributes'
Prevents ambiguity, since there is already a `date` property defined in
the instance.
408cade
@parkr parkr Merge pull request #1397 from IQAndreas/cleanup-date
Call overridden version of `to_liquid` and remove duplicate code in `Octopress::Date`
64ba603
Commits on Nov 29, 2013
tonny.xu Merge branch 'master' into source
Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml
e458548