aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed @extend for pp, code, and tt. The @extend was extending a non-existant ↵Jake McCrary2011-08-061-1/+1
| | | | entry.
* Merge pull request #73 from pilif/twitter-js-scope-fixBrandon Mathis2011-08-041-1/+3
|\ | | | | correctly scope locals
| * correctly scope localsPhilip Hofstetter2011-08-041-1/+3
| | | | | | | | | | | | | | | | having such generic variables as feed and i global is a recipe for trouble waiting to happen. These variables aren't used outside of the twitter plugin, so we can easily make them local to getTwitterFeed
* | Merge pull request #74 from smt/feed-fixBrandon Mathis2011-08-041-2/+2
|\ \ | |/ |/| Update atom.xml to use site.title and expand_urls
| * 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 and sass.old into .gitignore
| * 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 ↵Brandon Mathis2011-08-011-5/+14
| | | | having them parsed by the Liquid template parser
* code_block and inlcude_code no longer needlessly render through the Liquid ↵Brandon Mathis2011-08-012-8/+0
| | | | template parser
* Backtick codeblocks now correctly replace & with & and Textile support ↵Brandon Mathis2011-08-011-8/+3
| | | | for back tick code blocks has been removed. It never really worked. Textile makes me sad.
* udpated rake udpate_source task to preserve custom includes instaed of ↵Brandon Mathis2011-07-311-2/+1
| | | | preserving navigation and footer
* 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 ↵Brandon Mathis2011-07-293-4/+62
| |\ | | | | | | | | | woodwardjd-master
| | * allow select and order of sidebar components to be configurable in jekyll's ↵Jason Woodward2011-07-283-4/+62
| | | | | | | | | | | | _config.yml
* | | fixed empty line stripping from codeblocksBrandon Mathis2011-07-301-1/+1
|/ /
* | added support for width and height to image tag pluginBrandon Mathis2011-07-291-5/+13
| |
* | Improved support for adding author metadata to pagesBrandon Mathis2011-07-292-1/+7
| |
* | include_code is now more forgiving, stripping leading forward slashes from ↵Brandon Mathis2011-07-291-1/+1
| | | | | | | | the code_dir config
* | Rake task update_source now preserves footer as well as navigationBrandon Mathis2011-07-281-0/+1
| |
* | Now rss link in head will update correctly with changes to the configBrandon Mathis2011-07-281-1/+2
| |
* | Add support using github backtick code blocks without supplying a languageBrandon Mathis2011-07-281-7/+19
| |
* | added cannonical link to headBrandon Mathis2011-07-281-0/+1
| |
* | removed appcache because it was annoying firefox usersBrandon Mathis2011-07-281-1/+1
| |
* | added / to the end of the permalinks by default to be more compatible with ↵Brandon Mathis2011-07-281-1/+1
| | | | | | | | diqus permalink matching for wordpress default imports
* | improved replacement filters for textile markup on github backtick ↵Brandon Mathis2011-07-281-1/+2
| | | | | | | | codeblocks, added comment to show regular HTML support
* | updated Github style backtick filter to support textile, markdown and htmlBrandon Mathis2011-07-281-1/+15
|/
* Merge pull request #53 from zumda/masterBrandon Mathis2011-07-281-0/+2
|\ | | | | Code blocks didn't work with textile
| * making textile and code blocks work nice togetherAndreas Arnold2011-07-281-0/+2
|/
* fixed bug where multiple github style codeblcoks were getting eatenBrandon Mathis2011-07-271-1/+1
|
* fixed update styleBrandon Mathis2011-07-271-1/+1
|
* Merge pull request #51 from lukearmstrong/patch-5Brandon Mathis2011-07-271-0/+8
|\ | | | | Fixed rake update_source and rake update_style
| * Fixed rake update_source and rake update_styleLuke Armstrong2011-07-281-0/+8
|/
* Merge pull request #49 from lukearmstrong/patch-3Brandon Mathis2011-07-271-1/+1
|\ | | | | Fixed rake update_source
| * Fixed [cp: cannot stat `.themes/classic/source/*.': No such file or directory]Luke Armstrong2011-07-271-1/+1
|/
* improved new_post title substitutions, fixed directories in rake update tasksBrandon Mathis2011-07-271-3/+3
|
* fixed bug in backtick_codeblock where indentations were being ↵Brandon Mathis2011-07-261-1/+2
| | | | unintentionally removed
* added support for github style backtick code blocksBrandon Mathis2011-07-262-1/+15
|
* Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-07-261-1/+1
|\
| * Merge pull request #43 from ballou88/masterBrandon Mathis2011-07-261-1/+1
| |\ | | | | | | Rakefile