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
ab08acace9
Support plugins being a list of directories to scan.
2011-11-21 21:09:39 -06: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
4a9094f2d4
Fix non-pygments code highlighting
2011-09-26 23:47:04 -07:00
ddd5dbb5fb
Change to new posterous API
2011-09-16 15:31:01 -07:00
2ce0eb00e7
Added redirects for Drupal posts' URL-aliases
2011-08-08 16:19:02 +02:00
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
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
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
72b7b1f056
Release 0.11.0
2011-07-10 15:14:25 -07:00
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
ed7f914459
removed unused code
2011-07-07 11:29:40 +02:00
0aab73e156
Merge https://github.com/mojombo/jekyll
2011-07-07 11:14:32 +02:00
3241d882b5
Merge remote-tracking branch 'kou/fix-error-message'
2011-07-05 22:31:25 -07:00
3c94ff3480
Merge remote-tracking branch 'richbecks/master'
2011-07-05 22:25:51 -07:00
00a0d14702
Tidied up indentation
2011-07-04 05:09:50 -07:00
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
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
fccb6c7f74
Merge git://github.com/mojombo/jekyll
2011-06-29 12:07:21 +02:00
eb6a2b9bd0
Now creates _<directory> for each post type (e.g. _posts, _pages, _attachments)
2011-06-28 07:21:45 -07:00
29c4808f2a
Drafts are now marked as published:false
2011-06-28 06:31:03 -07:00
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
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
70aaded1e9
fix path name in syntax error message.
2011-06-20 22:46:38 +09:00
2b8017dfdc
can now set a custom pagination location with pagination_path
2011-06-05 14:57:53 -04:00
6a756881f9
clean up some warnings
2011-06-03 23:38:39 +01:00
851172b5ef
Replace rdiscount filter with config-aware markdownify.
2011-05-31 14:40:21 -07:00
cae0eaf19c
Merge remote-tracking branch 'mjschultz/master'
...
Conflicts:
lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
da9930657e
Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'
2011-05-30 11:38:59 -07:00
13f1cf5832
Merge pull request #328 from shoaibkamil/master
...
Bugfix in tumblr importer
2011-05-30 11:22:23 -07:00
5568e5698c
Merge remote-tracking branch 'vazexqi/patch-1'
2011-05-30 11:20:29 -07:00
56ddf6a3c8
Merge branch 'next'
2011-05-29 22:46:10 -07:00
2ad0fbc8ff
Merge remote-tracking branch 'MattHall/redcarpet'
2011-05-29 21:38:34 -07:00
22585d4b7f
avoid infinite recursion while rendering layouts
2011-05-23 17:23:21 -04:00
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
1f4dd4ed61
Fixed bug in "conversation" importing where <section> and <dialog> tags were not being closed.
2011-05-11 22:06:53 -07:00
20d1bd1f10
Merge https://github.com/mojombo/jekyll
2011-05-09 12:01:17 +02:00
f808c98232
Clean up Enki importer and update History.
2011-05-09 00:59:40 -07:00
0dc55aacff
Merge remote-tracking branch 'rodrigopinto/master'
2011-05-09 00:55:55 -07:00
b86bc97c5f
Clean up Tumblr importer and update History.
2011-05-09 00:54:26 -07:00
9cc9c233d0
Merge remote-tracking branch 'tonycosentini/master'
2011-05-09 00:41:07 -07:00
0ce425443f
Better Pager.calculate_pages implementation.
2011-05-08 23:44:20 -07:00
82bd83fe7f
More TomDoc and formatting cleanup.
2011-05-08 23:40:35 -07:00
aa0d82fa96
Clean up migrators formatting.
2011-05-08 15:08:53 -07:00
a428acec1c
TomDoc some things.
2011-05-08 14:49:19 -07:00
e12cbdbea2
Added Tumblr migrator.
2011-05-02 14:31:01 -04:00
55f42d26be
adding enki migrator
2011-04-28 21:28:13 -03:00
cf779b2760
Added Redcarpet for MD conversion
2011-04-20 10:04:42 +01:00
d2377b2581
Fixed mistake in default markdown extensions
2011-04-12 17:30:56 -04:00
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
3f889ef077
added test case to hard_breaks (disable/enable in _config.yml)
2011-03-23 18:17:14 +01:00
dce4ccc5a4
Better error message for invalid post date.
2011-03-11 17:52:25 -08:00
6c94db1486
TomDoc convertible.rb.
2011-03-11 16:00:32 -08:00
68eaadd13a
Merge remote-tracking branch 'MattHall/cli' into test
2011-03-10 23:01:18 -08:00
01a90904e2
Merge remote-tracking branch 'phatblat/master' into test
2011-03-10 22:51:58 -08:00
d2814cf750
Merge remote-tracking branch 'elia/master' into devel
2011-03-10 22:38:17 -08:00
f58a821e20
Merge remote-tracking branch 'MattHall/posterous' into devel
2011-03-10 21:20:38 -08:00
a31780a1ec
Move require to jekyll.rb and update history.
2011-03-10 21:15:29 -08:00
5f4dfe388f
Merge remote-tracking branch 'zenspider/master' into devel
2011-03-10 21:10:18 -08:00
13cc44fb12
sanitize urls and ignore symlinks
2011-03-10 20:14:38 -08:00
be8b7715d3
speed up cleanup
2011-03-10 20:11:45 -08:00
08725eb234
use the new albino gem
2011-03-06 01:57:08 -08:00
9e3ad69922
- added rdiscount filter for templating system (like the textilize filter, but for markdown)
2011-03-03 08:14:52 -06:00
bd01e647a7
Cleaned up unnecessary string munging
2011-03-02 00:24:17 -08:00
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
034b06431e
Remove double directory creation.
2011-01-27 13:13:12 +01:00
c70dac3cee
Take permalink name directly from worpress export file.
2011-01-27 13:12:08 +01:00
ca48ea91e6
Merged wordpress.com migrator fix from 'heuripedes/jekyll'
2011-01-27 12:14:22 +01:00
f68bbcbe8d
The Wordpress.com migrator now works and gathers categories as tags.
2011-01-27 02:12:42 -08:00
d61c1e930a
Fix compile error by making QUERY lowercase (local instead of const)
2011-01-23 15:30:41 -07:00
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
e902bb9c30
Change TABLE_PREFIX back to default
2011-01-23 15:21:29 -07:00
42f63f919f
Add Jekyll::WordPress.TABLE_PREFIX and inclusion in QUERY
2011-01-23 15:19:26 -07:00
b3634b522a
adding date to wordpress migrator
2011-01-12 19:37:38 -08:00
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
84c1a72443
Updating CLI for importing
2010-12-19 17:38:14 +00:00
c1f0e070c9
Adding Posterous Importer
2010-12-19 16:27:22 +00:00
13df722073
Release 0.10.0
2010-12-16 16:29:48 -08:00
a8a837cc8e
Release 0.9.0
2010-12-15 15:36:15 -08:00
9e0eb75170
updated/fixed wordpress.com migration script
2010-12-15 15:44:01 -03:00
36b1f8f9b1
Add Marley migrator. Closes #28 .
2010-12-14 15:12:12 -08:00
c1ed790534
Merge remote branch 'sos4nt/remove-orphaned-files'
2010-12-13 21:18:21 -08:00
9bd48752e6
Merge remote branch 'MattHall/master'
2010-12-13 21:12:21 -08:00
226c7cc121
Rescue exception when parsing invalid yaml. Prevents silent fail in auto and server mode
2010-12-11 14:30:44 +00:00
0a58d78338
Catch Liquid template exceptions, and write out their details. Prevents silent fail of template parsing
2010-12-11 14:23:12 +00:00
5b680f8dd8
remove orphaned files in destination
2010-12-01 18:04:50 +01:00
e8fd7ebbc3
Add Drupal migrator
2010-11-30 17:11:23 -05:00
31901ee15b
Release 0.8.0
2010-11-22 23:08:56 -08:00
3ab016870d
Prevent _includes dir from being a symlink.
2010-11-22 21:45:35 -08:00
61acd47ed2
Merge remote branch 'jasongraham/kramdown-support'
2010-11-22 19:26:58 -08:00
dca30c3ad1
Add kramdown's support for coderay
...
- no test added so that coderay isn't added to list of developer
dependencies
2010-11-20 17:46:16 -08:00
f85e229a9e
Add support for kramdown HTML converter options
...
http://kramdown.rubyforge.org/converter/html.html#options
Example: In the _config.yaml,
markdown: kramdown
kramdown:
auto_ids: true
2010-11-20 17:40:27 -08:00
ac7a0cc95f
Add Kramdown support and tests
2010-11-20 17:40:27 -08:00
53b999418c
Merge remote branch 'stmpjmpr/master'
2010-11-20 11:37:22 -06:00
00146909f9
Merge remote branch 'remotes/mojombo/master'
2010-11-19 02:38:50 -08:00
a556e4f29e
Swapping a '-' for the word separator for imported entries since that's the MT style, and I don't want to break existing permalinks.
2010-11-19 02:36:56 -08:00
9396c9d04c
migrators now open Sequel connection to mysql with utf8 encoding. Closes GH-220
2010-11-18 18:14:08 +01:00
f7ab019a39
Merge remote branch 'claco/uri-escape'
2010-11-17 15:30:34 -06:00
054b796b9f
Merge remote branch 'cblunt/limit_posts'
2010-11-17 14:56:32 -06:00
c1a7662311
Merge remote branch 'lpenz/master'
...
Conflicts:
History.txt
2010-11-17 12:35:29 -06:00
4c08643c50
Added uri_escape for cases where cgi_escape isn't appropriate
2010-11-12 11:15:30 -05:00
f688c9df81
Added limit-posts option to site configuration.
...
* Added unit tests for limit-posts.
* Added feature for limit-posts.
* Added --limit_posts option to bin/jekyll options parser
2010-09-13 00:31:52 +01:00
b1049c84cd
Correctly generates file basename. Fixes #208 .
...
The previous procedure generated invalid basenames when the filename had
more than one dot.
2010-09-05 18:11:09 -03:00
b6678d4e43
Added Wordpress.com migrator
2010-09-02 13:36:31 +01:00
3fa9af17fa
Release 0.7.0
2010-08-24 15:35:18 -07:00
391d1a9677
Merge remote branch 'ctrochalakis/rdiscount_extensions'
2010-08-24 15:19:47 -07:00
f4fb833d34
The site configuration may not always provide a 'time' setting. Closes #184 .
...
* This fixes a bug on Ruby 1.9.1 and 1.9.2 where Time.parse was being
passed an emptry String, if the 'time' setting was not defined.
2010-08-24 15:19:22 -07:00
d9bc00c804
Highlight should not be able to render local files.
2010-08-24 15:05:28 -07:00
b3cec39843
Now adding a "date" to the YAML front-matter of a post, based on the original date the post was authored according to MT.
2010-08-06 10:33:59 -07:00
f6acbb869e
Changed the date used by Jekyll to be the date the post was authored on instead of the date it was created. If the latter is used on an imported post, it gets the import date instead of the date the post was originally written.
2010-08-06 01:26:32 -07:00
adf9ca5a05
Added code to change the extension of a post based on the format used to write the post in MT.
2010-08-05 15:36:14 -07:00
5e997cae21
Release 0.6.2
2010-06-25 15:56:57 -07:00
f35d287c66
Fix page.url to include full relative path. Fixes #181 .
2010-06-25 15:12:39 -07:00
1c3fedbb31
Expand source, destination, and plugin paths. Fixes #180 .
2010-06-25 14:40:27 -07:00
a56eeb8289
Add support for rdiscount extensions
...
Specify extensions at your _config.yml file:
...
rdiscount:
extensions: [smart, autolink]
Available extensions can be found here:
http://rdoc.info/projects/rtomayko/rdiscount
closes #173
2010-06-25 16:38:45 +03:00
908526455c
Ensure that RedCloth is loaded when textilize filter is used. Fixes #183 .
2010-06-24 18:14:59 -07:00
44015665b9
Release 0.6.1
2010-06-23 15:52:56 -07:00
6a605753c1
Need double quotes for newline character. Fixes #178 .
2010-06-23 15:50:22 -07:00
99ee0c4803
Release 0.6.0
2010-06-22 17:56:16 -07:00
de3ee99d30
Use Dir.pwd for other default paths as well (reverts fix in #101 )
2010-06-22 16:22:58 -07:00
f8484570b7
Merge remote branch 'christianhellsten/master' into next
2010-06-22 16:01:48 -07:00
de8bd48154
Maruku is now the only processor dependency installed by default. Closes #57 .
...
Other processors will be lazy-loaded when necessary (and prompt the
user to install them when necessary).
2010-06-22 15:17:39 -07:00
Tom Preston-Werner
Stephen McDonald
Kendall Buchanan
Simon Griffee
jpravetz
Thomas Laumann
Tomotaka Sakuma
Beau Simensen
Carl Groner
Josh Brown
Marcello Barnaba
Peter Wagenet
Alagu
Pelle Wessman
Andrew Stone
John Croisant
Laurent Arnoud
Richard Jones
Matt Palmer
Kouhei Sutou
Dane Harrigan
Lee Jarvis
Aman Gupta
Nicholas Chen
shoaibkamil
Tony Cosentini
Rodrigo Pinto
MattHall
Derek Prior
Michael J Schultz
Ryan Davis
Elia Schito
Ben Chatelain
Jeff Hodges
lukebayes
Higor Eurípedes
Stefan Schüßler
Matt Di Pasquale
Jason Graham
Scott Hill
Tomasz Stachewicz
Christopher H. Laco
cblunt
Leandro Lisboa Penz
Postmodern
Christos Trochalakis