Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Whitespace | richo | 2013-01-11 | 6 | -10/+10 | |
|/ / / | ||||||
* | | | updated ender.js to latest | Brandon Mathis | 2013-01-06 | 2 | -1400/+3159 | |
| | | | ||||||
* | | | Merge pull request #914 from rixth/master | Brandon Mathis | 2013-01-02 | 1 | -1/+4 | |
|\ \ \ | | | | | | | | | Escape github repo descriptions, as they may contain HTML. | |||||
| * | | | Escape github repo descriptions, as they may contain HTML. | Thomas Rix | 2013-01-02 | 1 | -1/+4 | |
|/ / / | ||||||
* | | | removed accidentally added file | Brandon Mathis | 2013-01-02 | 1 | -0/+0 | |
| | | | ||||||
* | | | Rake task new_post now accepts titles through stdin | Brandon Mathis | 2013-01-01 | 1 | -2/+5 | |
| | | | | | | | | | | | | This should help resolve issues for zsh users and make it easier to enter titles which freak out Rake's argument processing | |||||
* | | | Merge pull request #537 from joseprio/master | Brandon Mathis | 2012-12-29 | 1 | -0/+7 | |
|\ \ \ | | | | | | | | | robots.txt generation | |||||
| * | | | Added robots.txt, with sitemap link | Josep del Rio | 2012-04-19 | 1 | -0/+7 | |
| | | | | ||||||
* | | | | updated gems | Brandon Mathis | 2012-12-29 | 2 | -29/+24 | |
| | | | | ||||||
* | | | | Merge pull request #408 from dtchepak/category_link_filter | Brandon Mathis | 2012-12-29 | 1 | -4/+12 | |
|\ \ \ \ | | | | | | | | | | | Extract category_link filter from category_generator.rb plugin | |||||
| * | | | | Extract category_link filter from category_generator.rb plugin | David Tchepak | 2012-02-02 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows category_link to be used as a filter to display a link to any category. | |||||
* | | | | | Removed unnecessary regex in code block plugin | Brandon Mathis | 2012-12-26 | 1 | -5/+1 | |
| | | | | | ||||||
* | | | | | Titles in code plugins can have slashes in them. Closes #892 | Brandon Mathis | 2012-12-26 | 3 | -5/+5 | |
| | | | | | ||||||
* | | | | | Merge pull request #844 from jsvensson/rsyncargs | Brandon Mathis | 2012-12-19 | 1 | -1/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Rakefile option for any additional rsync arguments | |||||
| * | | | | | Rakefile option for any additional rsync arguments | Johan Svensson | 2012-12-09 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Added variable `rsync_args` | |||||
* | | | | | | Merge pull request #824 from liangsun/patch-1 | Brandon Mathis | 2012-12-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | To support url without domain name like /path/file | |||||
| * | | | | | | To support url without domain name like /path/file | Liang Sun | 2012-11-27 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | You need to know if you would like to support this, each word in the title can not start with "/". | |||||
* | | | | | | gist tag plugin now works with the latest changes GitHub gists and does not ↵ | Brandon Mathis | 2012-12-18 | 2 | -29/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | fail if you do not specify a filename. | |||||
* | | | | | | Merge pull request #831 from parkr/english | Brandon Mathis | 2012-12-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fixing English error pet-peeve. | |||||
| * | | | | | Fixing English error pet-peeve. | Parker Moore | 2012-11-30 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | 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 | |
| | | | |