aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rwz/octopress into rwz-masterBrandon Mathis2011-08-213-1/+5
|\
| * added stringex gem for permalink url generationPavel Pravosud2011-08-203-1/+5
* | include_code now defaults to relative urls for easy testing on a development ...Brandon Mathis2011-08-211-1/+1
* | improved lang:language for codeblock and include code. It no longer strips ou...Brandon Mathis2011-08-212-4/+4
* | added option to force syntax highlighting language, example: {% include_code ...Brandon Mathis2011-08-202-2/+11
* | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-08-201-1/+1
|\ \
| * | added excerpt_link to article include. fixes #97Brandon Mathis2011-08-201-1/+1
* | | centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby...Brandon Mathis2011-08-203-6/+4
|/ /
* | now only excerpted articles show the "read on" link. Also the text for that l...Brandon Mathis2011-08-203-3/+12
|/
* updated blog theme to default to left aligned images. To center images, use c...Brandon Mathis2011-08-181-2/+3
* reordered arguments in paginationBrandon Mathis2011-08-181-2/+2
* Codeblock regex improved to better detect extensions fixes #96, added support...Brandon Mathis2011-08-163-13/+21
* added blog_index_dir configuration and improved update_sourceBrandon Mathis2011-08-161-16/+14
* removed unusable blog_index partialBrandon Mathis2011-08-161-40/+0
* Added support for pagination with a blog index in any directory (helps with l...Brandon Mathis2011-08-163-3/+162
* expand_urls now correctly matches urls pointing to the root directory, allowi...Brandon Mathis2011-08-161-1/+1
* page layout will now accept pages without title metadataBrandon Mathis2011-08-141-0/+2
* Merge pull request #93 from fsdev-cmiller/masterBrandon Mathis2011-08-121-1/+2
|\
| * Code text works in lists now.Chris Miller2011-08-121-1/+2
|/
* Merge pull request #91 from brigham/extra-subdirBrandon Mathis2011-08-122-4/+2
|\
| * Fix extra subdirectories appearing in category links and atom.xml link.Brigham Brown2011-08-112-4/+2
|/
* Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-08-113-42/+48
|\
| * Merge pull request #87 from marutanm/fix_rake-listBrandon Mathis2011-08-111-1/+1
| |\
| | * fix rake-listmarutanm2011-08-111-1/+1
| |/
| * added support for preserving customized source/index.html during template upd...Brandon Mathis2011-08-103-41/+47
* | now using rack instead of Jekyll's webrick server, fixes #90Brandon Mathis2011-08-112-2/+2
|/
* fixed issue where port setting didn't change jekyll's webbrick in _config.yml...Brandon Mathis2011-08-071-1/+1
* Merge pull request #73 from pilif/twitter-js-scope-fixBrandon Mathis2011-08-041-1/+3
|\
| * correctly scope localsPhilip Hofstetter2011-08-041-1/+3
* | Merge pull request #74 from smt/feed-fixBrandon Mathis2011-08-041-2/+2
|\ \ | |/ |/|
| * Update atom.xml to use site.title and expand_urlsStephen Tudor2011-08-041-2/+2
|/
* Merge pull request #64 from adamnbowen/masterBrandon Mathis2011-08-021-0/+2
|\
| * added source.old, sass.old to .gitignoreAdam Bowen2011-08-021-0/+2
|/
* changed mdash to unicode character to help some users with encoding errorsBrandon Mathis2011-08-021-1/+1
* added explaination to _config.yml for why pygments are turned offBrandon Mathis2011-08-021-1/+1
* added header to customizable includesBrandon Mathis2011-08-012-6/+7
* added yml alias for yaml code highlightingBrandon Mathis2011-08-012-0/+2
* added a raw option to render_partial. Now you can import partials without hav...Brandon Mathis2011-08-011-5/+14
* code_block and inlcude_code no longer needlessly render through the Liquid te...Brandon Mathis2011-08-012-8/+0
* Backtick codeblocks now correctly replace & with & and Textile support fo...Brandon Mathis2011-08-011-8/+3
* udpated rake udpate_source task to preserve custom includes instaed of preser...Brandon Mathis2011-07-311-2/+1
* added custom partials for for footer and navigationBrandon Mathis2011-07-314-8/+10
* update instructions for adding custom asidesBrandon Mathis2011-07-311-1/+1
* added support for custom includesBrandon Mathis2011-07-313-2/+8
* limited atom feed to 20 most recent itemsBrandon Mathis2011-07-311-1/+1
* removed unused sidebar includeBrandon Mathis2011-07-301-1/+0
* added config for multiple asidesBrandon Mathis2011-07-301-2/+9
* added multi sidebar supportBrandon Mathis2011-07-304-4/+25
* Merge branch 'woodwardjd-master'Brandon Mathis2011-07-303-4/+62
|\
| * Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwar...Brandon Mathis2011-07-293-4/+62
| |\