aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #914 from rixth/masterBrandon Mathis2013-01-021-1/+4
|\ \ \ | | | | | | | | Escape github repo descriptions, as they may contain HTML.
| * | | Escape github repo descriptions, as they may contain HTML.Thomas Rix2013-01-021-1/+4
|/ / /
* | | removed accidentally added fileBrandon Mathis2013-01-021-0/+0
| | |
* | | Rake task new_post now accepts titles through stdinBrandon Mathis2013-01-011-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/masterBrandon Mathis2012-12-291-0/+7
|\ \ \ | | | | | | | | robots.txt generation
| * | | Added robots.txt, with sitemap linkJosep del Rio2012-04-191-0/+7
| | | |
* | | | updated gemsBrandon Mathis2012-12-292-29/+24
| | | |
* | | | Merge pull request #408 from dtchepak/category_link_filterBrandon Mathis2012-12-291-4/+12
|\ \ \ \ | | | | | | | | | | Extract category_link filter from category_generator.rb plugin
| * | | | Extract category_link filter from category_generator.rb pluginDavid Tchepak2012-02-021-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Allows category_link to be used as a filter to display a link to any category.
* | | | | Removed unnecessary regex in code block pluginBrandon Mathis2012-12-261-5/+1
| | | | |
* | | | | Titles in code plugins can have slashes in them. Closes #892Brandon Mathis2012-12-263-5/+5
| | | | |
* | | | | Merge pull request #844 from jsvensson/rsyncargsBrandon Mathis2012-12-191-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Rakefile option for any additional rsync arguments
| * | | | | Rakefile option for any additional rsync argumentsJohan Svensson2012-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added variable `rsync_args`
* | | | | | Merge pull request #824 from liangsun/patch-1Brandon Mathis2012-12-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | To support url without domain name like /path/file
| * | | | | | To support url without domain name like /path/fileLiang Sun2012-11-271-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 Mathis2012-12-182-29/+39
| | | | | | | | | | | | | | | | | | | | | | | | fail if you do not specify a filename.
* | | | | | Merge pull request #831 from parkr/englishBrandon Mathis2012-12-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixing English error pet-peeve.
| * | | | | Fixing English error pet-peeve.Parker Moore2012-11-301-1/+1
|/ / / / /
* | | | | Disabled Rsync delete by default. Closes #787Brandon Mathis2012-10-131-1/+1
| | | | |
* | | | | Using https instead of protocol relative urls, for Pinboard and Twitter feedsBrandon Mathis2012-10-012-7/+7
| | | | |
* | | | | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2012-09-290-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge pull request #675 from zlu/masterBrandon Mathis2012-09-091-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Update Github API to V3
| | * | | | | Updated Github API to V3.Zhao Lü2012-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed.
| | * | | | | Updated Github API to V3.Zhao Lü2012-07-191-5/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed.
* | | | | | Twitter API call and links are now protocol relativeBrandon Mathis2012-09-291-5/+5
| | | | | |
* | | | | | Updated Github API to V3.Zhao Lü2012-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed.
* | | | | | Updated Github API to V3.Zhao Lü2012-09-091-5/+5
|/ / / / / | | | | | | | | | | | | | | | Github API V2 has been removed. The response data format also changed.
* | | | | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2012-09-061-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #706 from Confusion/patch-1Brandon Mathis2012-08-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix for issue #622
| | * | | | | Fix for issue #622Ivo Wever2012-08-091-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 #743Brandon Mathis2012-09-061-1/+1
|/ / / / /
* | | | | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2012-08-031-1/+3
|\ \ \ \ \
| * \ \ \ \ Merge pull request #666 from nathanl/example_repo_urlBrandon Mathis2012-07-301-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | Example repo URL - see Github issue 516
| | * | | | Example repo URL - see Github issue 516Nathan Long2012-07-121-1/+3
| |/ / / /
* | | | | Updated gems and rubies to 1.9.3Brandon Mathis2012-07-313-6/+6
|/ / / /
* | | | Merge pull request #602 from zan5hin/powrcBrandon Mathis2012-06-101-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 Nichols2012-06-081-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-canonicalBrandon Mathis2012-06-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Do not strip trailing slash of canonical URLs.
| * | | | | Do not strip trailing slash of canonical URLs.OGINO Masanori2012-06-021-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 LiquidBrandon Mathis2012-05-243-7/+5
| | | | |
* | | | | Updated GemfileBrandon Mathis2012-05-232-54/+57
| | | | |
* | | | | Merge pull request #499 from lukekarrys/patch-1Brandon Mathis2012-05-211-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 Karrys2012-03-231-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | for that post are set to false.
* | | | | Octopress filters are now limited to html producing templating languages, ↵Brandon Mathis2012-05-211-2/+6
| | | | | | | | | | | | | | | | | | | | Fixes #536
* | | | | Fixed “3rd party plugins” wiki page linkAndrew Patton2012-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Brandon Mathis <brandon@imathis.com>
* | | | | updated to latest version of Sass, fixed deprecation warningsBrandon Mathis2012-05-193-7/+8
|/ / / /
* | | | Merge pull request #376 from robertkowalski/clrfBrandon Mathis2012-03-071-114/+114
|\ \ \ \ | |_|_|/ |/| | | Fix CRLF, closes #374
| * | | Fix CRLF, closes #374Robert Kowalski2012-01-141-114/+114
| | | |
* | | | Merge pull request #427 from joliss/typoBrandon Mathis2012-02-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo
| * | | | Fix typoJo Liss2012-02-151-1/+1
| | |_|/ | |/| |