Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-08-21 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589 | Brandon Mathis | 2011-08-21 | 1 | -1/+1 |
| |\ | | | | | | | minor tweak to _typography.scss to have pp, code, and tt extend style that exists | ||||
| | * | fixed @extend for pp, code, and tt. The @extend was extending a non-existant ↵ | Jake McCrary | 2011-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | entry. | ||||
* | | | added support for deploying "dot" files (eg. .htaccess), fixes #104 | Brandon Mathis | 2011-08-21 | 1 | -2/+14 |
|/ / | |||||
* | | Merge branch 'master' of https://github.com/rwz/octopress into rwz-master | Brandon Mathis | 2011-08-21 | 3 | -1/+5 |
|\ \ | |||||
| * | | added stringex gem for permalink url generation | Pavel Pravosud | 2011-08-20 | 3 | -1/+5 |
| | | | |||||
* | | | include_code now defaults to relative urls for easy testing on a development ↵ | Brandon Mathis | 2011-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | server | ||||
* | | | improved lang:language for codeblock and include code. It no longer strips ↵ | Brandon Mathis | 2011-08-21 | 2 | -4/+4 |
| | | | | | | | | | | | | out surrounding whitespace. | ||||
* | | | added option to force syntax highlighting language, example: {% include_code ↵ | Brandon Mathis | 2011-08-20 | 2 | -2/+11 |
| | | | | | | | | | | | | file lang:ruby %}. Fixes #108 | ||||
* | | | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-08-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | added excerpt_link to article include. fixes #97 | Brandon Mathis | 2011-08-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | centralized pygments aliases into pygments_code.rb. Added alias for .ru ↵ | Brandon Mathis | 2011-08-20 | 3 | -6/+4 |
|/ / / | | | | | | | | | | (ruby), which sort of fixes #108 | ||||
* | | | now only excerpted articles show the "read on" link. Also the text for that ↵ | Brandon Mathis | 2011-08-20 | 3 | -3/+12 |
|/ / | | | | | | | link can be set in the _config.yml | ||||
* | | updated blog theme to default to left aligned images. To center images, use ↵ | Brandon Mathis | 2011-08-18 | 1 | -2/+3 |
| | | | | | | | | classname "center" | ||||
* | | reordered arguments in pagination | Brandon Mathis | 2011-08-18 | 1 | -2/+2 |
| | | |||||
* | | Codeblock regex improved to better detect extensions fixes #96, added ↵ | Brandon Mathis | 2011-08-16 | 3 | -13/+21 |
| | | | | | | | | support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks | ||||
* | | added blog_index_dir configuration and improved update_source | Brandon Mathis | 2011-08-16 | 1 | -16/+14 |
| | | |||||
* | | removed unusable blog_index partial | Brandon Mathis | 2011-08-16 | 1 | -40/+0 |
| | | |||||
* | | Added support for pagination with a blog index in any directory (helps with ↵ | Brandon Mathis | 2011-08-16 | 3 | -3/+162 |
| | | | | | | | | landing pages). Added configuration for pagination directory base | ||||
* | | expand_urls now correctly matches urls pointing to the root directory, ↵ | Brandon Mathis | 2011-08-16 | 1 | -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 metadata | Brandon Mathis | 2011-08-14 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #93 from fsdev-cmiller/master | Brandon Mathis | 2011-08-12 | 1 | -1/+2 |
|\ \ | | | | | | | Fix Code Text in Lists | ||||
| * | | Code text works in lists now. | Chris Miller | 2011-08-12 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #91 from brigham/extra-subdir | Brandon Mathis | 2011-08-12 | 2 | -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 Brown | 2011-08-11 | 2 | -4/+2 |
|/ / | |||||
* | | Merge branch 'master' of github.com:imathis/octopress | Brandon Mathis | 2011-08-11 | 3 | -42/+48 |
|\ \ | |||||
| * \ | Merge pull request #87 from marutanm/fix_rake-list | Brandon Mathis | 2011-08-11 | 1 | -1/+1 |
| |\ \ | | | | | | | | | fix rake-list | ||||
| | * | | fix rake-list | marutanm | 2011-08-11 | 1 | -1/+1 |
| |/ / | |||||
| * | | added support for preserving customized source/index.html during template ↵ | Brandon Mathis | 2011-08-10 | 3 | -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 #90 | Brandon Mathis | 2011-08-11 | 2 | -2/+2 |
|/ / | |||||
* | | 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 |
| |