Commit Graph

148 Commits

Author SHA1 Message Date
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
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
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
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
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
479d36332c Merge branch 'master' into site
Conflicts:
	_config.yml
2011-12-19 10:39:51 -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
19c18ad300 updated to latest 2011-12-10 18:48:43 -06:00
Brandon Mathis
645eb6140b now mobile navigation inlcudes subscription links fixes #299 2011-12-10 12:49:55 -06:00
Brandon Mathis
738a284399 removed size restriction on twitter sidebar follow button 2011-12-10 12:49:29 -06:00
Brandon Mathis
7f9db2bb56 now mobile navigation inlcudes subscription links fixes #299 2011-12-10 12:45:03 -06:00
Brandon Mathis
607bd69235 removed size restriction on twitter sidebar follow button 2011-12-10 10:50:16 -06:00
Frederic Hemberger
987dccee76 Add custom date format to pages, add 'updated' field again
Reverts changes of c2a68cc where I accidentally removed support for 'updated' field, see comments of issue #164 for details.
2011-11-03 20:32:38 +01:00
Frederic Hemberger
262eb52bc5 Reverted commit 514e848 (issue #236), should fix Disqus identifier issues.
See also: https://github.com/imathis/octopress/wiki/Disqus-identifier-issues
2011-11-01 17:29:29 +01:00
Frederic Hemberger
029fa9bf31 Add response check, fixes #252 2011-10-28 16:21:02 +02:00
Aaron Malone
3bba3ed4cf only include facebook js if facebook_like is true 2011-10-23 00:46:00 -05:00
Frederic Hemberger
a81ef5e28b Improve handling of meta description 2011-10-21 15:00:32 +02:00
Frederic Hemberger
514e84831c Use canonical URL for Disqus, fixes #236 2011-10-21 14:04:34 +02:00
Frederic Hemberger
81e814a354 Remove unsupported 'updated' flag from _includes/post/date.html
Jekyll does not support this value for Page or Post classes. The
capture returned an empty Sting, which was always evaluated to true
in '{% if updated %}'.
2011-10-18 17:39:19 +02:00
Frederic Hemberger
c2a68cc2a9 Make post's date output configurable via _config.yml, closes #164
A new config variable 'date_format' is introduced in _config.yml.
It can either be set to "ordinal" to use the current format or it
can be given a string complying to strftime() format identifiers.
2011-10-18 17:25:31 +02:00
Frederic Hemberger
ff7099207b Moves Google Analytics to <head> allowing verification for Google Webmaster Tools, fixes #204 2011-10-17 20:34:13 +02:00
Frederic Hemberger
35a598df03 Adds support for Google+ widget, supports author information in search results, fixes #203 2011-10-17 20:14:29 +02:00
Frederic Hemberger
1362e9d57b Removes <nav> for Pagination links, fixes #216 2011-10-17 18:50:28 +02:00
Frederic Hemberger
2812bf7c3e Adds prev/next link below post, fixes #218 2011-10-16 14:27:21 +02:00
Frederic Hemberger
d84daa2a88 Merge pull request #201 from mikl/category-feeds
Adds per-category Atom feeds.
2011-10-16 04:58:14 -07:00
Frederic Hemberger
d98a4de07e Makes titlecase of page/post titles configurable 2011-10-16 11:57:29 +02:00
Frederic Hemberger
13babc6d7d Merge pull request #210 from xdworks/294accde545a7213b274c5b625b44a17ed72e0f3
Facebook Like button integration, fixes #176
2011-10-11 05:29:09 -07:00
xdite
294accde54 facebook like option 2011-10-09 16:36:53 +08:00
Drew Wells
734ee1f31e As other things rely on these variables, they need to be global.
Fixes issues with comments not loading on the blog.  
Semicolons non-optional due to SAFE function http://twitter.com/#!/elijahmanor/status/121980870428069890
2011-10-09 04:14:27 -03:00