257 Commits

Author	SHA1	Message	Date
Brandon Mathis	60698fd742	Merge branch '2.1' into site ... Conflicts: .themes/classic/sass/base/_solarized.scss	2012-05-25 12:48:13 -05:00
Brandon Mathis	ae967b264d	improved flexability of styling code blocks. Improved the light theme.	2012-05-25 11:36:57 -05:00
Brandon Mathis	4efb88c72a	Merge branch '2.1' into site	2012-05-24 23:04:08 -05:00
Brandon Mathis	d40eaab07c	Switched out ender.js in favor of jQuery. Some small improvements to sidebar feed scripts	2012-05-24 23:03:59 -05:00
Brandon Mathis	6c8b51bd16	Merge branch '2.1' into site	2012-05-24 22:49:13 -05:00
Maxwell Swadling	b69e876828	Fixed paths in GitHub api lists from using api urls instead of HTML urls. ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Maxwell Swadling	693fc29572	Updated GitHub repos list to use GitHub Api v3 ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Brandon Mathis	409897f209	Merge branch '2.1' into site	2012-05-24 15:42:40 -05:00
Brandon Mathis	e81e1c8289	Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages	2012-05-24 10:18:28 -05:00
Brandon Mathis	1eca86fa3f	Merge branch '2.1' into site	2012-05-22 21:19:07 -05:00
Brandon Mathis	47573af6c6	Improved mobile navigation injection script to work when search is not present. Fixes #380	2012-05-22 21:18:55 -05:00
Brandon Mathis	7e5ae5ecd8	Merge branch '2.1' into site-2.1	2012-05-22 17:15:30 -05:00
Brandon Mathis	91e26fe430	Added a .nojekyll file for speedier GitHub pages generation	2012-05-22 17:14:44 -05:00
Brandon Mathis	61a4169593	Merge branch '2.1' into site-2.1	2012-05-22 11:29:15 -05:00
Brandon Mathis	82386a0426	Merge branch 'master' into 2.1 ... Conflicts: .themes/classic/source/_includes/article.html	2012-05-22 09:28:59 -05:00
Brandon Mathis	c9d3b0e288	Merge pull request #499 from lukekarrys/patch-1 ... Don't display comments link for post excerpts on index page when comments for that post are set to false	2012-05-21 23:13:28 -07:00
Brandon Mathis	0f1be647cf	Merge branch '2.1' into site-2.1	2012-05-21 23:58:36 -05:00
Brandon Mathis	03aa250b96	Merge pull request #571 from xuhdev/2.1-404-quote-char ... weird quote character in the 404 page	2012-05-21 21:58:05 -07:00
Brandon Mathis	29a05c931f	Added a generator meta tag. closes #465	2012-05-21 23:56:45 -05:00
Brandon Mathis	b07e533d4a	Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description ... Conflicts: .themes/classic/source/_includes/head.html	2012-05-21 23:54:21 -05:00
Brandon Mathis	b785a87869	Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description	2012-05-21 23:47:27 -05:00
Hong Xu	910734359d	Fix a weird character in the 404 page.	2012-05-22 10:56:15 +08:00
Brandon Mathis	860094feba	Merge branch '2.1' into site-2.1	2012-05-20 23:40:31 -05:00
Brandon Mathis	42369ddf5d	fixed class name attribute on linklog posts	2012-05-20 23:40:17 -05:00
Brandon Mathis	ad40321eff	Merge branch '2.1' into site-2.1	2012-05-20 22:23:42 -05:00
Brandon Mathis	741107291b	Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375	2012-05-20 22:23:18 -05:00
Brandon Mathis	91cfd16d38	Merge branch '2.1' into site-2.1	2012-05-20 17:27:34 -05:00
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	bc717eafe2	Merge branch '2.1' into site	2012-05-19 17:00:33 -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
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	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
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	41c87bef4c	added title and variable partials to blog index page	2012-02-12 13:16:18 -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	101a503f5a	Added linklog publishing.	2012-02-12 07:12:22 -06:00