Commit Graph

617 Commits

Author SHA1 Message Date
Nathan Manzi
e334e832de Added disqus developer mode functionality
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 17:20:32 -05:00
Brandon Mathis
c06ba58466 removed some duplication from category url generation 2012-05-20 16:43:06 -05:00
Brandon Mathis
5e666bfe6b Category directory can be set to root directory. Closes #331 #369 2012-05-20 16:36:53 -05:00
Brandon Mathis
ecb1748c4e fixed issue where category layouts were using category feed xml instead of html layout 2012-05-20 16:23:08 -05:00
Avery Yen
19320018b2 Re-encoding of input string rather than force encoding. This is safer/more valid
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Avery Yen
dd5f3d3fef Force code blocks to be UTF. This fixes ASCII/UTF incompatabilities.
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Brandon Mathis
654a2937b8 Improvements to hosting with Github Pages:
1. Push deployment task pulls first, avoiding a --force push
  2. Improvements to rake task setup_github_pages:
    - Now only rewrites _config.yml if in default state
    - Attempts a pull from deploy repo before setting up as a new project
    - Detects conflicts between CNAME and _config.yml url
    - Links to GitHub's help documentation for CNAME setup
Fixes #561
2012-05-20 10:38:56 -05:00
Jeffrey Tratner
7025a1a90a changed pullquote to reflect multi-line pullquotes
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-19 17:00:01 -05:00
Brandon Mathis
73b7e2094e Merge branch 'master' into 2.1 2012-05-19 14:56:16 -05:00
Brandon Mathis
d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -05:00
Brandon Mathis
f954689bb6 Improved styling for linklog along with other scss refactoring.
Feed urls are more flexible with linklog items
2012-04-29 19:03:52 -05:00
Brandon Mathis
8013163d00 Merge branch 'master' of github.com:imathis/octopress into linklog 2012-03-07 22:42:09 -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
c26aa7e9a0 now per category feeds are optional (default to off) this should improve speed for the many people who don't use this feature 2012-02-19 16:27:45 -06:00
Brandon Mathis
a814ca76ea Merge branch 'master' of github.com:imathis/octopress into linklog 2012-02-19 15:12:19 -06: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
Brandon Mathis
895504f274 added support for excerpting feed articles, added linklog support to category feed, refactored feeds to reduce duplication 2012-02-18 22:45:40 -06:00
Brandon Mathis
107a4af528 moved the category_feed out of _includes/custom to _layouts/ 2012-02-18 15:28:06 -06:00
Brandon Mathis
36bbdb6dfe fixed variable accessing permalink label in atom.xml 2012-02-18 15:01:42 -06:00
Brandon Mathis
2cf6e5b2b9 removed puts from article partial, testing fragment (sorry) 2012-02-18 14:58:12 -06:00
Jo Liss
08bafd61fd Fix typo 2012-02-15 20:19:00 +01:00
Brandon Mathis
7c7d3b8476 Now RSS feed always has a permalink at the end of an article, just like
posts always show permalinks.
2012-02-14 14:52:30 -06:00
Brandon Mathis
382c557e21 fixed bug where all posts showed "read more" link 2012-02-12 20:04:42 -06:00
Brandon Mathis
55c5f8d4c1 added setting for marking standard blog posts 2012-02-12 17:42:09 -06:00
Brandon Mathis
aed317d92b added puts plugin for easily logging from liquid templates to the terminal 2012-02-12 17:00:36 -06:00
Brandon Mathis
ba98467538 removed poorly implemented monkey patch for compiling draft posts 2012-02-12 17:00:01 -06:00
Brandon Mathis
41c87bef4c added title and variable partials to blog index page 2012-02-12 13:16:18 -06:00
Brandon Mathis
eb540a4404 update_source now correctly updates the archive page if it has been moved to source/archive and removes empty directories 2012-02-12 13:11:23 -06:00
Brandon Mathis
23c876021e Refactored the template a bit more and improved blog and archive styling for linklogs 2012-02-12 12:27:17 -06:00
Brandon Mathis
9fd87c5186 fixed unquoted linklog label 2012-02-12 07:29:53 -06:00
Brandon Mathis
f1d4a47c85 added linklog configurations 2012-02-12 07:27:45 -06:00
Brandon Mathis
101a503f5a Added linklog publishing. 2012-02-12 07:12:22 -06:00
Robert Kowalski
6dacdbf3fd Fix CRLF, closes #374 2012-01-14 23:17:59 +01: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
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
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
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
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