1178 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	10d5fdaf51	fixed deprecation warning for sass extend feature	2012-05-19 13:30:59 -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
Luke Karrys	8b8fff3b03	Don't display comments link for post excerpts on index page when comments for that post are set to false.	2012-03-23 13:06:01 -07:00
Brandon Mathis	14a8bc05b3	Merge branch 'master' of github.com:imathis/octopress into site	2012-03-07 22:45:39 -06: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	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	a814ca76ea	Merge branch 'master' of github.com:imathis/octopress into linklog	2012-02-19 15:12:19 -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
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
Brandon Mathis	f14f0210f5	Merge branch 'linklog' into site-linklog	2012-02-18 14:50:06 -06: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	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	4fe0cbeb20	added customization and styling info to linklog docs	2012-02-12 18:12:17 -06:00
Brandon Mathis	55c5f8d4c1	added setting for marking standard blog posts	2012-02-12 17:42:09 -06:00
Brandon Mathis	6b93a6a57e	updated linklog docs	2012-02-12 17:38:37 -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
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