669 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brandon Mathis	b867b0877d	Refactored code plugins so that shared regexes are mixed in methods ... Added option to mark one line or groups of lines in a code block Relates to issue #584	2012-05-28 04:29:18 -05:00
Brandon Mathis	ec900d5af7	Merge branch '2.1' of github.com:imathis/octopress into 2.1	2012-05-27 02:32:58 -05:00
Brandon Mathis	e16844af29	Improvements to Code embedding features ... 1. Removed lots of duplication 2. Added warnings and fixed some dim regex 3. New: set a start line number for any code snippet 4. New: set a start, end, or range for include_code 5. New: added option to disable line numbers linenos:false Fixes #478 #484	2012-05-27 02:30:17 -05:00
Brandon Mathis	3b26147aef	Merge pull request #583 from xuhdev/deploy-nojekyll ... Use a more portable way to create .nojekyll file when deploying to github pages.	2012-05-26 22:54:41 -07:00
Hong Xu	c1b2b43b32	Use a more portable way to create .nojekyll file when deploying to github pages.	2012-05-27 13:49:35 +08:00
Brandon Mathis	0b088433ca	Added configurable array for adding hidden files to be deployed with copydot task	2012-05-26 11:52:23 -05:00
Brandon Mathis	ae967b264d	improved flexability of styling code blocks. Improved the light theme.	2012-05-25 11:36:57 -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
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	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	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	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	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	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	8c7b727abf	Made image tag regex smarter, fixes #239	2012-05-22 15:20:15 -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	dd896741c9	fixed an issue where blockquotes would fail in recent versions of Liquid	2012-05-22 11:30:26 -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	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
akira yamada	590b35ce4e	apply "o" option to regexps to improve process time ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-22 00:59:32 -05:00
Brandon Mathis	33073156bc	removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex	2012-05-22 00:00:15 -05:00
Brandon Mathis	03aa250b96	Merge pull request #571 from xuhdev/2.1-404-quote-char ... weird quote character in the 404 page	2012-05-21 21:58:05 -07:00
Brandon Mathis	b52536d72c	Merge branch '2.1' of github.com:imathis/octopress into 2.1	2012-05-21 23:57:07 -05:00
Brandon Mathis	29a05c931f	Added a generator meta tag. closes #465	2012-05-21 23:56:45 -05:00
Brandon Mathis	b07e533d4a	Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description ... Conflicts: .themes/classic/source/_includes/head.html	2012-05-21 23:54:21 -05:00
Brandon Mathis	473f721e9f	Merge pull request #572 from xuhdev/sitemap-exclude-file-list ... Sitemap exclude file list	2012-05-21 21:16:44 -07:00
Hong Xu	6cd00d865e	Fix the EXCLUDED_FILES list in sitemap_generator.rb	2012-05-22 11:21:57 +08:00
Hong Xu	910734359d	Fix a weird character in the 404 page.	2012-05-22 10:56:15 +08:00
Brandon Mathis	ca470417e5	Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better. Fixes #500	2012-05-21 20:16:06 -05:00
Brandon Mathis	adc4e1f2ef	removed an unnecessary whitespace indent adjustment from backtick codeblock	2012-05-21 20:13:43 -05:00
Brandon Mathis	eb075cbd33	removed faulty string join from code_block plugin	2012-05-21 20:13:40 -05:00
Brandon Mathis	99767a4e0c	updated Gems, added more liberal definitions to gemfile ... Conflicts: Gemfile.lock	2012-05-21 16:18:42 -05:00
Brandon Mathis	9fbc46abd9	Octopress filters are now limited to html producing templating languages, Fixes #536	2012-05-21 16:07:01 -05:00
Brandon Mathis	8753a6b00c	Octopress filters are now limited to html producing templating languages, Fixes #536	2012-05-21 16:06:52 -05:00
Brandon Mathis	de38449d78	added 404.html to sitemap.xml exclude list. Closes #569	2012-05-21 11:29:20 -05:00
Brandon Mathis	bfa5255188	Rake new post now accepts: ... - Inline input as in `rake new_post["Your post title"] - Input from stdin if in-line input isn't given. This should help zhs users who've been frustrated by globbing issues. Fixes #117	2012-05-21 08:57:49 -05:00
Brandon Mathis	42369ddf5d	fixed class name attribute on linklog posts	2012-05-20 23:40:17 -05:00
Brandon Mathis	741107291b	Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375	2012-05-20 22:23:18 -05:00
Andrew Patton	c5e2e524f8	Fixed “3rd party plugins” wiki page link ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-20 18:03:10 -05:00
Andrew Patton	a49651fdfd	Fixed “3rd party plugins” wiki page link ... Signed-off-by: Brandon Mathis <brandon@imathis.com>	2012-05-20 18:02:41 -05:00