1044 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brandon Mathis	8cb7bfd9aa	Merge branch 'master' into site	2011-07-30 12:08:11 -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	435cec79e0	fixed empty line stripping from codeblocks	2011-07-30 09:06:38 -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	30662819d9	updated docs for image tag	2011-07-29 18:30:13 -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	5045657595	added support for width and height to image tag plugin	2011-07-29 18:29:39 -04:00
Brandon Mathis	e6c3451acf	updated source from latest Octopress, added small improvement to blogging docs	2011-07-29 16:29:14 -04:00
Brandon Mathis	76860c1d32	Merge branch 'master' of github.com:imathis/octopress into site	2011-07-29 16:28:35 -04:00
Brandon Mathis	d6744967fa	Improved support for adding author metadata to pages	2011-07-29 16:27:25 -04:00
Brandon Mathis	ee5bca6fa9	Improved support for adding author metadata to pages	2011-07-29 16:27:13 -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	4ece188eba	include_code is now more forgiving, stripping leading forward slashes from the code_dir config	2011-07-29 10:49:37 -04:00
Brandon Mathis	400c8d2700	Merge branch 'master' into site	2011-07-29 09:12:02 -04:00
Brandon Mathis	531dddd60e	updated docs for github backtick code blocks and added an example source to video tag	2011-07-28 22:24:20 -04:00
Brandon Mathis	afa5b9d462	updated to latest head with config based rss link in head	2011-07-28 22:23:53 -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	4d743e0990	Add support using github backtick code blocks without supplying a language	2011-07-28 15:59:27 -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	f2d3fb5aec	improved replacement filters for textile markup on github backtick codeblocks, added comment to show regular HTML support	2011-07-28 15:21:34 -04:00
Brandon Mathis	7209aaf64c	updated Github style backtick filter to support textile, markdown and html	2011-07-28 14:44:48 -04:00
Brandon Mathis	d10d222076	updated Github style backtick filter to support textile, markdown and html	2011-07-28 14:44:18 -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	84e4979d8b	Merge branch 'master' into site	2011-07-28 11:00:17 -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
Brandon Mathis	3101172080	fixed bug where multiple github style codeblcoks were getting eaten	2011-07-27 18:32:06 -04: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
Brandon Mathis	bdcd444c74	fixed merge on typo	2011-07-27 17:23:25 -04:00
Brandon Mathis	da88fbe77d	Merge pull request #45 from adamnbowen/patch-2 ... trivial: fixed typo in /source/docs/deploy	2011-07-27 14:20:12 -07:00
Brandon Mathis	ac1be09653	improved new_post title substitutions, fixed directories in rake update tasks	2011-07-27 16:41:45 -04:00
Brandon Mathis	8ff5db035a	added more documentation for github backtick highlighted code blocks	2011-07-27 16:41:45 -04:00
Brandon Mathis	52334ed604	added docs for github-style codeblocks	2011-07-27 16:41:45 -04:00
Brandon Mathis	0a0cd14598	fixed setup docs where the source branch was not being checked out before the push	2011-07-27 16:41:45 -04:00
Brandon Mathis	b6975c86c8	updated to latest octopress syntax styling	2011-07-27 16:41:45 -04:00
Brandon Mathis	1936cfdcc3	updated syntax highlighting test page to use codeblock instead of highlight and added objective c test	2011-07-27 16:41:45 -04:00
Brandon Mathis	6d652b1b46	updated to latest octopress styling	2011-07-27 16:41:45 -04:00