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
46a95bc036
git merge mojombo/master
2010-06-22 15:42:51 +03:00
aa9993a6c1
Merge remote branch 'koraktor/pygments-options' into next
2010-06-21 19:31:22 -07:00
f91954be76
optimization: write static file to the destination only if source file timestamp differs
...
Also make sure static files get regenerated when they are missing in destination.
This is useful in --server --auto mode when it reduces disk/cpu load and also plays nice with xrefresh-server (which was my main motivation) -> soft CSS refresh works again!
2010-06-20 08:02:16 +02:00
cb77a5287b
load plugins under safe mode
2010-06-18 17:55:17 -07:00
31c65c56f4
Extension -> Plugin
2010-06-18 15:47:01 -07:00
5335debfb2
Merge remote branch 'technoweenie/no-leading-zeroes'
...
Conflicts:
lib/jekyll/post.rb
2010-06-18 15:34:56 -07:00
e8d119ef0a
add :i_day and :i_month permalink values so you can get urls like /2010/6/1/title
2010-05-31 23:28:39 -07:00
2c542a652d
converters/wordpress.rb missing require 'yaml' for to_yaml function. fixes #151 .
2010-04-21 14:47:46 -07:00
a8efc3a0a2
tomdoc and normalize new extension and converter classes
2010-04-21 14:40:29 -07:00
03cb12aeb3
convert to use rakegem
2010-04-21 13:55:01 -07:00
3efe008544
better docs for jekyll.rb
2010-04-21 13:32:46 -07:00
08bc63289d
clean up globbed requires
2010-04-21 13:27:39 -07:00
81971c3342
teach Albino to run on both Windows and *nix
2010-04-21 13:19:38 -07:00
8405d30764
Fixes bug that removes all highlight tags
2010-04-18 01:51:53 +03:00
18545ddf71
pagination is now a generator extension
2010-02-28 11:17:03 +00:00
fc86c9dd85
extended concept to extensions in general, providing both converters and generators
2010-02-28 10:10:10 +00:00
84b26a31da
removed use of content_type strings in the highlighting tag
2010-02-28 00:11:43 +00:00
315f4c9222
allow converters to be registered through subclassing much like railties in rails
2010-02-27 23:31:54 +00:00
cedda3afa3
move converters to classes
2010-02-27 22:14:27 +00:00
ff3ca307b9
converters moved to migrators as they should be called this
2010-02-27 20:08:51 +00:00
1261840769
generate phase added to site#process and pagination is now a generator
2010-02-27 15:31:59 +00:00
ef2fabb189
also provide html_pages. this is better for sitemaps should you wish to auto-populate page entries
2010-02-27 14:09:07 +00:00
e8971b2999
Merge branch 'issue_64_broken' into enh_pages_in_payload
2010-02-27 09:38:05 +00:00
f73dac1582
fixes problem in issue 64 fix where pages like about.md would be output as about.md/index.html. provides the output extension as a method rather than replacing the ext attribute as part of transform
2010-02-27 09:27:36 +00:00
5a807aa12e
pages now present in the site payload and can be used through the site.pages variable
2010-02-27 08:09:13 +00:00
355b20265e
removed whitespace from lazyeye's commit
2010-02-26 21:33:56 +00:00
cfd6ebc747
pass time object to liquid when time is specified in front matter
2010-02-26 21:31:01 +00:00
98fa570c86
added support for consistent site.time in payload, generating the site at a specific time and limiting future posts
...
squish
2010-02-26 20:52:41 +00:00
ef6aa6b5c4
Added passing of all options to Pygments, not just "linenos"
2010-02-03 14:38:22 +01:00
a4f3f5c583
Merge commit '0a1e3cd2508c797d7b8d1038636a6e7111e5cd3d'. Fixes #33 .
...
Conflicts:
features/post_data.feature
2010-01-14 20:00:19 -08:00
ba77a024d6
fix highlighting on ruby 1.9. fixes #65
2010-01-13 22:33:38 -08:00
dd5fb69c2f
Merge commit 'b1a055f10dc921fd8ec03db703d2fb0608179f4d'
2010-01-13 21:49:22 -08:00
2b2e027b34
Render highlighted code for non markdown/textile pages. Fixes #116
2010-01-13 21:30:45 -08:00
b68149c7bc
fix pagination to adhere to read/render/write paradigm
2010-01-12 14:43:28 -08:00
a0aa3fa6dc
Merge branch 'enh_post_date_in_front_matter_issue_62'
2010-01-10 21:58:34 +00:00
a1550b3378
allow date to be specified in the front matter and override the value from the file name, fixes #62 and #38
2010-01-10 21:55:54 +00:00
ce228ac1c4
removed accessor method and fixed tests
2010-01-10 16:24:56 +00:00
93c029d62e
fixed #73 and #84
2010-01-10 16:14:25 +00:00
e0e4a47af1
added pluralized_array method to Hash and tests
2010-01-10 16:09:24 +00:00
6b74454a07
resetting to upstream
2010-01-10 10:11:44 +00:00
2a7b1cbd98
merged 'mojombo/master' at 'v0.5.6'
2010-01-09 09:03:59 +00:00
8d4b96084a
Merge commit 'e3bd1c88e9ad6c9d6c89a543ca72c82a289b6bd7'
2010-01-08 18:19:36 -08:00
473f3ffc11
Merge commit '597c7a7904198d92aa5eacad356019165685c311'
2010-01-08 18:08:17 -08:00
4c1021d597
don't prematurely terminate front matter on mid-line triple dashes. fixes #93
2010-01-08 18:04:36 -08:00
c89d8dd0f3
allow .mkd as a markdown extension
2010-01-08 17:26:48 -08:00
7806a0d6bb
separated up the attrs required by convertible and made tags and categories always non-nil as empty front matter entries could cause them to be nil
2010-01-06 15:19:39 +00:00
b8c04dfb6d
Merge branch 'jamie/master'
2010-01-05 22:59:43 +00:00
0cb1ebcda1
split process handling into phases to allow pages to have access to full and complete site payload and added some test improvements
2010-01-05 17:05:44 +00:00
5ea06f3ad9
fixes issue #78 , including comprehensive scenarios and tests
2010-01-04 09:39:54 +00:00
b1a055f10d
Call File.expand_path on source so liquid can see _includes in subdirectories
2009-11-30 17:27:57 +00:00
fab5a715c5
safely allow loading jekyll customizations from inside a site
2009-11-29 13:25:00 -05:00
597c7a7904
changes to stdout and -err - tests and behaviour
...
By using $stdin adn $stderr instead of STDIN and
STDERR it is possible to capture or redirect them
using in process ruby code without the need
to manage pipes and external processes
2009-11-24 21:42:22 +01:00
52342fe6e1
Fixed bug where including includes from an include threw an exception.
2009-10-28 02:12:47 +02:00
Lee Jarvis
Tom Preston-Werner
Aman Gupta
Nicholas Chen
shoaibkamil
Thomas Laumann
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
Christian Hellsten
Antonin Hildebrand
rick
Gaute Hope
Jon
Kris Brown
lazyeye
Sebastian Staudt
Alex Young
Jamie Macey
Gregor Schmidt