Commit Graph

600 Commits

Author SHA1 Message Date
Brandon Mathis 0d222ba6b2 Updated gems and rubies to 1.9.3 2012-07-31 14:55:23 -05:00
Brandon Mathis f5b6df5a57 Merge pull request #602 from zan5hin/powrc
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
2012-06-10 13:21:45 -07:00
Mark Nichols 944255f879 Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.
Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
2012-06-08 13:58:52 -05:00
Brandon Mathis 90ef78edb3 Merge pull request #592 from omasanori/fix-rel-canonical
Do not strip trailing slash of canonical URLs.
2012-06-03 07:46:58 -07: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 e53b26ad30 updated plugins to work with latest version of Liquid 2012-05-24 10:28:32 -05:00
Brandon Mathis 2a55f35211 Updated Gemfile 2012-05-23 21:20:03 -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 8753a6b00c Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:06:52 -05:00
Andrew Patton c5e2e524f8 Fixed “3rd party plugins” wiki page link
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 18:03:10 -05:00
Brandon Mathis d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -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 9f40242b1e Merge pull request #376 from robertkowalski/clrf
Fix CRLF, closes #374
2012-03-07 13:40:54 -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
Jo Liss 08bafd61fd Fix typo 2012-02-15 20:19:00 +01: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
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 39ec55b605 Removed offending paren in Rakefile 2011-12-10 18:30:33 -06:00
Brandon Mathis bdc3cb8bd3 Rsync --delete option can be turned off in Rakefile configuration and users can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247 2011-12-10 18:18:34 -06:00
Brandon Mathis 692c8f3491 removed overflow hidden from <article> to prevent clipping on facebook's send dropdown, and fixed bug with styling on twitter status links 2011-12-10 12:50:04 -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
Frederic Hemberger e220fcc610 Merge branch 'master' of github.com:imathis/octopress 2011-12-10 14:48:35 +01:00
Frederic Hemberger 254cdd35d6 :copydot ignores thumbnail files starting with '._' 2011-12-10 14:46:13 +01:00
Frederic Hemberger e5c262cb8f Merge pull request #225 from imathis/post_names
Add more flexibility to :new_page task
2011-12-10 04:04:48 -08:00
Frederic Hemberger e8ee5219c3 Merge pull request #271 from simensen/ConfigureFontFamilyForSubtitle
Make font-family for subtitle configurable.
2011-12-10 03:49:26 -08:00
Frederic Hemberger a34bdf251c Merge pull request #270 from omo/missing-default-variables
Add missing default qualifiers to some sass variables.
2011-12-10 03:46:33 -08:00
Frederic Hemberger cb61146264 Merge pull request #295 from jbrains/master
Capitalize word after '!' and '?'.
2011-12-10 03:24:16 -08:00
Frederic Hemberger 7f3ad1c1cc Merge pull request #293 from imathis/generate_environment
Introduce distinction between preview/productive site generation
2011-12-10 03:21:59 -08:00
Frederic Hemberger d99434bca9 Merge pull request #315 from vamsee/master
rvm does not recognize the current .rvmrc syntax
2011-12-09 21:31:34 -08:00
Vamsee Kanakala 6dd79215c7 use correct .rvmrc syntax 2011-12-10 06:11:06 +05:30
Brandon Mathis 19325e8f40 Merge pull request #298 from nistude/master
Nested lists should not have margin-bottom
2011-12-02 07:49:31 -08:00
Nikolay Sturm 6bf5258f1f nested lists should not have a margin-bottom 2011-12-02 16:04:36 +01:00