Commit Graph

457 Commits

Author SHA1 Message Date
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
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
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
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
Josh Brown bb37858e67 Added a sweet Joomla 1.5 migrator 2011-10-24 14:09:22 -04:00
Marcello Barnaba f0f99eae8a Fix exception thrown in exception handler at convertible.rb:81 2011-10-18 23:05:39 +02:00
Peter Wagenet 4a9094f2d4 Fix non-pygments code highlighting 2011-09-26 23:47:04 -07:00
Pelle Wessman 2ce0eb00e7 Added redirects for Drupal posts' URL-aliases 2011-08-08 16:19:02 +02:00
Pelle Wessman e8f604b5ae Added table prefix option to Drupal migration
It's good practice in the Drupal community to always prefix the tables with something so that if you ever need to host two sites in the same database then you will easily know which tables belongs to which site.

This commit adds an option to the Drupal migration scripts that makes it possible to add such a prefix to the migration query.
2011-08-08 15:22:25 +02:00
Andrew Stone 5cffe5ecb5 Adding in the ability to link to posts internally. Syntax: {% post_url 2010-07-21-name-of-post %}; useful for: [Some Link]({% post_url 2010-07-21-name-of-post %}) 2011-07-21 19:49:09 -04:00
John Croisant 1b2b5ff278 Greatly improved and extended the wordpress.rb migrator.
* It can now export comments, categories, and tags.
* It can convert non-ASCII chars into HTML entities.
* It can export published, draft, private, and/or revision posts.
* It can process "<!-- more -->" tags to automatically generate
  a post excerpt and #anchors.

Read the big documentation comment for all the available options.
2011-07-17 17:00:55 -05: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
Tom Preston-Werner 3c94ff3480 Merge remote-tracking branch 'richbecks/master' 2011-07-05 22:25:51 -07:00
Richard Jones 00a0d14702 Tidied up indentation 2011-07-04 05:09:50 -07:00
Richard Jones 8c35cc957b Create import_hash with .new(0) so that we don't have to check if
a hash exists before incrementing it.
2011-07-04 04:59:40 -07:00
Matt Palmer eebeaf5dfb Give name of file that generated YAML exception message
It's not much good saying "hey, there was a problem" if you don't know where
the problem *is*.  Hunting through several hundred YAML files is no fun.
2011-07-02 10:35:41 +10:00
Thomas Laumann fccb6c7f74 Merge git://github.com/mojombo/jekyll 2011-06-29 12:07:21 +02:00
Richard Jones eb6a2b9bd0 Now creates _<directory> for each post type (e.g. _posts, _pages, _attachments) 2011-06-28 07:21:45 -07:00
Richard Jones 29c4808f2a Drafts are now marked as published:false 2011-06-28 06:31:03 -07:00
Richard Jones 3389c6d508 Sometimes wp:post_name can be empty (e.g. when a post is still draft), in this case we make up an appropriate permalink_title that will be used as the filename. The importer can always rename the file later on, and at least the file is unlikely to have been overwritten by another draft on the same day. 2011-06-28 02:31:42 -07:00
Richard Jones 365f57e8b3 Added meta tag import goodness. This for instance allows you to preserve all your hard-worked on WP SEO keywords, images, alternative images and other yummy-ness.
Replaced PubDate with wp:post_date, this is better than PubDate since some of the posts you import could be a draft (in this case the pubDate is invalid and contains a non-sensical value).
Added wp:status so we now know whether the post is published, draft or in the trash.
Added wp:post_type so we differentiate between posts and image or other post types
2011-06-28 02:05:51 -07:00
Kouhei Sutou 70aaded1e9 fix path name in syntax error message. 2011-06-20 22:46:38 +09:00
Dane Harrigan 2b8017dfdc can now set a custom pagination location with pagination_path 2011-06-05 14:57:53 -04:00
Lee Jarvis 6a756881f9 clean up some warnings 2011-06-03 23:38:39 +01:00
Tom Preston-Werner 851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner cae0eaf19c Merge remote-tracking branch 'mjschultz/master'
Conflicts:
	lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
Tom Preston-Werner da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00
Tom Preston-Werner 13f1cf5832 Merge pull request #328 from shoaibkamil/master
Bugfix in tumblr importer
2011-05-30 11:22:23 -07:00
Tom Preston-Werner 5568e5698c Merge remote-tracking branch 'vazexqi/patch-1' 2011-05-30 11:20:29 -07:00
Tom Preston-Werner 56ddf6a3c8 Merge branch 'next' 2011-05-29 22:46:10 -07:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Aman Gupta 22585d4b7f avoid infinite recursion while rendering layouts 2011-05-23 17:23:21 -04:00
Nicholas Chen 5788ca88f8 Changed [:state] check RE and required YAML
1) The published state is actually stored as "published" in the database but the regular expression checks for "Published" and thus will actually skip all published posts.

2) The to_yaml method is not immediately available without the "require 'yaml'" directive. This caused the migration script to fail while executing it following the instructions. 

