Brandon Mathis
14a8bc05b3
Merge branch 'master' of github.com:imathis/octopress into site
2012-03-07 22:45:39 -06:00
Brandon Mathis
9f40242b1e
Merge pull request #376 from robertkowalski/clrf
...
Fix CRLF, closes #374
2012-03-07 13:40:54 -08:00
Brandon Mathis
84933ebb63
Merge branch 'site' of github.com:imathis/octopress into site
2012-02-19 15:53:13 -06:00
Brandon Mathis
692c5c32e5
fixed help layout
2012-02-19 15:52:55 -06:00
Brandon Mathis
3f7c2c6033
Merge pull request #425 from lukekarrys/patch-1
...
Comments link still visible on home page for excerpts even when comments for that post are set to false
2012-02-19 11:27:58 -08:00
Brandon Mathis
a8c9fb8d7a
Merge pull request #427 from joliss/typo
...
Fix typo
2012-02-19 11:26:41 -08:00
Brandon Mathis
b215202f1d
Merge pull request #434 from nomulous/patch-1
...
Github -> GitHub (capitalization)
2012-02-19 11:25:50 -08:00
Fletcher Tomalty
4b8aeb2774
Github -> GitHub (capitalization)
2012-02-19 01:40:53 -05:00
Jo Liss
08bafd61fd
Fix typo
2012-02-15 20:19:00 +01:00
Luke Karrys
12138d2951
Don't display comments link for post excerpts on index page when comments for that post are set to false
2012-02-14 22:55:43 -07:00
Brandon Mathis
4fe0cbeb20
added customization and styling info to linklog docs
2012-02-12 18:12:17 -06:00
Brandon Mathis
6b93a6a57e
updated linklog docs
2012-02-12 17:38:37 -06:00
Brandon Mathis
39d2075b49
added some docs for linklogs
2012-02-12 06:30:13 -06:00
Brandon Mathis
bf9070a6fd
fixed blog url to point to octopress.org
2012-02-11 19:13:58 -06:00
Brandon Mathis
9e1da28bba
Merge branch 'site' of github.com:imathis/octopress into site
2012-02-05 17:12:14 -06:00
Brandon Mathis
37bd08c73e
updated rvn installation docs, removed disqus comments
2012-02-05 17:12:03 -06:00
Robert Kowalski
6dacdbf3fd
Fix CRLF, closes #374
2012-01-14 23:17:59 +01:00
Brandon Mathis
1bd24edba5
Merge branch 'site' of github.com:imathis/octopress into site
...
Conflicts:
source/_includes/head.html
2012-01-08 19:58:52 -06:00
Brandon Mathis
dfd5f4e754
Merge branch 'master' into site
2012-01-08 19:57:27 -06:00
Brandon Mathis
c069dc7276
Merge branch 'master' of github.com:imathis/octopress
2012-01-08 19:57:13 -06:00
Brandon Mathis
930747f06f
Fix for annoying overflow scroll issues caused by facebook and twitter share/follow widgets.
2012-01-08 19:56:55 -06:00
Brandon Mathis
59bd3d7af9
updated to latest style/source
2012-01-08 19:56:48 -06:00
Brandon Mathis
ef148b28e2
Fix for annoying overflow scroll issues caused by facebook and twitter share/follow widgets.
2012-01-08 19:54:17 -06:00
Brandon Mathis
34173ec3f5
Merge branch 'master' into site
...
Conflicts:
.themes/classic/source/javascripts/github.js
Rakefile
_config.yml
2012-01-08 17:29:25 -06:00
Brandon Mathis
bffb20c517
Merge pull request #351 from grahamc/master
...
Resolve a simple _config.yml typo
2012-01-07 15:01:56 -08:00
Graham Christensen
944dfd7583
tilecase -> titlecase
2011-12-31 23:46:37 -05:00
Brandon Mathis
f698e85343
fixed a few innacuracies in the docs, and saved deployment to github setup
2011-12-30 10:56:23 -06:00
Brandon Mathis
f99234b10e
Merge pull request #335 from hSATAC/master
...
Fix delicious widget js error
2011-12-20 21:21:38 -08:00
hSATAC
a5a16b4039
Fix delicious widget js error
...
JS error occured when there's no tags on bookmarks
Check if it's an empty string before join item[i].t
2011-12-21 10:53:32 +08:00
Brandon Mathis
948cba709a
added CNAME for hosting with Github pages
2011-12-19 10:40:13 -06:00
Brandon Mathis
479d36332c
Merge branch 'master' into site
...
Conflicts:
_config.yml
2011-12-19 10:39:51 -06:00
Brandon Mathis
ce0d25100b
now Github repo url can be specified inline setup_github_pages command
2011-12-18 15:38:11 -06:00
Brandon Mathis
fca7f10fe9
added site-wide description to config.yml (this provides a default meta description for the site, but can be overridden on on any page with page.description in the yaml)
2011-12-13 08:37:34 -06:00
Brandon Mathis
7932d9ebe7
Merge pull request #323 from adibis/devel
...
Removed redeclaration of sidebar-border.
2011-12-13 06:03:35 -08:00
Aditya Shevade
11bdf8ab66
Removed redeclaration of sidebar-border.
2011-12-12 21:31:21 -08:00
Brandon Mathis
78242e3e02
Merge pull request #322 from tgray/clearnoise
...
Added !default to noise-bg
2011-12-12 08:49:00 -08:00
Tim Gray
78fd9f48f9
Added !default to noise-bg
...
This lets us override the noise.png background image in the custom SCSS
files if we choose.
2011-12-12 11:14:15 -05:00
Brandon Mathis
2d88efbf14
Merge branch 'master' into site
2011-12-11 19:08:30 -06:00
Brandon Mathis
b51071372b
Merge pull request #319 from tgray/searchtoggle
...
Search box can be toggled off.
2011-12-11 15:03:31 -08:00
Brandon Mathis
4e0fec0e0f
Added a space between author and site to be sure it looked good in feed readers and places where the site CSS wasn't being loaded
2011-12-11 16:24:46 -06:00
Brandon Mathis
d5a02a78f6
Added RubyPants (the ruby port of John Gruber's smarty pants) to intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
2011-12-11 16:24:39 -06:00
Brandon Mathis
b00b966b3a
Added a space between author and site to be sure it looked good in feed readers and places where the site CSS wasn't being loaded
2011-12-11 16:24:32 -06:00
Brandon Mathis
2c91c276c1
Added RubyPants (the ruby port of John Gruber's smarty pants) to intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
2011-12-11 16:20:04 -06:00
Tim Gray
2c1ec7434b
Search box can be toggled off.
...
By leaving 'simple_search' parameter blank in the _config.yml file, the
search form in the navigation.html include is omitted. This lets you
put your own custom search form in the custom/navigation.html file.
2011-12-11 16:15:39 -05:00
Brandon Mathis
dfb3c6e07f
updated rsync docs
2011-12-11 00:55:39 -06:00
Brandon Mathis
a5732b9a76
updated docs for deploying with rsync
2011-12-11 00:32:57 -06:00
Brandon Mathis
19c18ad300
updated to latest
2011-12-10 18:48:43 -06:00
Brandon Mathis
51ba8170b5
Merge branch 'master' into site
2011-12-10 18:30:40 -06:00
Brandon Mathis
39ec55b605
Removed offending paren in Rakefile
2011-12-10 18:30:33 -06:00
Brandon Mathis
a4ea559ec9
fixed merge in rakefile
2011-12-10 18:19:39 -06:00
