1035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brandon Mathis	a15cecf323	updated source to latest	2012-05-24 23:05:33 -05:00
Brandon Mathis	4efb88c72a	Merge branch '2.1' into site	2012-05-24 23:04:08 -05:00
Brandon Mathis	d40eaab07c	Switched out ender.js in favor of jQuery. Some small improvements to sidebar feed scripts	2012-05-24 23:03:59 -05:00
Brandon Mathis	6c8b51bd16	Merge branch '2.1' into site	2012-05-24 22:49:13 -05:00
Maxwell Swadling	b69e876828	Fixed paths in GitHub api lists from using api urls instead of HTML urls. ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Maxwell Swadling	693fc29572	Updated GitHub repos list to use GitHub Api v3 ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-24 22:48:51 -05:00
Brandon Mathis	409897f209	Merge branch '2.1' into site	2012-05-24 15:42:40 -05:00
Brandon Mathis	153756fdef	After thinking about it, I find little gain, and greater difficulty by not including the Gemfile.lock. It was fun while it lasted. fix #568	2012-05-24 10:36:54 -05:00
Brandon Mathis	af40b0aa13	Removed unnecessary line breaks from beginning and end of blockquotes	2012-05-24 10:24:37 -05:00
Brandon Mathis	4de8189651	Fixed collision with render on pygments_code.rb	2012-05-24 10:18:44 -05:00
Brandon Mathis	e81e1c8289	Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages	2012-05-24 10:18:28 -05:00
Brandon Mathis	e41d0dde13	Swithced the order or RVM and rbenv in setup documentation to put rbenv first (favored). Added rake update task to updating docs	2012-05-22 23:34:53 -05:00
Rainer Dreyer	98a372da9e	rvm install already updates .bash_profile and includes newest rubygems. ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-22 23:33:11 -05:00
Brandon Mathis	586439fbb2	updated to latest	2012-05-22 21:35:46 -05:00
Brandon Mathis	1eca86fa3f	Merge branch '2.1' into site	2012-05-22 21:19:07 -05:00
Brandon Mathis	47573af6c6	Improved mobile navigation injection script to work when search is not present. Fixes #380	2012-05-22 21:18:55 -05:00
Brandon Mathis	6d482a9771	Merge branch '2.1' into site	2012-05-22 19:54:01 -05:00
Brandon Mathis	934e3b3040	Rake task 'clean' deletes each file inside of specified cache directories and generated stylesheets	2012-05-22 19:21:29 -05:00
Brandon Mathis	7e5ae5ecd8	Merge branch '2.1' into site-2.1	2012-05-22 17:15:30 -05:00
Brandon Mathis	91e26fe430	Added a .nojekyll file for speedier GitHub pages generation	2012-05-22 17:14:44 -05:00
Brandon Mathis	09a2e3754d	Copydot rake task now includes .nojekyll and .htaccess files. Since some OSes or applications create unimportant hidden files, this only copies hidden files known to be useful for blogging. This closes #303 #348 #419	2012-05-22 17:13:55 -05:00
Brandon Mathis	4067058ee8	removed Compass compiler from list of plugins	2012-05-22 16:47:56 -05:00
Brandon Mathis	05b2a927c7	added puts to plugins list	2012-05-22 16:46:35 -05:00
Brandon Mathis	ec98afe556	Updated the documentation for puts.rb to more correctly explain how template processing works with things like markdown or textile	2012-05-22 16:43:34 -05:00
Brandon Mathis	0df73625d3	Fixed some bugs in the docs for puts.rb where the liquid tags were actually being fired	2012-05-22 16:40:52 -05:00
Brandon Mathis	c8e3382345	udpated to latest classic theme	2012-05-22 16:33:55 -05:00
Brandon Mathis	c3ba61f5c8	Merge branch '2.1' into site-2.1	2012-05-22 16:33:33 -05:00
Brandon Mathis	ba8edf37a7	updated pullquote plugin to work better with latest Liquid version	2012-05-22 16:30:27 -05:00
Brandon Mathis	8e41dd777b	updated puts.rb to work with latest liquid and added different output based on character width	2012-05-22 16:29:43 -05:00
Brandon Mathis	f2e96ac168	Added documentation for puts plugin	2012-05-22 16:28:56 -05:00
Brandon Mathis	829b9737d2	Added documentation to explain how to add scripts at the bottom of the template	2012-05-22 15:36:42 -05:00
Brandon Mathis	4c20ebccc4	fixed ommission of a class name on the image-tag documentation	2012-05-22 15:26:26 -05:00
Brandon Mathis	e3cc835415	added an image test for issue #239	2012-05-22 15:20:58 -05:00
Brandon Mathis	6c60fb38e8	Merge branch '2.1' into site-2.1	2012-05-22 15:20:32 -05:00
Brandon Mathis	8c7b727abf	Made image tag regex smarter, fixes #239	2012-05-22 15:20:15 -05:00
Brandon Mathis	58e7489c4b	Merge branch '2.1' into site-2.1	2012-05-22 13:18:19 -05:00
Brandon Mathis	439f0a774a	Added generate_only task (combines isolate, generate, integrate) for speedier rendering checks on a blog post. Added more optional stdin dialogs to better support zsh. Improved feedback on set_root_dir	2012-05-22 13:12:48 -05:00
Brandon Mathis	b071ebf3bc	added a notice about tab indentation bug to docs. Closes #535	2012-05-22 11:43:43 -05:00
Brandon Mathis	0204abe920	added some simple tests for blockquotes and partials	2012-05-22 11:32:07 -05:00
Brandon Mathis	7231a702d8	Merge branch '2.1' into site-2.1	2012-05-22 11:30:45 -05:00
Brandon Mathis	dd896741c9	fixed an issue where blockquotes would fail in recent versions of Liquid	2012-05-22 11:30:26 -05:00
Brandon Mathis	61a4169593	Merge branch '2.1' into site-2.1	2012-05-22 11:29:15 -05:00
Robert Wijas	1ac51f0950	render_partial always converts the content ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-22 11:24:40 -05:00
Robert Wijas	82f8142cc4	render_partial - content coverting ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-22 11:24:40 -05:00
Brandon Mathis	82386a0426	Merge branch 'master' into 2.1 ... Conflicts: .themes/classic/source/_includes/article.html	2012-05-22 09:28:59 -05:00
Brandon Mathis	4493baab7e	added Gemfile.lock to site branch	2012-05-22 09:26:29 -05:00
Brandon Mathis	01ebd2bb8e	Merge branch '2.1' into site-2.1	2012-05-22 09:10:49 -05:00
Brandon Mathis	3e3a2fcff3	Removed Gemfile.lock. Octopress will only manage the Gemfile, closes #568	2012-05-22 09:05:51 -05:00
Brandon Mathis	c9d3b0e288	Merge pull request #499 from lukekarrys/patch-1 ... Don't display comments link for post excerpts on index page when comments for that post are set to false	2012-05-21 23:13:28 -07:00
Brandon Mathis	7f7f52bcc6	updated dependencies	2012-05-22 01:11:53 -05:00