669 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	6db1a5ada5	improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace.	2011-08-21 10:31:14 -04:00
Brandon Mathis	2e4f95212a	Merge branch 'site' of github.com:imathis/octopress into site	2011-08-21 09:15:44 -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	cbd6f8d8de	added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108	2011-08-20 20:24:51 -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	d5e4bf2d8c	added test for .ru pygments alias	2011-08-20 18:39:35 -04:00
Brandon Mathis	6b586af8a5	centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108	2011-08-20 18:39:00 -04:00
Brandon Mathis	516bb8174d	added excerpt_link to article include. fixes #97	2011-08-20 17:34:10 -04:00
Brandon Mathis	9e8eec332c	added excerpt_link to article include. fixes #97	2011-08-20 17:31:22 -04:00
Brandon Mathis	1722c503f7	updated to latest octopress source	2011-08-20 16:03:37 -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
Brandon Mathis	9a81a6ecf9	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:37 -04:00
Brandon Mathis	01c4e37ea4	Merge branch 'site', remote branch 'origin' into site	2011-08-20 15:57:05 -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	3186b0fcfe	updated blog theme to default to left aligned images. To center images, use classname "center"	2011-08-18 15:00:47 -04:00
Brandon Mathis	1fe17a4cb1	changed to absolute development link to relative fixes #102	2011-08-18 14:40:54 -04:00
Brandon Mathis	cf31601d4b	reordered arguments in pagination	2011-08-18 14:30:59 -04:00
Brandon Mathis	3e1674c3c0	reordered arguments in pagination	2011-08-18 14:30:36 -04:00
Brandon Mathis	c248cffe6a	Merge pull request #101 from scompt/patch-1 ... Fix typo in URL in permalink example.	2011-08-17 08:06:22 -07:00
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