Tested with Typo 5.3
2011-05-14 10:09:59 -07:00
shoaibkamil 1f4dd4ed61 Fixed bug in "conversation" importing where <section> and <dialog> tags were not being closed. 2011-05-11 22:06:53 -07:00
Thomas Laumann 20d1bd1f10 Merge https://github.com/mojombo/jekyll 2011-05-09 12:01:17 +02:00
Tom Preston-Werner f808c98232 Clean up Enki importer and update History. 2011-05-09 00:59:40 -07:00
Tom Preston-Werner 0dc55aacff Merge remote-tracking branch 'rodrigopinto/master' 2011-05-09 00:55:55 -07:00
Tom Preston-Werner b86bc97c5f Clean up Tumblr importer and update History. 2011-05-09 00:54:26 -07:00
Tom Preston-Werner 9cc9c233d0 Merge remote-tracking branch 'tonycosentini/master' 2011-05-09 00:41:07 -07:00
Tom Preston-Werner 0ce425443f Better Pager.calculate_pages implementation. 2011-05-08 23:44:20 -07:00
Tom Preston-Werner 82bd83fe7f More TomDoc and formatting cleanup. 2011-05-08 23:40:35 -07:00
Tom Preston-Werner aa0d82fa96 Clean up migrators formatting. 2011-05-08 15:08:53 -07:00
Tom Preston-Werner a428acec1c TomDoc some things. 2011-05-08 14:49:19 -07:00
Tony Cosentini e12cbdbea2 Added Tumblr migrator. 2011-05-02 14:31:01 -04:00
Rodrigo Pinto 55f42d26be adding enki migrator 2011-04-28 21:28:13 -03:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Derek Prior d2377b2581 Fixed mistake in default markdown extensions 2011-04-12 17:30:56 -04:00
Derek Prior 5801220a98 Added the ability to configure the file extensions to be processed by each converter. Test cases included. 2011-04-12 17:03:28 -04:00
Thomas Laumann 3f889ef077 added test case to hard_breaks (disable/enable in _config.yml) 2011-03-23 18:17:14 +01:00
Tom Preston-Werner dce4ccc5a4 Better error message for invalid post date. 2011-03-11 17:52:25 -08:00
Tom Preston-Werner 6c94db1486 TomDoc convertible.rb. 2011-03-11 16:00:32 -08:00
Tom Preston-Werner 68eaadd13a Merge remote-tracking branch 'MattHall/cli' into test 2011-03-10 23:01:18 -08:00
Tom Preston-Werner 01a90904e2 Merge remote-tracking branch 'phatblat/master' into test 2011-03-10 22:51:58 -08:00
Tom Preston-Werner d2814cf750 Merge remote-tracking branch 'elia/master' into devel 2011-03-10 22:38:17 -08:00
Tom Preston-Werner f58a821e20 Merge remote-tracking branch 'MattHall/posterous' into devel 2011-03-10 21:20:38 -08:00
Tom Preston-Werner a31780a1ec Move require to jekyll.rb and update history. 2011-03-10 21:15:29 -08:00
Tom Preston-Werner 5f4dfe388f Merge remote-tracking branch 'zenspider/master' into devel 2011-03-10 21:10:18 -08:00
Aman Gupta 13cc44fb12 sanitize urls and ignore symlinks 2011-03-10 20:14:38 -08:00
Aman Gupta be8b7715d3 speed up cleanup 2011-03-10 20:11:45 -08:00
Aman Gupta 08725eb234 use the new albino gem 2011-03-06 01:57:08 -08:00
Michael J Schultz 9e3ad69922 - added rdiscount filter for templating system (like the textilize filter, but for markdown) 2011-03-03 08:14:52 -06:00
Ryan Davis bd01e647a7 Cleaned up unnecessary string munging 2011-03-02 00:24:17 -08:00
laumann 3468f0a2c3 expanded config yaml to allow setting hard_breaks=false on RedCloth, modified textile converter to take this option into account 2011-02-09 01:37:30 +01:00
Elia Schito 034b06431e Remove double directory creation. 2011-01-27 13:13:12 +01:00
Elia Schito c70dac3cee Take permalink name directly from worpress export file. 2011-01-27 13:12:08 +01:00
Elia Schito ca48ea91e6 Merged wordpress.com migrator fix from 'heuripedes/jekyll' 2011-01-27 12:14:22 +01:00
Elia Schito f68bbcbe8d The Wordpress.com migrator now works and gathers categories as tags. 2011-01-27 02:12:42 -08:00
Ben Chatelain d61c1e930a Fix compile error by making QUERY lowercase (local instead of const) 2011-01-23 15:30:41 -07:00
Ben Chatelain bc3771aa22 Change TABLE_PREFIX from class member to 4th parameter of process method (now lowercase)
Move QUERY into process method
2011-01-23 15:25:33 -07:00
Ben Chatelain e902bb9c30 Change TABLE_PREFIX back to default 2011-01-23 15:21:29 -07:00
Ben Chatelain 42f63f919f Add Jekyll::WordPress.TABLE_PREFIX and inclusion in QUERY 2011-01-23 15:19:26 -07:00
Jeff Hodges b3634b522a adding date to wordpress migrator 2011-01-12 19:37:38 -08:00
lukebayes 717a2540e1 Added support for 'include' configuration parameter. This parameter
should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore.
2010-12-30 16:41:34 -08:00