4cd7c22ee7
Now uses the more semantically correct AND operator
2013-02-04 22:17:03 +01:00
7512e6bb66
Allow symlinked folders in unsafe mode
2013-02-04 17:16:01 +01:00
28a074ff7a
Remove Jekyll::Commands::Migrate
2013-01-31 00:18:22 +01:00
b70c59667c
Requiring jekyll-import gem. Printing error and exiting if it does not exist.
2013-01-30 23:43:26 +01:00
b4bea4a586
Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup
...
Module Cleanup
* 'code-cleanup' of git://github.com/tombell/jekyll:
Remove new lines between module and class
Update tag classes moving into a module
Update pagination classes moving into a module
Update converter classes moving into a module
Strip extra newlines
Update command classes moving into a module
Conflicts:
lib/jekyll/commands/serve.rb
2013-01-27 23:13:16 +01:00
b736676904
Merge pull request #775 from metamatt/issue773
...
Address issue 773 (bugs preventing tumblr.rb from running)
2013-01-27 14:06:41 -08:00
409eedafd8
Merge pull request #767 from mojombo/string-categories
...
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
c95c5e3b7d
Use Dir.pwd instead of "." as the source argument to Post.new, since
...
this has historically supplied an absolute path in this call.
2013-01-25 15:57:45 -08:00
4041579b70
Merge pull request #777 from mastahyeti/safe_yaml
...
Safe YAML
2013-01-25 08:22:10 -08:00
4f7881ba40
Add SVG support to Jekyll/Webrick. Fixes #406 .
2013-01-25 06:20:07 +01:00
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
fbc9d0c663
Fix truncation of overly long post names.
...
Delete the old truncate_post_name; it was called too late (if url rewriting
is enabled which it is by default), didn't run (it tried to use + to concat
a Fixnum onto a String), and even with those problems fixed, didn't actually
shorten the string enough to use as a pathname.
Instead, apply simple string truncation at the point we generate the slug,
which is used in the filename and is the part that could be unboundedly
long. I arbitrarily chose 200 as the maximum length; even shorter might be
better (really long slugs are just visually ugly); it might also be nicer
to truncate at a hyphen boundary.
This fixes the rest of issue #773 (subissue 4).
2013-01-22 10:25:07 -08:00
863643c7e8
Look for _posts directory relative to cwd, not relative to tumblr.rb.
...
That's where we put it earlier, so that's where we'll find it now.
This addresses part of issue #773 (subissue 3).
2013-01-22 10:24:33 -08:00
517e6f81d3
Remove new lines between module and class
2013-01-20 00:00:49 +00:00
2c45150545
Update tag classes moving into a module
2013-01-19 23:50:44 +00:00
10d980b6e1
Update pagination classes moving into a module
2013-01-19 23:42:40 +00:00
663a1321d2
Update converter classes moving into a module
2013-01-19 23:07:38 +00:00
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
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
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
Alexander Ekdahl
Parker Moore
Matt Ginzton
Jordon Bedwell
Ben Toews
Tom Bell
7rans
edeustace
Jashank Jeremy
mccxj
Eric Theise
Tom Preston-Werner
Tom Preston-Werner
stereobooster