aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added support for pagination with a blog index in any directory (helps with ↵Brandon Mathis2011-08-163-3/+162
| | | | landing pages). Added configuration for pagination directory base
* expand_urls now correctly matches urls pointing to the root directory, ↵Brandon Mathis2011-08-161-1/+1
| | | | allowing / to be replaced with /subdir/ if site is configured with a different root directory
* 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
|\ | | | | Fix Code Text in Lists
| * 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.
| * 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-list
| | * fix rake-listmarutanm2011-08-111-1/+1
| |/
| * added support for preserving customized source/index.html during template ↵Brandon Mathis2011-08-103-41/+47
| | | | | | | | updates. Moved the blog index code to a partial in source/_includes/blog_index.html
* | 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 ↵Brandon Mathis2011-08-071-1/+1
| | | | _config.yml. Accidentally used port where I should have used server_port fixes #70
* 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