Commit Graph

155 Commits

Author SHA1 Message Date
Brandon Mathis
f180feb402 Added video and css masks to modernizer tests. Updated styles to work with new image mask classname 2012-06-05 00:08:45 -05:00
Brandon Mathis
1ea31d13a8 Merge branch 'master' into 2.1 2012-06-03 09:52:32 -05:00
OGINO Masanori
f3c68bb73f Do not strip trailing slash of canonical URLs.
Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
2012-06-02 11:14:12 +09: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
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
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
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
91e26fe430 Added a .nojekyll file for speedier GitHub pages generation 2012-05-22 17:14:44 -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
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
Hong Xu
910734359d Fix a weird character in the 404 page. 2012-05-22 10:56:15 +08:00
Brandon Mathis
42369ddf5d fixed class name attribute on linklog posts 2012-05-20 23:40:17 -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
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
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
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
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
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
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
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