aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | updated Gemfile.lock, fixes #59Brandon Mathis2011-08-221-5/+5
| | |
* | | using @extend for responsive blocks, added shadow-box mixin to utlities for ↵Brandon Mathis2011-08-224-13/+24
| |/ |/| | | | | configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes #109
* | Merge branch 'master' of github.com:imathis/octopressBrandon Mathis2011-08-211-1/+1
|\ \
| * \ Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589Brandon Mathis2011-08-211-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 McCrary2011-08-061-1/+1
| | | | | | | | | | | | | | | | entry.
* | | | added support for deploying "dot" files (eg. .htaccess), fixes #104Brandon Mathis2011-08-211-2/+14
|/ / /
* | | 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
| | | | | | | | | | | | | | | | server
* | | | improved lang:language for codeblock and include code. It no longer strips ↵Brandon Mathis2011-08-212-4/+4
| | | | | | | | | | | | | | | | out surrounding whitespace.
* | | | added option to force syntax highlighting language, example: {% include_code ↵Brandon Mathis2011-08-202-2/+11
| | | | | | | | | | | | | | | | file lang:ruby %}. Fixes #108
* | | | 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 ↵Brandon Mathis2011-08-203-6/+4
|/ / / / | | | | | | | | | | | | (ruby), which sort of fixes #108
* | | | now only excerpted articles show the "read on" link. Also the text for that ↵Brandon Mathis2011-08-203-3/+12
|/ / / | | | | | | | | | link can be set in the _config.yml
* | | updated blog theme to default to left aligned images. To center images, use ↵Brandon Mathis2011-08-181-2/+3
| | | | | | | | | | | | classname "center"
* | | reordered arguments in paginationBrandon Mathis2011-08-181-2/+2
| | |
* | | Codeblock regex improved to better detect extensions fixes #96, added ↵Brandon Mathis2011-08-163-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_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 ↵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
|