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
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
50ced3b6d7
updated tests for code snippets with markdown and textile
2012-05-21 20:13:24 -05:00
Brandon Mathis
96529fae7a
Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better
2012-05-21 20:12:27 -05:00
Brandon Mathis
ac71bc52ae
removed faulty string join from code_block plugin
2012-05-21 20:09:25 -05:00
Brandon Mathis
abd9e8f488
removed an unnecessary whitespace indent adjustment from backtick codeblock
2012-05-21 20:07:36 -05:00
Simon Whitaker
f52798c149
Correct minor typo
...
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-21 16:57:26 -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
8394c9ffb1
updated Gems, added more liberal definitions to gemfile
2012-05-21 16:16:29 -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
0873c103d3
Octopress filters are now limited to html producing templating languages, Fixes #536
2012-05-21 15:58:42 -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
8a0940503f
updated docs for styling linklog options
2012-05-20 23:45:21 -05:00
Brandon Mathis
860094feba
Merge branch '2.1' into site-2.1
2012-05-20 23:40:31 -05:00
Brandon Mathis
42369ddf5d
fixed class name attribute on linklog posts
2012-05-20 23:40:17 -05:00
Brandon Mathis
c653dfa198
updated docs for configurations, updated to latest 2.1
2012-05-20 23:39:36 -05:00
Brandon Mathis
ad40321eff
Merge branch '2.1' into site-2.1
2012-05-20 22:23:42 -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
Brandon Mathis
738ea438c6
Fixed some links to GitHub pages documentation
2012-05-20 18:01:17 -05:00
