aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge pull request #434 from nomulous/patch-1Brandon Mathis2012-02-191-2/+2
|\ \ \ \ | |/ / / |/| | | Github -> GitHub (capitalization)
| * | | Github -> GitHub (capitalization)Fletcher Tomalty2012-02-191-2/+2
|/ / /
* | | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2012-01-081-1/+1
|\ \ \ | |/ /
| * | Merge pull request #351 from grahamc/masterBrandon Mathis2012-01-071-1/+1
| |\ \ | | | | | | | | Resolve a simple _config.yml typo
| | * | tilecase -> titlecaseGraham Christensen2011-12-311-1/+1
| |/ /
* | | Fix for annoying overflow scroll issues caused by facebook and twitter ↵Brandon Mathis2012-01-083-1/+8
|/ / | | | | | | share/follow widgets.
* | Merge pull request #335 from hSATAC/masterBrandon Mathis2011-12-201-1/+1
|\ \ | | | | | | Fix delicious widget js error
| * | Fix delicious widget js errorhSATAC2011-12-211-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 commandBrandon Mathis2011-12-181-2/+6
| |
* | added site-wide description to config.yml (this provides a default meta ↵Brandon Mathis2011-12-131-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/develBrandon Mathis2011-12-131-1/+1
|\ \ | | | | | | Removed redeclaration of sidebar-border.
| * | Removed redeclaration of sidebar-border.Aditya Shevade2011-12-121-1/+1
|/ /
* | Merge pull request #322 from tgray/clearnoiseBrandon Mathis2011-12-121-1/+1
|\ \ | | | | | | Added !default to noise-bg
| * | Added !default to noise-bgTim Gray2011-12-121-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/searchtoggleBrandon Mathis2011-12-111-0/+2
|\ \ | | | | | | Search box can be toggled off.
| * | Search box can be toggled off.Tim Gray2011-12-111-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 Mathis2011-12-111-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 Mathis2011-12-112-2/+493
|/ / | | | | | | intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
* | Removed offending paren in RakefileBrandon Mathis2011-12-101-1/+1
| |
* | Rsync --delete option can be turned off in Rakefile configuration and users ↵Brandon Mathis2011-12-101-2/+7
| | | | | | | | can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 22:47:37 +0000