5958810eb2
Merge branch 'master' of github.com:imathis/octopress
14 years ago
313c3859aa
now using rack instead of Jekyll's webrick server, fixes #90
14 years ago
2cd05cf2d1
Merge pull request #87 from marutanm/fix_rake-list
...
fix rake-list
14 years ago
a817f99785
fix rake-list
14 years ago
0e072543da
added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html
14 years ago
9c2f64d20c
fixed issue where port setting didn't change jekyll's webbrick in _config.yml. Accidentally used port where I should have used server_port fixes #70
14 years ago
3a599d4159
Merge pull request #73 from pilif/twitter-js-scope-fix
...
correctly scope locals
14 years ago
ee0899dcad
Merge pull request #74 from smt/feed-fix
...
Update atom.xml to use site.title and expand_urls
14 years ago
0fa8732e2a
Update atom.xml to use site.title and expand_urls
14 years ago
81dcb0301b
correctly scope locals
...
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
14 years ago
140198b87a
Merge pull request #64 from adamnbowen/master
...
added source.old and sass.old into .gitignore
14 years ago
0108966c55
added source.old, sass.old to .gitignore
14 years ago
b42a7f87dc
changed mdash to unicode character to help some users with encoding errors
14 years ago
4a181e3a14
added explaination to _config.yml for why pygments are turned off
14 years ago
98200038f7
added header to customizable includes
14 years ago
7b52fb492e
added yml alias for yaml code highlighting
14 years ago
08dc63a95e
added a raw option to render_partial. Now you can import partials without having them parsed by the Liquid template parser
14 years ago
6009daa8a2
code_block and inlcude_code no longer needlessly render through the Liquid template parser
14 years ago
ff1dba19f2
Backtick codeblocks now correctly replace & with & and Textile support for back tick code blocks has been removed. It never really worked. Textile makes me sad.
14 years ago
5d24e0ba2b
udpated rake udpate_source task to preserve custom includes instaed of preserving navigation and footer
14 years ago
07f4937bfd
added custom partials for for footer and navigation
14 years ago
705ba9a394
update instructions for adding custom asides
14 years ago
d344a8c7ac
added support for custom includes
14 years ago
3525825e90
limited atom feed to 20 most recent items
14 years ago
247105c833
removed unused sidebar include
14 years ago
41ebe2a75a
added config for multiple asides
14 years ago
1db23acd78
added multi sidebar support
14 years ago
141800087f
Merge branch 'woodwardjd-master'
14 years ago
cb6442e624
fixed empty line stripping from codeblocks
14 years ago
ffc730fc0d
Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwardjd-master
14 years ago
c837acd497
added support for width and height to image tag plugin
14 years ago
d6744967fa
Improved support for adding author metadata to pages
14 years ago
20de112526
include_code is now more forgiving, stripping leading forward slashes from the code_dir config
14 years ago
df86e647b1
Rake task update_source now preserves footer as well as navigation
14 years ago
c779ad7916
Now rss link in head will update correctly with changes to the config
14 years ago
49a67785dc
Add support using github backtick code blocks without supplying a language
14 years ago
2af038a725
added cannonical link to head
14 years ago
1e2d10c2c5
removed appcache because it was annoying firefox users
14 years ago
3b29bfc46f
added / to the end of the permalinks by default to be more compatible with diqus permalink matching for wordpress default imports
14 years ago
a516c773d1
improved replacement filters for textile markup on github backtick codeblocks, added comment to show regular HTML support
14 years ago
7209aaf64c
updated Github style backtick filter to support textile, markdown and html
14 years ago
d8b17814e0
allow select and order of sidebar components to be configurable in jekyll's _config.yml
14 years ago
b37ce3a8ae
Merge pull request #53 from zumda/master
...
Code blocks didn't work with textile
14 years ago
2d8a17cd41
making textile and code blocks work nice together
14 years ago
4a2254665c
fixed bug where multiple github style codeblcoks were getting eaten
14 years ago
0911eabb9b
fixed update style
14 years ago
d05040adfc
Merge pull request #51 from lukearmstrong/patch-5
...
Fixed rake update_source and rake update_style
14 years ago
6244feae22
Fixed rake update_source and rake update_style
14 years ago
b7a9e1e993
Merge pull request #49 from lukearmstrong/patch-3
...
Fixed rake update_source
14 years ago
3d238313a7
Fixed [cp: cannot stat `.themes/classic/source/*.': No such file or directory]
14 years ago
Brandon Mathis
marutanm
Stephen Tudor
Philip Hofstetter
Adam Bowen
Jason Woodward
Andreas Arnold
Luke Armstrong