Brandon Mathis
5958810eb2
Merge branch 'master' of github.com:imathis/octopress
2011-08-11 19:56:54 -04:00
Brandon Mathis
313c3859aa
now using rack instead of Jekyll's webrick server, fixes #90
2011-08-11 19:56:25 -04:00
Brandon Mathis
2cd05cf2d1
Merge pull request #87 from marutanm/fix_rake-list
...
fix rake-list
2011-08-11 08:50:34 -07:00
marutanm
a817f99785
fix rake-list
2011-08-11 21:13:30 +09:00
Brandon Mathis
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
2011-08-10 18:15:10 -04:00
Brandon Mathis
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
2011-08-07 12:18:58 -04:00
Brandon Mathis
3a599d4159
Merge pull request #73 from pilif/twitter-js-scope-fix
...
correctly scope locals
2011-08-04 16:03:21 -07:00
Brandon Mathis
ee0899dcad
Merge pull request #74 from smt/feed-fix
...
Update atom.xml to use site.title and expand_urls
2011-08-04 08:57:19 -07:00
Stephen Tudor
0fa8732e2a
Update atom.xml to use site.title and expand_urls
2011-08-04 09:31:20 -04:00
Philip Hofstetter
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
2011-08-04 10:17:09 +02:00
Brandon Mathis
140198b87a
Merge pull request #64 from adamnbowen/master
...
added source.old and sass.old into .gitignore
2011-08-02 06:44:40 -07:00
Adam Bowen
0108966c55
added source.old, sass.old to .gitignore
2011-08-02 09:38:47 -04:00
Brandon Mathis
b42a7f87dc
changed mdash to unicode character to help some users with encoding errors
2011-08-02 00:55:47 -04:00
Brandon Mathis
4a181e3a14
added explaination to _config.yml for why pygments are turned off
2011-08-02 00:40:50 -04:00
Brandon Mathis
98200038f7
added header to customizable includes
2011-08-01 17:57:29 -04:00
Brandon Mathis
7b52fb492e
added yml alias for yaml code highlighting
2011-08-01 17:35:44 -04:00
Brandon Mathis
08dc63a95e
added a raw option to render_partial. Now you can import partials without having them parsed by the Liquid template parser
2011-08-01 16:28:30 -04:00
Brandon Mathis
6009daa8a2
code_block and inlcude_code no longer needlessly render through the Liquid template parser
2011-08-01 16:28:07 -04:00
Brandon Mathis
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.
2011-08-01 09:06:55 -04:00
Brandon Mathis
5d24e0ba2b
udpated rake udpate_source task to preserve custom includes instaed of preserving navigation and footer
2011-07-31 13:24:56 -04:00
Brandon Mathis
07f4937bfd
added custom partials for for footer and navigation
2011-07-31 13:13:11 -04:00
Brandon Mathis
705ba9a394
update instructions for adding custom asides
2011-07-31 12:44:07 -04:00
Brandon Mathis
d344a8c7ac
added support for custom includes
2011-07-31 12:27:25 -04:00
Brandon Mathis
3525825e90
limited atom feed to 20 most recent items
2011-07-31 12:02:28 -04:00
Brandon Mathis
247105c833
removed unused sidebar include
2011-07-30 12:10:27 -04:00
Brandon Mathis
41ebe2a75a
added config for multiple asides
2011-07-30 12:07:51 -04:00
Brandon Mathis
1db23acd78
added multi sidebar support
2011-07-30 12:06:02 -04:00
Brandon Mathis
141800087f
Merge branch 'woodwardjd-master'
2011-07-30 12:05:34 -04:00
Brandon Mathis
cb6442e624
fixed empty line stripping from codeblocks
2011-07-30 09:06:56 -04:00
Brandon Mathis
ffc730fc0d
Merge branch 'master' of https://github.com/woodwardjd/octopress into woodwardjd-master
2011-07-29 20:50:35 -04:00
Brandon Mathis
c837acd497
added support for width and height to image tag plugin
2011-07-29 18:29:53 -04:00
Brandon Mathis
d6744967fa
Improved support for adding author metadata to pages
2011-07-29 16:27:25 -04:00
Brandon Mathis
20de112526
include_code is now more forgiving, stripping leading forward slashes from the code_dir config
2011-07-29 10:49:54 -04:00
Brandon Mathis
df86e647b1
Rake task update_source now preserves footer as well as navigation
2011-07-28 22:12:50 -04:00
Brandon Mathis
c779ad7916
Now rss link in head will update correctly with changes to the config
2011-07-28 16:51:55 -04:00
Brandon Mathis
49a67785dc
Add support using github backtick code blocks without supplying a language
2011-07-28 15:59:50 -04:00
Brandon Mathis
2af038a725
added cannonical link to head
2011-07-28 15:53:39 -04:00
Brandon Mathis
1e2d10c2c5
removed appcache because it was annoying firefox users
2011-07-28 15:42:28 -04:00
Brandon Mathis
3b29bfc46f
added / to the end of the permalinks by default to be more compatible with diqus permalink matching for wordpress default imports
2011-07-28 15:40:42 -04:00
Brandon Mathis
a516c773d1
improved replacement filters for textile markup on github backtick codeblocks, added comment to show regular HTML support
2011-07-28 15:21:46 -04:00
Brandon Mathis
7209aaf64c
updated Github style backtick filter to support textile, markdown and html
2011-07-28 14:44:48 -04:00
Jason Woodward
d8b17814e0
allow select and order of sidebar components to be configurable in jekyll's _config.yml
2011-07-28 12:02:08 -04:00
Brandon Mathis
b37ce3a8ae
Merge pull request #53 from zumda/master
...
Code blocks didn't work with textile
2011-07-28 07:18:45 -07:00
Andreas Arnold
2d8a17cd41
making textile and code blocks work nice together
2011-07-28 16:02:49 +02:00
Brandon Mathis
4a2254665c
fixed bug where multiple github style codeblcoks were getting eaten
2011-07-27 18:34:58 -04:00
Brandon Mathis
0911eabb9b
fixed update style
2011-07-27 18:34:50 -04:00
Brandon Mathis
d05040adfc
Merge pull request #51 from lukearmstrong/patch-5
...
Fixed rake update_source and rake update_style
2011-07-27 15:34:16 -07:00
Luke Armstrong
6244feae22
Fixed rake update_source and rake update_style
2011-07-28 00:22:57 +02:00
Brandon Mathis
b7a9e1e993
Merge pull request #49 from lukearmstrong/patch-3
...
Fixed rake update_source
2011-07-27 15:09:37 -07:00
Luke Armstrong
3d238313a7
Fixed [cp: cannot stat `.themes/classic/source/*.': No such file or directory]
2011-07-27 23:50:35 +02:00
