Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | fixed issue where port setting didn't change jekyll's webbrick in ↵ | Brandon Mathis | 2011-08-07 | 1 | -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-fix | Brandon Mathis | 2011-08-04 | 1 | -1/+3 | |
|\ \ | | | | | | | correctly scope locals | |||||
| * | | correctly scope locals | Philip Hofstetter | 2011-08-04 | 1 | -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-fix | Brandon Mathis | 2011-08-04 | 1 | -2/+2 | |
|\ \ | |/ |/| | Update atom.xml to use site.title and expand_urls | |||||
| * | Update atom.xml to use site.title and expand_urls | Stephen Tudor | 2011-08-04 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #64 from adamnbowen/master | Brandon Mathis | 2011-08-02 | 1 | -0/+2 | |
|\ | | | | | added source.old and sass.old into .gitignore | |||||
| * | added source.old, sass.old to .gitignore | Adam Bowen | 2011-08-02 | 1 | -0/+2 | |
|/ | ||||||
* | changed mdash to unicode character to help some users with encoding errors | Brandon Mathis | 2011-08-02 | 1 | -1/+1 | |
| | ||||||
* | added explaination to _config.yml for why pygments are turned off | Brandon Mathis | 2011-08-02 | 1 | -1/+1 | |
| | ||||||
* | added header to customizable includes | Brandon Mathis | 2011-08-01 | 2 | -6/+7 | |
| | ||||||
* | added yml alias for yaml code highlighting | Brandon Mathis | 2011-08-01 | 2 | -0/+2 | |
| | ||||||
* | added a raw option to render_partial. Now you can import partials without ↵ | Brandon Mathis | 2011-08-01 | 1 | -5/+14 | |
| | | | | having them parsed by the Liquid template parser | |||||
* | code_block and inlcude_code no longer needlessly render through the Liquid ↵ | Brandon Mathis | 2011-08-01 | 2 | -8/+0 | |
| | | | | template parser | |||||
* | Backtick codeblocks now correctly replace & with & and Textile support ↵ | Brandon Mathis | 2011-08-01 | 1 | -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 Mathis | 2011-07-31 | 1 | -2/+1 | |
| | | | | preserving navigation and footer | |||||
* | added custom partials for for footer and navigation | Brandon Mathis | 2011-07-31 | 4 | -8/+10 | |
| | ||||||
* | update instructions for adding custom asides | Brandon Mathis | 2011-07-31 | 1 | -1/+1 | |
| | ||||||
* | added support for custom includes | Brandon Mathis | 2011-07-31 | 3 | -2/+8 | |
| | ||||||
* | limited atom feed to 20 most recent items | Brandon Mathis | 2011-07-31 | 1 | -1/+1 | |
| | ||||||
* | removed unused sidebar include | Brandon Mathis | 2011-07-30 | 1 | -1/+0 | |
| | ||||||
* | added config for multiple asides | Brandon Mathis | 2011-07-30 | 1 | -2/+9 | |
| | ||||||
* | added multi sidebar support | Brandon Mathis | 2011-07-30 | 4 | -4/+25 | |
| | ||||||
* | Merge branch 'woodwardjd-master' | Brandon Mathis | 2011-07-30 | 3 | -4/+62 | |
|\ | ||||||
| * | Merge branch 'master' of https://github.com/woodwardjd/octopress into ↵ | Brandon Mathis | 2011-07-29 | 3 | -4/+62 | |
| |\ | | | | | | | | | | woodwardjd-master | |||||
| | * | allow select and order of sidebar components to be configurable in jekyll's ↵ | Jason Woodward | 2011-07-28 | 3 | -4/+62 | |
| | | | | | | | | | | | | _config.yml | |||||
* | | | fixed empty line stripping from codeblocks | Brandon Mathis | 2011-07-30 | 1 | -1/+1 | |
|/ / | ||||||
* | | added support for width and height to image tag plugin | Brandon Mathis | 2011-07-29 | 1 | -5/+13 | |
| | | ||||||
* | | Improved support for adding author metadata to pages | Brandon Mathis | 2011-07-29 | 2 | -1/+7 | |
| | | ||||||
* | | include_code is now more forgiving, stripping leading forward slashes from ↵ | Brandon Mathis | 2011-07-29 | 1 | -1/+1 | |
| | | | | | | | | the code_dir config | |||||
* | | Rake task update_source now preserves footer as well as navigation | Brandon Mathis | 2011-07-28 | 1 | -0/+1 | |
| | | ||||||
* | | Now rss link in head will update correctly with changes to the config | Brandon Mathis | 2011-07-28 | 1 | -1/+2 | |
| | | ||||||
* | | Add support using github backtick code blocks without supplying a language | Brandon Mathis | 2011-07-28 | 1 | -7/+19 | |
| | | ||||||
* | | added cannonical link to head | Brandon Mathis | 2011-07-28 | 1 | -0/+1 | |
| | | ||||||
* | | removed appcache because it was annoying firefox users | Brandon Mathis | 2011-07-28 | 1 | -1/+1 | |
| | | ||||||
* | | added / to the end of the permalinks by default to be more compatible with ↵ | Brandon Mathis | 2011-07-28 | 1 | -1/+1 | |
| | | | | | | | | diqus permalink matching for wordpress default imports | |||||
* | | improved replacement filters for textile markup on github backtick ↵ | Brandon Mathis | 2011-07-28 | 1 | -1/+2 | |
| | | | | | | | | codeblocks, added comment to show regular HTML support | |||||
* | | updated Github style backtick filter to support textile, markdown and html | Brandon Mathis | 2011-07-28 | 1 | -1/+15 | |
|/ | ||||||
* | Merge pull request #53 from zumda/master | Brandon Mathis | 2011-07-28 | 1 | -0/+2 | |
|\ | | | | | Code blocks didn't work with textile | |||||
| * | making textile and code blocks work nice together | Andreas Arnold | 2011-07-28 | 1 | -0/+2 | |
|/ | ||||||
* | fixed bug where multiple github style codeblcoks were getting eaten | Brandon Mathis | 2011-07-27 | 1 | -1/+1 | |
| | ||||||
* | fixed update style | Brandon Mathis | 2011-07-27 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #51 from lukearmstrong/patch-5 | Brandon Mathis | 2011-07-27 | 1 | -0/+8 | |
|\ | | | | | Fixed rake update_source and rake update_style | |||||
| * | Fixed rake update_source and rake update_style | Luke Armstrong | 2011-07-28 | 1 | -0/+8 | |
|/ | ||||||
* | Merge pull request #49 from lukearmstrong/patch-3 | Brandon Mathis | 2011-07-27 | 1 | -1/+1 | |
|\ | | | | | Fixed rake update_source | |||||
| * | Fixed [cp: cannot stat `.themes/classic/source/*.': No such file or directory] | Luke Armstrong | 2011-07-27 | 1 | -1/+1 | |
|/ | ||||||
* | improved new_post title substitutions, fixed directories in rake update tasks | Brandon Mathis | 2011-07-27 | 1 | -3/+3 | |
| | ||||||
* | fixed bug in backtick_codeblock where indentations were being ↵ | Brandon Mathis | 2011-07-26 | 1 | -1/+2 | |
| | | | | unintentionally removed | |||||
* | added support for github style backtick code blocks | Brandon Mathis | 2011-07-26 | 2 | -1/+15 | |
| | ||||||
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-07-26 | 1 | -1/+1 | |
|\ | ||||||
| * | Merge pull request #43 from ballou88/master | Brandon Mathis | 2011-07-26 | 1 | -1/+1 | |
| |\ | | | | | | | Rakefile |