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
39052cdb1a
updated to latest site index system, added liquid tests for haml (hint, if you indent under a tag block, it breaks). added fix for twitter.js
2011-08-10 18:19:08 -04: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
cc4e51db8b
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:14:56 -04:00
Brandon Mathis
a8c1fc1d09
Merge branch 'master' into site
2011-08-07 12:20:55 -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
9a82e42d34
Merge branch 'master' into site
2011-08-05 16:56:33 -04:00
Brandon Mathis
9992fabb83
added help page
2011-08-05 16:55:57 -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
1857e62865
Merge branch 'site' of github.com:imathis/octopress into site
2011-08-04 15:40:30 -04:00
Brandon Mathis
de2f70b4e6
updated to latest Octopress source
2011-08-04 15:40:09 -04:00
Brandon Mathis
16d859baae
Merge branch 'master' into site
2011-08-04 15:39:18 -04: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
Adam Lindberg
639fcff9ea
Clarify need for 'source' branch
2011-08-03 17:48:33 +02:00
Brandon Mathis
9e23a173aa
Merge branch 'master' into site
2011-08-02 12:07:35 -04:00
Brandon Mathis
b536fcacf8
updated include paths for styles in theming docs
2011-08-02 12:07:17 -04: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
d8d2649b7b
updated sass to latest Octopress
2011-08-02 00:56:21 -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
d39ec5fffe
changed mdash to unicode character to help some users with encoding errors
2011-08-02 00:55:28 -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
2f7ab55f9a
added explaination to _config.yml for why pygments are turned off
2011-08-02 00:40:38 -04:00
Brandon Mathis
53e9d28be5
updated docs to include new plugins and better explain theming and customization
2011-08-02 00:40:15 -04:00
Brandon Mathis
15a78991da
updated to latest /source
2011-08-01 17:58:12 -04:00
Brandon Mathis
98200038f7
added header to customizable includes
2011-08-01 17:57:29 -04:00
Brandon Mathis
c10140b52d
added header to customizable includes
2011-08-01 17:57:17 -04:00
Brandon Mathis
df0918b2ee
improve docs for theming
2011-08-01 17:38:25 -04:00
Brandon Mathis
3983bd0918
added raw liquid tag plugin for helping with documentation
2011-08-01 17:38:09 -04:00
Brandon Mathis
7b52fb492e
added yml alias for yaml code highlighting
2011-08-01 17:35:44 -04:00
Brandon Mathis
8e978596b6
added yml alias for yaml code highlighting
2011-08-01 17:35:33 -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
40b444c9cd
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:24:06 -04:00
Brandon Mathis
70d2c83843
code_block and inlcude_code no longer needlessly render through the Liquid template parser
2011-08-01 16:23:17 -04:00
Brandon Mathis
3d065c8ebc
broke up theming docs into partials
2011-08-01 14:43:42 -04:00
Brandon Mathis
8d187c562c
removed old code test
2011-08-01 09:44:24 -04:00
Brandon Mathis
e21c2bc12d
updated docs and tests for backtick codeblocks
2011-08-01 09:43:54 -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
d30c8c7f36
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:37 -04:00
Brandon Mathis
a54876b0be
fixed link in blogging/plugins
2011-07-31 22:05:07 -04:00
Brandon Mathis
e4f3de17ae
Merge branch 'master' into site
2011-07-31 19:34:33 -04:00
Brandon Mathis
070f00bcb5
updated to latest custom partial system
2011-07-31 13:30:53 -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
