Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated gems and rubies to 1.9.3 | Brandon Mathis | 2012-07-31 | 3 | -6/+6 |
| | |||||
* | Merge pull request #602 from zan5hin/powrc | Brandon Mathis | 2012-06-10 | 1 | -0/+5 |
|\ | | | | | Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ... | ||||
| * | Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and ↵ | Mark Nichols | 2012-06-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #592 from omasanori/fix-rel-canonical | Brandon Mathis | 2012-06-03 | 1 | -1/+1 |
|\ \ | | | | | | | Do not strip trailing slash of canonical URLs. | ||||
| * | | Do not strip trailing slash of canonical URLs. | OGINO Masanori | 2012-06-02 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | updated plugins to work with latest version of Liquid | Brandon Mathis | 2012-05-24 | 3 | -7/+5 |
| | | |||||
* | | Updated Gemfile | Brandon Mathis | 2012-05-23 | 2 | -54/+57 |
| | | |||||
* | | Merge pull request #499 from lukekarrys/patch-1 | Brandon Mathis | 2012-05-21 | 1 | -1/+1 |
|\ \ | | | | | | | Don't display comments link for post excerpts on index page when comments for that post are set to false | ||||
| * | | Don't display comments link for post excerpts on index page when comments ↵ | Luke Karrys | 2012-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | for that post are set to false. | ||||
* | | | Octopress filters are now limited to html producing templating languages, ↵ | Brandon Mathis | 2012-05-21 | 1 | -2/+6 |
| | | | | | | | | | | | | Fixes #536 | ||||
* | | | Fixed “3rd party plugins” wiki page link | Andrew Patton | 2012-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Brandon Mathis <brandon@imathis.com> | ||||
* | | | updated to latest version of Sass, fixed deprecation warnings | Brandon Mathis | 2012-05-19 | 3 | -7/+8 |
|/ / | |||||
* | | Merge pull request #376 from robertkowalski/clrf | Brandon Mathis | 2012-03-07 | 1 | -114/+114 |
|\ \ | | | | | | | Fix CRLF, closes #374 | ||||
| * | | Fix CRLF, closes #374 | Robert Kowalski | 2012-01-14 | 1 | -114/+114 |
| | | | |||||
* | | | Merge pull request #427 from joliss/typo | Brandon Mathis | 2012-02-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix typo | ||||
| * | | | Fix typo | Jo Liss | 2012-02-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #434 from nomulous/patch-1 | Brandon Mathis | 2012-02-19 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Github -> GitHub (capitalization) | ||||
| * | | | Github -> GitHub (capitalization) | Fletcher Tomalty | 2012-02-19 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2012-01-08 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #351 from grahamc/master | Brandon Mathis | 2012-01-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Resolve a simple _config.yml typo | ||||
| | * | | tilecase -> titlecase | Graham Christensen | 2011-12-31 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fix for annoying overflow scroll issues caused by facebook and twitter ↵ | Brandon Mathis | 2012-01-08 | 3 | -1/+8 |
|/ / | | | | | | | share/follow widgets. | ||||
* | | Merge pull request #335 from hSATAC/master | Brandon Mathis | 2011-12-20 | 1 | -1/+1 |
|\ \ | | | | | | | Fix delicious widget js error | ||||
| * | | Fix delicious widget js error | hSATAC | 2011-12-21 | 1 | -1/+1 |
|/ / | | | | | | | | | JS error occured when there's no tags on bookmarks Check if it's an empty string before join item[i].t | ||||
* | | now Github repo url can be specified inline setup_github_pages command | Brandon Mathis | 2011-12-18 | 1 | -2/+6 |
| | | |||||
* | | added site-wide description to config.yml (this provides a default meta ↵ | Brandon Mathis | 2011-12-13 | 1 | -0/+1 |
| | | | | | | | | description for the site, but can be overridden on on any page with page.description in the yaml) | ||||
* | | Merge pull request #323 from adibis/devel | Brandon Mathis | 2011-12-13 | 1 | -1/+1 |
|\ \ | | | | | | | Removed redeclaration of sidebar-border. | ||||
| * | | Removed redeclaration of sidebar-border. | Aditya Shevade | 2011-12-12 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #322 from tgray/clearnoise | Brandon Mathis | 2011-12-12 | 1 | -1/+1 |
|\ \ | | | | | | | Added !default to noise-bg | ||||
| * | | Added !default to noise-bg | Tim Gray | 2011-12-12 | 1 | -1/+1 |
|/ / | | | | | | | | | This lets us override the noise.png background image in the custom SCSS files if we choose. | ||||
* | | Merge pull request #319 from tgray/searchtoggle | Brandon Mathis | 2011-12-11 | 1 | -0/+2 |
|\ \ | | | | | | | Search box can be toggled off. | ||||
| * | | Search box can be toggled off. | Tim Gray | 2011-12-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Added a space between author and site to be sure it looked good in feed ↵ | Brandon Mathis | 2011-12-11 | 1 | -2/+2 |
| | | | | | | | | | | | | readers and places where the site CSS wasn't being loaded | ||||
* | | | Added RubyPants (the ruby port of John Gruber's smarty pants) to ↵ | Brandon Mathis | 2011-12-11 | 2 | -2/+493 |
|/ / | | | | | | | intelligently replace primes with smart quotes in the pullquote plugin, fixes #316 | ||||
* | | Removed offending paren in Rakefile | Brandon Mathis | 2011-12-10 | 1 | -1/+1 |
| | | |||||
* | | Rsync --delete option can be turned off in Rakefile configuration and users ↵ | Brandon Mathis | 2011-12-10 | 1 | -2/+7 |
| | | | | | | | | can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247 | ||||
* | | removed overflow hidden from <article> to prevent clipping on facebook's ↵ | Brandon Mathis | 2011-12-10 | 2 | -2/+1 |
| | | | | | | | | send dropdown, and fixed bug with styling on twitter status links | ||||
* | | now mobile navigation inlcudes subscription links fixes #299 | Brandon Mathis | 2011-12-10 | 1 | -1/+5 |
| | | |||||
* | | removed size restriction on twitter sidebar follow button | Brandon Mathis | 2011-12-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:imathis/octopress | Frederic Hemberger | 2011-12-10 | 1 | -8/+15 |
|\ \ | |||||
| * \ | Merge pull request #225 from imathis/post_names | Frederic Hemberger | 2011-12-10 | 1 | -8/+15 |
| |\ \ | | | | | | | | | Add more flexibility to :new_page task | ||||
| | * | | Adds more flexibility to :new_page task | Frederic Hemberger | 2011-10-16 | 1 | -8/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page filenames/directories are lowercased and sanitized by default to allow a greater flexibility: - new_page["/path/to/file"] # => source/path/to/file/index.markdown - new_page["path/to/file"] # => source/path/to/file/index.markdown - new_page["my path/my file"] # => source/my-path/my-file/index.markdown - new_page["lorem.ipsum.dolor"] # => source/lorem-dot-ipsum.dolor - new_page["Questions & Answers"] # => source/questions-and-answers/index.markdown | ||||
* | | | | :copydot ignores thumbnail files starting with '._' | Frederic Hemberger | 2011-12-10 | 1 | -5/+2 |
|/ / / | |||||
* | | | Merge pull request #271 from simensen/ConfigureFontFamilyForSubtitle | Frederic Hemberger | 2011-12-10 | 2 | -0/+5 |
|\ \ \ | | | | | | | | | Make font-family for subtitle configurable. | ||||
| * | | | Provide a way to configure font family for subtitle. | Beau Simensen | 2011-11-13 | 2 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #270 from omo/missing-default-variables | Frederic Hemberger | 2011-12-10 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Add missing default qualifiers to some sass variables. | ||||
| * | | | | Added missing default qualifiers to some sass variables. | MORITA Hajime | 2011-11-12 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #295 from jbrains/master | Frederic Hemberger | 2011-12-10 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Capitalize word after '!' and '?'. | ||||
| * | | | | | Improved, I think, the Titlecase plugin | J. B. Rainsberger | 2011-11-28 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #293 from imathis/generate_environment | Frederic Hemberger | 2011-12-10 | 2 | -2/+57 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Introduce distinction between preview/productive site generation |