Commit Graph

363 Commits

Author SHA1 Message Date
Fotos Georgiadis f79662719b Fix indentation. 2013-03-09 15:07:27 +02:00
Fotos Georgiadis 441eddf1ca Fix pretty url style paths.
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
Fotos Georgiadis 4090500c5a Added path in url.
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
Tom Preston-Werner 4499df8033 Shorten plugin loading code and update history. 2012-01-29 12:49:57 -08:00
Tom Preston-Werner 02366ae5ff Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray 2012-01-29 12:32:59 -08:00
Tom Preston-Werner 9d70088f01 Properly select dotfiles during directory scan.
Fixes #363.
Fixes #431.
Fixes #377.
2012-01-23 00:21:08 -08:00
Beau Simensen e6d89c6a0f More testing, whitespace and comment cleanup. 2012-01-22 22:17:25 -08:00
Beau Simensen dcf546275b Tweaked plugin directory handling, tests. 2012-01-22 22:10:12 -08:00
Tom Preston-Werner 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
Tom Preston-Werner 16a4855200 Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url 2012-01-22 16:03:10 -08:00
Tom Preston-Werner c04a9549ea Make note of self.name requirement for Convertible. 2012-01-22 15:02:41 -08:00
Tom Preston-Werner 3c2519f07d Merge pull request #419 from vjt/master
Exception handler in Convertible references nonexisting method .name
2012-01-22 00:25:55 -08:00
Tom Preston-Werner 613a7a46a3 Merge pull request #460 from kendagriff/master
RSS Migrator
2012-01-22 00:20:33 -08:00
Tom Preston-Werner 8adfaea339 Merge pull request #426 from joshbrown/master
Added a Joomla migrator
2012-01-22 00:19:35 -08:00
Tom Preston-Werner 22159b3d61 Merge pull request #368 from jacius/wordpress
Greatly improved and extended the wordpress.rb migrator.
2012-01-22 00:18:33 -08:00
Tom Preston-Werner 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
Tom Preston-Werner 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
Tom Preston-Werner 574e933d81 Merge branch 'master' of https://github.com/jpravetz/jekyll into jpravetz-master 2012-01-21 19:59:05 -08:00
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 d00bc8e8fe Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master 2012-01-21 19:49:08 -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
Nicholas Firth-McCoy 19fc8cb488 Oops, still need email and pass. Update usage comment 2012-01-18 11:08:02 +11:00
Nicholas Firth-McCoy 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
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 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
Stephen McDonald 3ab7658d1f Fixed Tumblr URL redirects. 2011-12-28 08:16:19 +11:00
Stephen McDonald 886b9740f2 Fixed grab_images handling. 2011-12-27 10:09:59 +11:00
Kendall Buchanan 9523c3990e Adding migrator for RSS feeds. 2011-12-22 12:33:15 -07: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
jpravetz 9a3429dc74 Update lib/jekyll/convertible.rb 2011-12-04 08:37:42 -08: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
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
Beau Simensen ab08acace9 Support plugins being a list of directories to scan. 2011-11-21 21:09:39 -06: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