Commit Graph

Select branches

Hide Pull Requests

2.1

colorize

gh-pages

guard

linklog

master

migrator

plugins

refactor_with_tests

rubygemcli

site

site-2.1

v2.0

Mono Color

• ba8edf37a7 updated pullquote plugin to work better with latest Liquid version Brandon Mathis 2012-05-22 16:30:27 -05:00
• 8e41dd777b updated puts.rb to work with latest liquid and added different output based on character width Brandon Mathis 2012-05-22 16:29:43 -05:00
• f2e96ac168 Added documentation for puts plugin Brandon Mathis 2012-05-22 16:28:56 -05:00
• 829b9737d2 Added documentation to explain how to add scripts at the bottom of the template Brandon Mathis 2012-05-22 15:36:42 -05:00
• 4c20ebccc4 fixed ommission of a class name on the image-tag documentation Brandon Mathis 2012-05-22 15:26:26 -05:00
• e3cc835415 added an image test for issue #239 Brandon Mathis 2012-05-22 15:20:58 -05:00
• 6c60fb38e8 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-22 15:20:32 -05:00
• 8c7b727abf Made image tag regex smarter, fixes #239 Brandon Mathis 2012-05-22 15:20:15 -05:00
• 58e7489c4b Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-22 13:18:19 -05:00
• 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 Brandon Mathis 2012-05-22 13:12:48 -05:00
• b071ebf3bc added a notice about tab indentation bug to docs. Closes #535 Brandon Mathis 2012-05-22 11:43:43 -05:00
• 0204abe920 added some simple tests for blockquotes and partials Brandon Mathis 2012-05-22 11:32:07 -05:00
• 7231a702d8 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-22 11:30:45 -05:00
• dd896741c9 fixed an issue where blockquotes would fail in recent versions of Liquid Brandon Mathis 2012-05-22 11:30:26 -05:00
• 61a4169593 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-22 11:29:15 -05:00
• 1ac51f0950 render_partial always converts the content Robert Wijas 2011-10-02 09:41:11 +02:00
• 82f8142cc4 render_partial - content coverting Robert Wijas 2011-10-01 23:11:41 +02:00
• 82386a0426 Merge branch 'master' into 2.1 Brandon Mathis 2012-05-22 09:28:59 -05:00
• 4493baab7e added Gemfile.lock to site branch Brandon Mathis 2012-05-22 09:26:29 -05:00
• 01ebd2bb8e Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-22 09:10:49 -05:00
• 3e3a2fcff3 Removed Gemfile.lock. Octopress will only manage the Gemfile, closes #568 Brandon Mathis 2012-05-22 09:05:51 -05:00
• c9d3b0e288 Merge pull request #499 from lukekarrys/patch-1 Brandon Mathis 2012-05-21 23:13:28 -07:00
• 7f7f52bcc6 updated dependencies Brandon Mathis 2012-05-22 01:11:53 -05:00
• 590b35ce4e apply "o" option to regexps to improve process time akira yamada 2012-04-02 19:40:24 +09:00
• 2a116251b5 added test for tab indentation bug Brandon Mathis 2012-05-22 00:37:00 -05:00
• 33073156bc removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex Brandon Mathis 2012-05-21 23:59:49 -05:00
• 7224427b36 removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex Brandon Mathis 2012-05-21 23:59:49 -05:00
• 0f1be647cf Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-21 23:58:36 -05:00
• 03aa250b96 Merge pull request #571 from xuhdev/2.1-404-quote-char Brandon Mathis 2012-05-21 21:58:05 -07:00
• b52536d72c Merge branch '2.1' of github.com:imathis/octopress into 2.1 Brandon Mathis 2012-05-21 23:57:07 -05:00
• 29a05c931f Added a generator meta tag. closes #465 Brandon Mathis 2012-05-21 23:56:45 -05:00
• b07e533d4a Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description Brandon Mathis 2012-05-21 23:47:27 -05:00
• b785a87869 Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description Brandon Mathis 2012-05-21 23:47:27 -05:00
• 473f721e9f Merge pull request #572 from xuhdev/sitemap-exclude-file-list Brandon Mathis 2012-05-21 21:16:44 -07:00
• 6cd00d865e Fix the EXCLUDED_FILES list in sitemap_generator.rb Hong Xu 2012-05-22 11:21:57 +08:00
• 910734359d Fix a weird character in the 404 page. Hong Xu 2012-05-22 10:56:15 +08:00
• 6caab53ab9 added another test for backtick code blocks in textile Brandon Mathis 2012-05-21 20:19:23 -05:00
• 53fdadd764 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-21 20:16:16 -05:00
• ca470417e5 Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better. Fixes #500 Brandon Mathis 2012-05-21 20:16:06 -05:00
• adc4e1f2ef removed an unnecessary whitespace indent adjustment from backtick codeblock Brandon Mathis 2012-05-21 20:07:36 -05:00
• eb075cbd33 removed faulty string join from code_block plugin Brandon Mathis 2012-05-21 20:09:25 -05:00
• 50ced3b6d7 updated tests for code snippets with markdown and textile Brandon Mathis 2012-05-21 20:13:24 -05:00
• 96529fae7a Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better Brandon Mathis 2012-05-21 20:12:27 -05:00
• ac71bc52ae removed faulty string join from code_block plugin Brandon Mathis 2012-05-21 20:09:25 -05:00
• abd9e8f488 removed an unnecessary whitespace indent adjustment from backtick codeblock Brandon Mathis 2012-05-21 20:07:36 -05:00
• f52798c149 Correct minor typo Simon Whitaker 2012-04-18 17:30:42 +02:00
• 99767a4e0c updated Gems, added more liberal definitions to gemfile Brandon Mathis 2012-05-21 16:16:29 -05:00
• 8394c9ffb1 updated Gems, added more liberal definitions to gemfile Brandon Mathis 2012-05-21 16:16:29 -05:00
• 9fbc46abd9 Octopress filters are now limited to html producing templating languages, Fixes #536 Brandon Mathis 2012-05-21 15:58:42 -05:00
• 8753a6b00c Octopress filters are now limited to html producing templating languages, Fixes #536 Brandon Mathis 2012-05-21 15:58:42 -05:00
• 0873c103d3 Octopress filters are now limited to html producing templating languages, Fixes #536 Brandon Mathis 2012-05-21 15:58:42 -05:00
• de38449d78 added 404.html to sitemap.xml exclude list. Closes #569 Brandon Mathis 2012-05-21 11:29:20 -05:00
• 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. Brandon Mathis 2012-05-21 08:57:49 -05:00
• 8a0940503f updated docs for styling linklog options Brandon Mathis 2012-05-20 23:45:21 -05:00
• 860094feba Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-20 23:40:31 -05:00
• 42369ddf5d fixed class name attribute on linklog posts Brandon Mathis 2012-05-20 23:40:17 -05:00
• c653dfa198 updated docs for configurations, updated to latest 2.1 Brandon Mathis 2012-05-20 23:39:36 -05:00
• ad40321eff Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-20 22:23:42 -05:00
• 741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 Brandon Mathis 2012-05-20 22:23:18 -05:00
• c5e2e524f8 Fixed “3rd party plugins” wiki page link Andrew Patton 2012-05-02 18:43:33 -03:00
• a49651fdfd Fixed “3rd party plugins” wiki page link Andrew Patton 2012-05-02 18:43:33 -03:00
• 738ea438c6 Fixed some links to GitHub pages documentation Brandon Mathis 2012-05-20 18:01:17 -05:00
• 91cfd16d38 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-20 17:27:34 -05:00
• c7d74c0d82 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script Brandon Mathis 2012-05-20 17:27:18 -05:00
• 0d2af78693 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script Brandon Mathis 2012-05-20 17:27:18 -05:00
• e334e832de Added disqus developer mode functionality Nathan Manzi 2012-01-14 14:44:39 +08:00
• d68e9ddc41 removed some duplication from category url generation Brandon Mathis 2012-05-20 16:43:06 -05:00
• c06ba58466 removed some duplication from category url generation Brandon Mathis 2012-05-20 16:43:06 -05:00
• 5e666bfe6b Category directory can be set to root directory. Closes #331 #369 Brandon Mathis 2012-05-20 16:36:03 -05:00
• 5b39a943f7 Category directory can be set to root directory. Closes #331 #369 Brandon Mathis 2012-05-20 16:36:03 -05:00
• 996ab81e88 Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-20 16:23:30 -05:00
• ecb1748c4e fixed issue where category layouts were using category feed xml instead of html layout Brandon Mathis 2012-05-20 16:23:08 -05:00
• 47b13260cf Merge branch '2.1' into site-2.1 Brandon Mathis 2012-05-20 16:20:00 -05:00
• 19320018b2 Re-encoding of input string rather than force encoding. This is safer/more valid Avery Yen 2012-05-11 19:59:03 -04:00
• dd5f3d3fef Force code blocks to be UTF. This fixes ASCII/UTF incompatabilities. Avery Yen 2012-05-04 03:20:36 -04:00
• 654a2937b8 Improvements to hosting with Github Pages: 1. Push deployment task pulls first, avoiding a --force push 2. Improvements to rake task setup_github_pages: - Now only rewrites _config.yml if in default state - Attempts a pull from deploy repo before setting up as a new project - Detects conflicts between CNAME and _config.yml url - Links to GitHub's help documentation for CNAME setup Fixes #561 Brandon Mathis 2012-05-20 10:38:56 -05:00
• addb0a149d Merge branch 'site-linklog' into site-2.1 Brandon Mathis 2012-05-20 08:07:18 -05:00
• 93c1965844 updated to latest 2.1 Brandon Mathis 2012-05-19 17:42:27 -05:00
• bc717eafe2 Merge branch '2.1' into site Brandon Mathis 2012-05-19 17:00:33 -05:00
• 7025a1a90a changed pullquote to reflect multi-line pullquotes Jeffrey Tratner 2012-05-16 23:19:18 -04:00
• 73b7e2094e Merge branch 'master' into 2.1 Brandon Mathis 2012-05-19 14:56:16 -05:00
• d71223c675 updated to latest version of Sass, fixed deprecation warnings Brandon Mathis 2012-05-19 14:48:37 -05:00
• 10d5fdaf51 fixed deprecation warning for sass extend feature Brandon Mathis 2012-05-19 13:30:59 -05:00
• f954689bb6 Improved styling for linklog along with other scss refactoring. Feed urls are more flexible with linklog items Brandon Mathis 2012-04-29 19:03:52 -05:00
• 79aa4eb4f7 Added robots.txt, with sitemap link Josep del Rio 2012-04-19 00:15:05 +02:00
• 8fe52e18bc cucumber tests refactor_with_tests Scott Davis 2012-03-24 11:23:31 -04:00
• 8b8fff3b03 Don't display comments link for post excerpts on index page when comments for that post are set to false. Luke Karrys 2012-03-23 13:06:01 -07:00
• 14a8bc05b3 Merge branch 'master' of github.com:imathis/octopress into site Brandon Mathis 2012-03-07 22:45:39 -06:00
• 8013163d00 Merge branch 'master' of github.com:imathis/octopress into linklog Brandon Mathis 2012-03-07 22:42:09 -06:00
• 9f40242b1e Merge pull request #376 from robertkowalski/clrf v2.0 Brandon Mathis 2012-03-07 13:40:54 -08:00
• 0996e56f76 Add EditorConfig file for classic theme Trey Hunner 2012-02-26 11:08:38 -08:00
• 05f54ab16b Add EditorConfig file for Ruby files Trey Hunner 2012-02-26 11:08:16 -08:00
• d38f9f8e43 Fix for bottom margin in nested lists. Chris Miller 2012-02-24 12:44:35 -07:00
• 7ebc0a0d8b Convert to integer before comparing. data.code is String Roman Yepishev 2012-02-21 11:07:45 +02:00
• ef8392e267 Raise RuntimeError when gist is unavailable Roman Yepishev 2012-02-20 23:45:07 +02:00
• c26aa7e9a0 now per category feeds are optional (default to off) this should improve speed for the many people who don't use this feature Brandon Mathis 2012-02-19 16:27:45 -06:00
• 84933ebb63 Merge branch 'site' of github.com:imathis/octopress into site Brandon Mathis 2012-02-19 15:53:13 -06:00
• 692c5c32e5 fixed help layout Brandon Mathis 2012-02-19 15:52:55 -06:00
• a814ca76ea Merge branch 'master' of github.com:imathis/octopress into linklog Brandon Mathis 2012-02-19 15:12:19 -06:00
• 3f7c2c6033 Merge pull request #425 from lukekarrys/patch-1 Brandon Mathis 2012-02-19 11:27:58 -08:00