5d6e87bbf3
Merge remote-tracking branch 'origin/alagu-master' into alagu-posterous-importer-rebased
...
Conflict created due to #472 .
Conflicts:
lib/jekyll/migrators/posterous.rb
2012-01-22 19:35:25 -08:00
e27e2554d9
Merge pull request #472 from nfm/patch-1
...
Update Posterous migrator to take an api_token
2012-01-22 16:27:32 -08:00
16a4855200
Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url
2012-01-22 16:03:10 -08:00
c04a9549ea
Make note of self.name requirement for Convertible.
2012-01-22 15:02:41 -08:00
3c2519f07d
Merge pull request #419 from vjt/master
...
Exception handler in Convertible references nonexisting method .name
2012-01-22 00:25:55 -08:00
613a7a46a3
Merge pull request #460 from kendagriff/master
...
RSS Migrator
2012-01-22 00:20:33 -08:00
8adfaea339
Merge pull request #426 from joshbrown/master
...
Added a Joomla migrator
2012-01-22 00:19:35 -08:00
22159b3d61
Merge pull request #368 from jacius/wordpress
...
Greatly improved and extended the wordpress.rb migrator.
2012-01-22 00:18:33 -08:00
1292c02ec0
Merge pull request #384 from voxpelli/drupal-alias-redirect
...
Added redirects for Drupal posts' URL-aliases
2012-01-21 20:04:40 -08:00
6e921c5852
Merge pull request #383 from voxpelli/drupal-db-prefix
...
Added table prefix option to Drupal migration
2012-01-21 20:03:09 -08:00
574e933d81
Merge branch 'master' of https://github.com/jpravetz/jekyll into jpravetz-master
2012-01-21 19:59:05 -08:00
d36a1064a7
Merge pull request #437 from stephenmcd/master
...
Improved Tumblr Support
2012-01-21 19:54:00 -08:00
d00bc8e8fe
Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master
2012-01-21 19:49:08 -08:00
c797d420c4
Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1
2012-01-21 19:45:24 -08:00
03ad973523
Update history.
2012-01-21 19:43:32 -08:00
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
19fc8cb488
Oops, still need email and pass. Update usage comment
2012-01-18 11:08:02 +11:00
c3b12457a0
Update Posterous migrator to take an api_token instead of email and pass
...
The Posterous API call for retrieving a user's API token (`/api/2/auth/token`) is no longer supported and returns 410 GONE. This patch updates the #process method to accept an API token instead of an email address and password. A user's API token can be retrieved from http://posterous.com/api .
2012-01-18 10:55:58 +11:00
d0d143452a
Merge branch 'master' of https://github.com/laumann/jekyll
2012-01-15 20:39:55 -08:00
c14eb346a3
Allow [+.#-] in highlight lang shortnames. Fixes #282 .
2012-01-15 20:35:09 -08:00
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
f2502dfab2
Added handling for Tumblr missing image extensions.
2011-12-30 23:25:09 +11:00
c26bd30318
Fix photo link URL.
2011-12-29 11:58:11 +11:00
bab178d9f8
Strip HTML from any caption-based titles.
2011-12-29 11:37:46 +11:00
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
b66840ca46
Release 0.11.2
2011-12-27 17:53:50 -07:00
4ece77300b
Gah, did not commit these for v0.11.1 version release.
2011-12-27 17:48:00 -07:00
3ab7658d1f
Fixed Tumblr URL redirects.
2011-12-28 08:16:19 +11:00
886b9740f2
Fixed grab_images handling.
2011-12-27 10:09:59 +11:00
9523c3990e
Adding migrator for RSS feeds.
2011-12-22 12:33:15 -07:00
06d9446ade
Added missing <code>require 'yaml'</code>, without which the TextPattern migrator script was failing.
2011-12-04 23:35:36 +01:00
9a3429dc74
Update lib/jekyll/convertible.rb
2011-12-04 08:37:42 -08:00
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
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
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
1da88bb30a
Update and clarify dependencies.
2011-11-26 18:48:51 -08:00
840b0c14ae
YAML front matter fix, cleaned up slug generation, added tags and store some posterous information from the original post.
2011-11-25 19:06:16 -06:00
bc20ba9be9
Preserve HTML tables as per markdown's support for tables.
2011-11-25 06:11:09 +11:00
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
1b3abb61d8
Clean up extraneous newlines left by html2text.
2011-11-21 05:49:49 +11:00
b762a1d5c5
Add a format option for converting posts to markdown via Python's html2text.
2011-11-20 22:15:36 +11:00
87316894cc
Quote the post's title so reserved yaml chars don't blow up.
2011-11-20 22:13:01 +11:00
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
06f5b7d2e3
Fixed cgi module name.
2011-11-20 22:07:56 +11:00
ab3927499f
Forgot to remove debugging code :-/
2011-11-04 17:41:47 +01:00
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
69e7f4abef
Add test cases for default values with no explicit config. for `hard_breaks`.
2011-11-03 11:54:49 -07:00
a78f86f1ac
Merge github.com:mojombo/jekyll
2011-11-03 11:47:47 +01:00
bb37858e67
Added a sweet Joomla 1.5 migrator
2011-10-24 14:09:22 -04:00
f0f99eae8a
Fix exception thrown in exception handler at convertible.rb:81
2011-10-18 23:05:39 +02:00
Beau Simensen
Tom Preston-Werner
Nicholas Firth-McCoy
Nicholas Firth-McCoy
Stephen McDonald
Kendall Buchanan
Simon Griffee
jpravetz
Thomas Laumann
Tomotaka Sakuma
Carl Groner
Josh Brown
Marcello Barnaba