6514fe2d22
Strip extra newlines
2013-01-19 22:38:51 +00:00
e03f48085a
Update command classes moving into a module
2013-01-19 22:36:46 +00:00
f231ef7644
Merge pull request #684 from mattr-/issue-680.
2013-01-18 10:28:14 -05:00
2615291e6d
Printing error message in WP.com migrator. #671 .
2013-01-17 22:33:37 -05:00
3bca5c3297
Merge pull request #671 from fzero/master
...
Rescue from import errors on Wordpress.com plugin.
2013-01-17 19:30:51 -08:00
cd05f6be78
Ensures that categories are Strings before escaping. Fixes #759 .
2013-01-17 21:55:01 -05:00
f460a6cf71
Merge branch 'master' into issue-653
2013-01-16 21:52:32 -06:00
faf5e44c47
Merge pull request #664 from Jashank/faster_lsi
...
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
2e76edd837
Merge pull request #496 from dunsmoreb/issue/481
...
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08:00
e383bfe65d
Merge pull request #743 from mccxj/master
...
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
5a3e05dbff
Ensuring that layout is only set to the default value if layout is not specified
2013-01-12 15:31:14 -08:00
e8c74fe7a8
Layouts default to page or post depending upon type.
2013-01-12 13:49:45 -08:00
a05b9159d9
Merge pull request #616 from hokaccha/fix_pygments_opt
...
fixed pygments linenos options for pygments.rb
2013-01-12 00:11:18 -08:00
7f072ed578
Merge branch 'master'
2013-01-12 01:18:41 +00:00
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
68333cd221
Slight stylistic tweak to LSI initialisation.
...
Recommended-by: parkr
2013-01-11 20:02:31 +11:00
660e5e0e14
Merge remote-tracking branch 'jekyll/master'
2013-01-11 15:45:54 +08:00
3cf29eeee2
add Enumerable#glob_include?
2013-01-11 15:33:11 +08:00
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
151275d09e
Add TomDoc
2013-01-10 21:53:21 -06:00
92eb926bf8
Look for plugins under the source directory by default
2013-01-10 21:24:28 -06:00
e210a0603f
Revert "Remove migrators"
...
This reverts commit b9da30bc8f
2013-01-11 00:30:17 +00:00
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
b3e27f2c5d
fixed a syntax error
2013-01-10 19:41:11 +08:00
c627cd3519
use any? instead
2013-01-10 09:16:09 +08:00
b70b57cb89
Merge branch 'master' into 'jekyll-command-redux'
2013-01-09 23:40:27 +00:00
1e892678bc
Update lib/jekyll/site.rb
2013-01-09 16:06:43 +08:00
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
44822a252e
add regexp support for option 'include','exclude'
2013-01-06 21:23:31 +08:00
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
12a19eaf3a
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-12-26 14:23:32 -05:00
b9da30bc8f
Remove migrators
2012-12-22 17:49:33 +00:00
b7944c5274
Add initial MigrateCommand
...
Not all migrators can actually be calld from the comand line. Some require
options which are not passed in and have to be called by other means.
2012-12-19 17:50:21 +00:00
934495b272
Adds some random docs for stuff I saw while skimming the code.
2012-12-18 22:42:42 -08:00
dc139e2ac9
Update the sym->str key conversion
2012-12-18 22:13:17 +00:00
bd1c8fe760
Update Jekyll.configuration to convert symbol keys
...
Because Commander uses symbol keys in the options hash and I don't want to go
back backport every hash string key to symbols in Jekyll. ⭐
2012-12-18 21:55:00 +00:00
5b2e95b443
Add missing ] in self.watch string
2012-12-18 21:54:01 +00:00
d8f328b87c
Update loop position so trap handler is used
2012-12-18 21:41:18 +00:00
3b4feb41f0
Add initial serve command
...
The `ServeCommand` will let you serve your site locally for development. You
can specify `--port`, `--host` and `--baseurl` options if you wish to change the
defaults.
Additionally the `BuildCommand` will be called before the processing of the
serve command, this makes sure that the site is actually built. This means you
are able to pass the `--watch` option to auto-regenerate your site, even while
serving it locally.
2012-12-18 21:00:24 +00:00
14766497c8
Add bin/jekyll2 and initial BuildCommand
...
The `BuildCommand` class is responsible for handling the building of the site.
It can also optionally watch for changes to files and regenerate the site if
needed.
The `Command` class holds any methods which are used by any command
implementation.
2012-12-18 20:34:09 +00:00
3a8ebb4b71
Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp
2012-12-15 22:09:41 -08:00
583f9e0019
Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master
2012-12-15 16:42:26 -08:00
26f8d60542
Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master
2012-12-15 16:35:45 -08:00
4bae42a671
use Array.join instead of Array.inject, add .svn to defaults
2012-12-09 11:43:49 +01:00
8fb4e8fcca
Convert slashes in titles to dashes when migrating from WordPress
...
When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.
Fixes issue #680
2012-12-04 20:45:20 -06:00
38ac55381b
Only pass first class to Pygments
...
This prevents an exception if something like the following is used:
~~~ {foo bar}
some code
~~~
2012-11-13 07:59:36 +00:00
20ac62d30e
Making sure errors don't halt the import.
...
Wrapped file operations in a begin/rescue block.
2012-11-11 23:28:10 -05:00
85f2dfffa6
faster_lsi: Massively accelerate LSI performance.
...
Currently, Classifier::LSI rebuilds the index every time an entry is
added. This runs into massive performance overheads on my website;
theoretically, disabling automatic index rebuilds, and explicitly
rebuilding the LSI index at the end of the LSI repopulation should
speed things up nicely.
As a side note, here, I use pandoc-ruby to provide a more featureful
Markdown transformer, so be mindful that the numbers I quote here have
artifically imposed I/O overheads.
With just the 76 posts I wrote this year (abysmal, I know), I come up
with the following figures:
Without faster_lsi:
jekyll --lsi 16.91s user 0.88s system 97% cpu 18.302 total
With faster_lsi:
jekyll --lsi 2.72s user 0.77s system 88% cpu 3.940 total
With 109 posts, we begin to see even better improvements:
Without faster_lsi:
jekyll --lsi 51.00s user 1.47s system 98% cpu 53.060 total
With faster_lsi:
jekyll --lsi 5.04s user 1.12s system 91% cpu 6.735 total
At this point, we begin to see I/O overheads being slower than LSI
when faster_lsi is active. I call that fairly conclusive. But wait,
there's more. I have 273 posts lying around... I wonder what happens
if I feed them all in. With faster_lsi, it was nice and clippy.
Without it, I simply gave up, and went and refilled my cup of tea.
And it was still going.
Without faster_lsi:
jekyll --lsi 1277.86s user 10.90s system 99% cpu 21:30.29 total
With faster_lsi:
jekyll --lsi 34.62s user 4.43s system 96% cpu 40.430 total
That is, in anyone's books, a major improvement. Note, however, that
I don't know just how well this will perform with `jekyll --auto`
because I don't know how it does the LSI rebuilds. I _think_ (but
please, don't commit me on this) that the LSI is rebuilt every time
Jekyll picks up a file change.
So, all up, the performance improvement is massive, and scales
depending on how many files you have. At the last point, the
improvement is just on 3200%.
A more optimal solution would be to cache the LSI index and/or content
data somehow. I'll leave that to when faster_lsi takes over ten
minutes to run.
2012-10-31 22:19:59 +11:00
2726a5f27c
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-10-03 19:33:21 -07:00
7c800d3b07
Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556
2012-08-23 12:07:30 +02:00
336ea66983
Better error reporting on Liquid exceptions
2012-08-14 17:35:41 -04:00
7f706f47fc
Update redcarpet support to version 2
2012-08-13 15:03:33 +01:00
3d2664d983
pygments options for pygments.rb
2012-08-09 00:34:44 +09:00
3904fd9257
make yaml parsing errors more informative
2012-06-29 12:08:57 -04:00
ee402dd18a
Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll into tombell-switch-to-pygmentsrb
2012-06-11 15:53:44 -07:00
202894c196
Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
...
Conflicts:
lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
47090ffd2a
Fix up a few TomDocs.
2012-06-06 11:59:49 -07:00
0e9e7fbc85
Simplify Site#read_layouts.
2012-06-06 11:59:49 -07:00
b2a1d61c04
Swap out albino for pygments.rb
2012-05-31 15:51:34 -04:00
df2ad2ac59
Allow a custom 'layouts' directory
...
* Add 'layouts' option to change the dir from '_layouts' to anything relative
to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
da4e8f2ee1
Front-matter should be at start of file
...
It's the theme of the moment ; regexp checking.
Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter.
2012-05-25 18:59:26 +01:00
7d88f72409
avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%.
2012-04-29 00:27:11 -07:00
4533e60489
Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master
...
Conflicts:
lib/jekyll.rb
2012-04-23 16:48:18 -07:00
8a0fbf02f5
Cleanup for RDiscount TOC support. Closes #333 .
2012-04-23 16:15:55 -07:00
f5b2acf8cd
Added support for inline TOCs with RDiscount
2012-04-23 15:56:28 -07:00
e29490c1c6
Allow setting of Kramdown smart_quotes. Fixes #482 .
2012-04-23 15:34:54 -07:00
4090500c5a
Added path in url.
...
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
604b60c9ba
Add checks to prevent accidental deletion of the source directory
2012-04-03 22:05:18 -05:00
8368485fa0
Remove deletion of dot files on cleanup.
...
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.
All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
316cc8559c
moved paginate_path to default config
2012-02-26 20:58:14 -08:00
41f2805b7f
No need to have a variable assignment, especially if it has the same name as the method parameter.
2012-02-11 09:05:59 +01:00
5fb801474e
Truncate post slugs when importing from Tumblr.
...
Fixes #481 .
2012-02-01 06:44:01 -06:00
4499df8033
Shorten plugin loading code and update history.
2012-01-29 12:49:57 -08:00
02366ae5ff
Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray
2012-01-29 12:32:59 -08:00
9d70088f01
Properly select dotfiles during directory scan.
...
Fixes #363 .
Fixes #431 .
Fixes #377 .
2012-01-23 00:21:08 -08:00
e6d89c6a0f
More testing, whitespace and comment cleanup.
2012-01-22 22:17:25 -08:00
dcf546275b
Tweaked plugin directory handling, tests.
2012-01-22 22:10:12 -08:00
0284b8b22f
Handle Posterous rate limiting
2012-01-22 20:58:56 -08:00
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
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
e09f058a06
add page variable to liquid custom tags and blocks. thx to mike west for the patch
2011-09-20 13:03:31 -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
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
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
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
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
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
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
6a605753c1
Need double quotes for newline character. Fixes #178 .
2010-06-23 15:50:22 -07:00
de3ee99d30
Use Dir.pwd for other default paths as well (reverts fix in #101 )
2010-06-22 16:22:58 -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
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
81971c3342
teach Albino to run on both Windows and *nix
2010-04-21 13:19:38 -07: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
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
e3bd1c88e9
refactored render_pygments to remove duplicate code
2009-10-23 08:03:25 -07:00
4cc0873172
updated pygments output to wrap code blocks with <code> tags
2009-10-22 21:14:05 -07:00
0dfb486c37
disallow symlinks
2009-08-24 00:10:09 -07:00
176c047ff1
bugfix for permalinks
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-07-14 19:17:44 -04:00
8b678a8f01
Merge commit 'bahuvrihi/master'
2009-06-24 17:33:57 -04:00
05e8deae8d
Make configuration accessible from page.
...
For example, if you have the following in _config.yml:
url: http://www.librador.com
...you can have the following in an HTML page:
<a href="{{site.url}}">Home!</a>
This is a reapply of change 7b449239f0908e34f0290c213970e4b14ba2c2df on latest HEAD.
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-24 08:26:25 -04:00
ca98cd0152
updated convertible to allow for posts with no, or empty YAML
2009-06-23 20:55:13 -06:00
b616a4ceca
fixed test for CRLF (extra newline was being picked up)
2009-06-23 20:54:26 -06:00
09946386b1
Adding Date#xmlschema from ActiveSupport for Ruby < 1.9. Closes #47
2009-06-23 18:22:27 -04:00
e39810c984
Fix exception that causes jekyll to fail when using CRLF (0d0a) linebreaks in YAML front matter.
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:38 -04:00
5468548948
creating a Site with an invalid Markdown processor fails sooner and gives a better error message
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:33 -04:00
e0ceee2e89
Added trailing slash to pretty url template
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:27 -04:00
Tom Bell
Parker Moore
Matt Rogers
7rans
edeustace
Jashank Jeremy
mccxj
Eric Theise
Tom Preston-Werner
Tom Preston-Werner
stereobooster
Fabio Neves
Nat Welch
Fabio Neves
Alagu
Will Brady
hokaccha
Neil-Smithline
Jonas Pfenniger
Luca Grulla
Michishige Kaito
Fotos Georgiadis
Jason Roelofs
Dane Harrigan
Jérémy Lecour
dunsmoreb
Beau Simensen
Nicholas Firth-McCoy
Nicholas Firth-McCoy
Stephen McDonald
Kendall Buchanan
Simon Griffee
jpravetz
Thomas Laumann
Tomotaka Sakuma
Carl Groner
Josh Brown
Marcello Barnaba
Peter Wagenet
Seth Ladd
Pelle Wessman
Andrew Stone
John Croisant
Laurent Arnoud
Richard Jones
Matt Palmer
Kouhei Sutou
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
Antonin Hildebrand
rick
Gaute Hope
Jon
Kris Brown
lazyeye
Sebastian Staudt
Alex Young
Jamie Macey
Patrick Crowley
Jeffry Degrande
Nick Quaranto
Martin Vilcans
Simon Chiang
Stefan Saasen
Gaius Novus
eugenebolshakov