Commit Graph

1147 Commits

Author SHA1 Message Date
Brandon Mathis
bc1de6209b Merge pull request #99 from NJAldwin/site
Documentation Fixes
2011-08-17 06:32:22 -07:00
Edward Dale
c9482a7257 Fixing a typo in the URL of the permalink example. 2011-08-17 14:39:43 +03:00
Nick Aldwin
8c0aa92636 Fix grammatical error 2011-08-17 03:06:55 -03:00
Nick Aldwin
98ceed81e8 Fix codeblock link 2011-08-17 03:04:10 -03: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
298af5f8d4 added test for .bashrc related to #96 2011-08-16 02:41:18 -04:00
Brandon Mathis
15e71344f5 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:40:47 -04:00
Brandon Mathis
15f9e7283f Merge branch 'master' into site 2011-08-16 02:01:32 -04:00
Brandon Mathis
804cf98f9c fixed a goofy link 2011-08-16 02:01:27 -04:00
Brandon Mathis
f3c1360dd6 fixed typo on theming docs 2011-08-16 01:51:55 -04:00
Brandon Mathis
59521e3db8 added blog_index_dir configuration and improved update_source 2011-08-16 01:50:34 -04:00
Brandon Mathis
6e6759c605 added documentation for setting up a landing page with Octopress 2011-08-16 01:50:22 -04:00
Brandon Mathis
75c76fcfd4 added blog_index_dir configuration and improved update_source 2011-08-16 01:49:49 -04:00
Brandon Mathis
559d28b3f8 removed unused blog/index 2011-08-16 01:07:08 -04:00
Brandon Mathis
52dbef822b updated docs to list pagination_dir configuration option 2011-08-16 01:00:23 -04:00
Brandon Mathis
f2ecaade1d updated to latest octopress 2011-08-16 00:48:38 -04:00
Brandon Mathis
68c40ecdad Merge branch 'master' into site 2011-08-16 00:45:44 -04:00
Brandon Mathis
ef5b0e8ad7 removed unusable blog_index partial 2011-08-16 00:45:26 -04:00
Brandon Mathis
1d8e3af457 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:59 -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
81ff6c0baf Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base 2011-08-15 23:59:28 -04:00
Brandon Mathis
367ba644af updated docs on updating :) 2011-08-15 13:08:14 -04:00
Brandon Mathis
0c888bbb9e Merge branch 'master' into site 2011-08-14 17:48:54 -04:00
Brandon Mathis
33112a65a8 page layout will now accept pages without title metadata 2011-08-14 17:47:46 -04:00
Brandon Mathis
f0f290795e updated blog post with link to Github pages, improved setup steps 2011-08-13 16:28:46 -04:00
Brandon Mathis
8600f3ac7e Merge branch 'site' of github.com:imathis/octopress into site 2011-08-13 16:14:08 -04:00
Brandon Mathis
726f338c1f fixed typo 2011-08-13 16:14:01 -04:00
Brandon Mathis
d8c0d462ce Merge pull request #68 from eproxus/site
Clarify need for 'source' branch
2011-08-13 13:13:21 -07: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
6432245b52 updated head to latest 2011-08-12 09:48:58 -04:00
Brandon Mathis
4933a5459c Merge branch 'master' into site 2011-08-12 09:48:09 -04: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
d1cb77baf8 updated docs to reflect removal of Jekyll's webrick server in favor of using rackup 2011-08-12 00:23:20 -04:00
Brandon Mathis
ed88bb430a Merge branch 'master' into site 2011-08-12 00:07:10 -04: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
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