Brandon Mathis ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master ...

Conflicts:
	plugins/category_generator.rb

2011-09-04 08:37:22 -05:00

..

_includes

Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master

2011-09-04 08:37:22 -05:00

_layouts

move code for Twitter, Google +1 and Google Analytics to bottom of page, as inline <script> tags are always blocking page load

2011-09-04 12:17:44 +02:00

assets/jwplayer

Moved themes to .themes to get it out of the way. Updated Rakefile to support .themes dir and remove duplication. Improved deploy task. Renamed init_deploy to cofig_deploy and rewrote it to update configurations in the Rakefile for easier deploy use

2011-06-29 14:01:06 -04:00

blog/archives

Improved variable names for setting footer, sharing, sidebar and metadata diesplay from page configurations

2011-07-18 16:59:59 -04:00

images

moved the favicon.png to the root directory for better discoverability

2011-07-19 22:43:29 -04:00

javascripts

Merge branch 'github-repositories-plugin' of https://github.com/pilif/octopress into pilif-github-repositories-plugin

2011-09-03 09:09:15 -05:00

atom.xml

Update atom.xml to use site.title and expand_urls

2011-08-04 09:31:20 -04:00

favicon.png

moved the favicon.png to the root directory for better discoverability

2011-07-19 22:43:29 -04:00

index.html

Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base

2011-08-16 00:43:22 -04:00