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 |
|
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
|
2a116251b5
|
added test for tab indentation bug
|
2012-05-22 00:37:00 -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
|
7224427b36
|
removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex
|
2012-05-21 23:59:49 -05:00 |
|
Brandon Mathis
|
0f1be647cf
|
Merge branch '2.1' into site-2.1
|
2012-05-21 23:58:36 -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
|
b785a87869
|
Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description
|
2012-05-21 23:47:27 -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
|
6caab53ab9
|
added another test for backtick code blocks in textile
|
2012-05-21 20:19:23 -05:00 |
|
Brandon Mathis
|
53fdadd764
|
Merge branch '2.1' into site-2.1
|
2012-05-21 20:16:16 -05: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 |
|