Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rakefile option for any additional rsync arguments | Johan Svensson | 2012-12-09 | 1 | -1/+2 |
| | | | | Added variable `rsync_args` | ||||
* | Disabled Rsync delete by default. Closes #787 | Brandon Mathis | 2012-10-13 | 1 | -1/+1 |
| | |||||
* | Using https instead of protocol relative urls, for Pinboard and Twitter feeds | Brandon Mathis | 2012-10-01 | 2 | -7/+7 |
| | |||||
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2012-09-29 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #675 from zlu/master | Brandon Mathis | 2012-09-09 | 1 | -6/+6 |
| |\ | | | | | | | Update Github API to V3 | ||||
| | * | Updated Github API to V3. | Zhao Lü | 2012-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed. | ||||
| | * | Updated Github API to V3. | Zhao Lü | 2012-07-19 | 1 | -5/+5 |
| | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed. | ||||
* | | | Twitter API call and links are now protocol relative | Brandon Mathis | 2012-09-29 | 1 | -5/+5 |
| | | | |||||
* | | | Updated Github API to V3. | Zhao Lü | 2012-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed. | ||||
* | | | Updated Github API to V3. | Zhao Lü | 2012-09-09 | 1 | -5/+5 |
|/ / | | | | | | | Github API V2 has been removed. The response data format also changed. | ||||
* | | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2012-09-06 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge pull request #706 from Confusion/patch-1 | Brandon Mathis | 2012-08-09 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Fix for issue #622 | ||||
| | * | | Fix for issue #622 | Ivo Wever | 2012-08-09 | 1 | -2/+2 |
| |/ / | | | | | | | | | | The filters bundled with Octopress are not applied to files ending in `.md`, because the match in octopress_filters.rb does not match `.md`. | ||||
* | | | bumped rbenv version fixing #743 | Brandon Mathis | 2012-09-06 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2012-08-03 | 1 | -1/+3 |
|\ \ | |||||
| * \ | Merge pull request #666 from nathanl/example_repo_url | Brandon Mathis | 2012-07-30 | 1 | -1/+3 |
| |\ \ | | |/ | |/| | Example repo URL - see Github issue 516 | ||||
| | * | Example repo URL - see Github issue 516 | Nathan Long | 2012-07-12 | 1 | -1/+3 |
| |/ | |||||
* | | 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 |