Commit Graph

720 Commits

Author SHA1 Message Date
Tom Preston-Werner d36a1064a7 Merge pull request #437 from stephenmcd/master
Improved Tumblr Support
2012-01-21 19:54:00 -08:00
Tom Preston-Werner 456a9f3574 Update history. 2012-01-21 19:49:41 -08:00
Tom Preston-Werner d00bc8e8fe Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master 2012-01-21 19:49:08 -08:00
Tom Preston-Werner 8d48992f22 Merge pull request #447 from mking/master
Fix comment typo
2012-01-21 19:46:27 -08:00
Tom Preston-Werner c797d420c4 Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1 2012-01-21 19:45:24 -08:00
Tom Preston-Werner 03ad973523 Update history. 2012-01-21 19:43:32 -08:00
Tom Preston-Werner 65890da3d1 Merge branch 'categories_with_space' of https://github.com/spk/jekyll into spk-categories_with_space 2012-01-21 19:36:09 -08:00
Tom Preston-Werner fa6d013791 Update history. 2012-01-15 21:08:21 -08:00
Tom Preston-Werner d0d143452a Merge branch 'master' of https://github.com/laumann/jekyll 2012-01-15 20:39:55 -08:00
Tom Preston-Werner c14eb346a3 Allow [+.#-] in highlight lang shortnames. Fixes #282. 2012-01-15 20:35:09 -08:00
Tom Preston-Werner 4fe5e6ba99 Update history and fix up style. 2012-01-14 20:17:35 -08:00
Tom Preston-Werner 1f44e1ad64 Merge branch 'master' of https://github.com/RJ/jekyll into RJ-master 2012-01-14 20:15:31 -08:00
Tom Preston-Werner 89180169a4 Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include
Conflicts:
	lib/jekyll.rb
	lib/jekyll/site.rb
2012-01-14 19:48:04 -08:00
Stephen McDonald f2502dfab2 Added handling for Tumblr missing image extensions. 2011-12-30 23:25:09 +11:00
Stephen McDonald c26bd30318 Fix photo link URL. 2011-12-29 11:58:11 +11:00
Stephen McDonald bab178d9f8 Strip HTML from any caption-based titles. 2011-12-29 11:37:46 +11:00
Stephen McDonald 743e01f231 Fixed a change in Tumblr's API whereby photos no longer have a single URL field. 2011-12-29 11:37:06 +11:00
Tom Preston-Werner b66840ca46 Release 0.11.2 2011-12-27 17:53:50 -07:00
Tom Preston-Werner 4ece77300b Gah, did not commit these for v0.11.1 version release. 2011-12-27 17:48:00 -07:00
Stephen McDonald 3ab7658d1f Fixed Tumblr URL redirects. 2011-12-28 08:16:19 +11:00
Tom Preston-Werner febb31ba3e Release 0.11.1 2011-12-27 10:59:18 -07:00
Tom Preston-Werner 8754a024b5 Update history. 2011-12-27 10:57:20 -07:00
Stephen McDonald 886b9740f2 Fixed grab_images handling. 2011-12-27 10:09:59 +11:00
Simon Griffee 06d9446ade Added missing <code>require 'yaml'</code>, without which the TextPattern migrator script was failing. 2011-12-04 23:35:36 +01:00
Matthew King 14d51bfd25 Fix typo "destintation" => "destination" 2011-12-03 22:36:18 -05:00
Stephen McDonald 0f51c81cfa Added support for rewriting Tumblr URLs to Jekyll URLs in posts, meta redirects for Github pages, and automatic addition of Pygments highlight tags. 2011-12-04 12:01:37 +11:00
Thomas Laumann d80c773b01 New solution for passing restrictions to RedCloth - all tests pass with ruby 1.8 (just invoking rake) 2011-11-28 14:05:34 +01:00
Tomotaka Sakuma 76fa7f016b Fix an issue NoMethodError happens in case number of files under _posts is less than limit_posts. 2011-11-28 16:32:20 +09:00
Tom Preston-Werner 1da88bb30a Update and clarify dependencies. 2011-11-26 18:48:51 -08:00
Tom Preston-Werner 3fa51d5da9 Ignore .DS_Store files. 2011-11-26 10:05:46 -08:00
Tom Preston-Werner ebc8ab5b53 Remove accidentally added doc stuff and change rakefile to prevent this. 2011-11-26 10:05:15 -08:00
Stephen McDonald bc20ba9be9 Preserve HTML tables as per markdown's support for tables. 2011-11-25 06:11:09 +11:00
Stephen McDonald ab85c82356 Use Tumblr's JSON format instead of XML, to correctly preserve white-space when converting to markdown. 2011-11-24 06:11:57 +11:00
Stephen McDonald 1b3abb61d8 Clean up extraneous newlines left by html2text. 2011-11-21 05:49:49 +11:00
Stephen McDonald b762a1d5c5 Add a format option for converting posts to markdown via Python's html2text. 2011-11-20 22:15:36 +11:00
Stephen McDonald 87316894cc Quote the post's title so reserved yaml chars don't blow up. 2011-11-20 22:13:01 +11:00
Stephen McDonald 6826317e00 Use the post's title for the filename rather than its ID, as per Jekyll's naming convention. 2011-11-20 22:09:43 +11:00
Stephen McDonald 06f5b7d2e3 Fixed cgi module name. 2011-11-20 22:07:56 +11:00
Thomas Laumann ab3927499f Forgot to remove debugging code :-/ 2011-11-04 17:41:47 +01:00
Thomas Laumann 8c4edb655e Have TextileConverter pass any arguments set to true in config's redcloth section to RedCloth constructor as an array of symbols.
This means explicitly setting (for example):

  redcloth:
    hard_breaks: false
    lite_mode: true
    no_span_caps: true

will cause RedCloth to be invoked thusly:

  RedCloth.new(content, [:lite_mode, :no_span_caps])

(Notice that hard_breaks is ignored.) This means, however, anything set to true in the redcloth section in _config.yml _will_ be passed to RedCloth. Mayhem may ensue.
2011-11-04 17:33:53 +01:00
Thomas Jespersen bb9f1064d3 Merge pull request #1 from cgroner/master
(cgroner) Missing test cases for defaults.
2011-11-04 09:24:30 -07:00
Carl Groner 69e7f4abef Add test cases for default values with no explicit config. for `hard_breaks`. 2011-11-03 11:54:49 -07:00
Thomas Laumann a78f86f1ac Merge github.com:mojombo/jekyll 2011-11-03 11:47:47 +01:00
Aman Gupta 9fbf90ce59 Merge pull request #409 from wagenet/master
Fix non-pygments code highlighting
2011-09-27 07:06:38 -07:00
Peter Wagenet 4a9094f2d4 Fix non-pygments code highlighting 2011-09-26 23:47:04 -07:00
Tom Preston-Werner 72b7b1f056 Release 0.11.0 2011-07-10 15:14:25 -07:00
Laurent Arnoud 1356e75811 Generate escaped url for categories with space.
Space in URLs should be encoded.

Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
2011-07-10 23:56:56 +02:00
Thomas Laumann ed7f914459 removed unused code 2011-07-07 11:29:40 +02:00
Thomas Laumann 0aab73e156 Merge https://github.com/mojombo/jekyll 2011-07-07 11:14:32 +02:00
Tom Preston-Werner 3241d882b5 Merge remote-tracking branch 'kou/fix-error-message' 2011-07-05 22:31:25 -07:00