Brandon Mathis
23f05c1158
Merge branch 'master' of github.com:imathis/octopress
2011-08-21 18:38:33 -04:00
Brandon Mathis
9f830dd96f
added support for deploying "dot" files (eg. .htaccess), fixes #104
2011-08-21 18:38:18 -04:00
Brandon Mathis
9e5e6f604c
Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589
...
minor tweak to _typography.scss to have pp, code, and tt extend style that exists
2011-08-21 14:58:26 -07:00
Brandon Mathis
b40d2fb2a4
Merge branch 'master' of https://github.com/rwz/octopress into rwz-master
2011-08-21 16:37:14 -04:00
Brandon Mathis
11c6e1f7a7
include_code now defaults to relative urls for easy testing on a development server
2011-08-21 16:16:03 -04:00
Brandon Mathis
089af26b02
improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace.
2011-08-21 10:31:58 -04:00
Brandon Mathis
83d87f98cc
added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108
2011-08-20 20:25:07 -04:00
Brandon Mathis
67211edd97
Merge branch 'master' of github.com:imathis/octopress
2011-08-20 18:40:07 -04:00
Brandon Mathis
358d02a4a7
centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108
2011-08-20 18:39:47 -04:00
Brandon Mathis
9e8eec332c
added excerpt_link to article include. fixes #97
2011-08-20 17:31:22 -04:00
Brandon Mathis
596ec87c37
now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml
2011-08-20 16:02:50 -04:00
Pavel Pravosud
5ec1f014a0
added stringex gem for permalink url generation
2011-08-20 10:24:15 +07:00
Brandon Mathis
178a198ea7
updated blog theme to default to left aligned images. To center images, use classname "center"
2011-08-18 15:01:00 -04:00
Brandon Mathis
cf31601d4b
reordered arguments in pagination
2011-08-18 14:30:59 -04:00
Brandon Mathis
ef4a42f977
Codeblock regex improved to better detect extensions fixes #96 , added support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks
2011-08-16 02:41:28 -04:00
Brandon Mathis
59521e3db8
added blog_index_dir configuration and improved update_source
2011-08-16 01:50:34 -04:00
Brandon Mathis
ef5b0e8ad7
removed unusable blog_index partial
2011-08-16 00:45:26 -04:00
Brandon Mathis
1c555116be
Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base
2011-08-16 00:43:22 -04:00
Brandon Mathis
a5f87149fe
expand_urls now correctly matches urls pointing to the root directory, allowing / to be replaced with /subdir/ if site is configured with a different root directory
2011-08-16 00:43:07 -04:00
Brandon Mathis
33112a65a8
page layout will now accept pages without title metadata
2011-08-14 17:47:46 -04:00
Brandon Mathis
0b77a38704
Merge pull request #93 from fsdev-cmiller/master
...
Fix Code Text in Lists
2011-08-12 08:26:42 -07:00
Chris Miller
84e2fd5ead
Code text works in lists now.
2011-08-12 08:41:49 -06:00
Brandon Mathis
80f95b8b6c
Merge pull request #91 from brigham/extra-subdir
...
Fix extra subdirectories appearing in category links and atom.xml link.
2011-08-12 06:46:02 -07:00
Brigham Brown
648d4cc238
Fix extra subdirectories appearing in category links and atom.xml link.
2011-08-11 21:30:45 -07:00
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
Jake McCrary
7d6062b5eb
fixed @extend for pp, code, and tt. The @extend was extending a non-existant entry.
2011-08-06 23:19:00 -05: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
