Parker Moore
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
Parker Moore
409eedafd8
Merge pull request #767 from mojombo/string-categories
...
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
Matt Ginzton
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
Parker Moore
4041579b70
Merge pull request #777 from mastahyeti/safe_yaml
...
Safe YAML
2013-01-25 08:22:10 -08:00
Jordon Bedwell
4f7881ba40
Add SVG support to Jekyll/Webrick. Fixes #406 .
2013-01-25 06:20:07 +01:00
Ben Toews
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
Matt Ginzton
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
Matt Ginzton
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
Parker Moore
f231ef7644
Merge pull request #684 from mattr-/issue-680.
2013-01-18 10:28:14 -05:00
Parker Moore
2615291e6d
Printing error message in WP.com migrator. #671 .
2013-01-17 22:33:37 -05:00
Parker Moore
3bca5c3297
Merge pull request #671 from fzero/master
...
Rescue from import errors on Wordpress.com plugin.
2013-01-17 19:30:51 -08:00
Parker Moore
cd05f6be78
Ensures that categories are Strings before escaping. Fixes #759 .
2013-01-17 21:55:01 -05:00
Parker Moore
faf5e44c47
Merge pull request #664 from Jashank/faster_lsi
...
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
Parker Moore
2e76edd837
Merge pull request #496 from dunsmoreb/issue/481
...
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08:00
Parker Moore
e383bfe65d
Merge pull request #743 from mccxj/master
...
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
Parker Moore
5a3e05dbff
Ensuring that layout is only set to the default value if layout is not specified
2013-01-12 15:31:14 -08:00
7rans
e8c74fe7a8
Layouts default to page or post depending upon type.
2013-01-12 13:49:45 -08:00
Parker Moore
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
Tom Bell
7f072ed578
Merge branch 'master'
2013-01-12 01:18:41 +00:00
edeustace
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
Jashank Jeremy
68333cd221
Slight stylistic tweak to LSI initialisation.
...
Recommended-by: parkr
2013-01-11 20:02:31 +11:00
mccxj
660e5e0e14
Merge remote-tracking branch 'jekyll/master'
2013-01-11 15:45:54 +08:00
mccxj
3cf29eeee2
add Enumerable#glob_include?
2013-01-11 15:33:11 +08:00
Parker Moore
6253f79de2
Added space between arguments in Convertible errors
2013-01-10 22:11:13 -08:00
Tom Bell
e210a0603f
Revert "Remove migrators"
...
This reverts commit b9da30bc8f
.
2013-01-11 00:30:17 +00:00
Eric Theise
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
xiaojian cai
b3e27f2c5d
fixed a syntax error
2013-01-10 19:41:11 +08:00
xiaojian cai
c627cd3519
use any? instead
2013-01-10 09:16:09 +08:00
Tom Bell
b70b57cb89
Merge branch 'master' into 'jekyll-command-redux'
2013-01-09 23:40:27 +00:00
xiaojian cai
1e892678bc
Update lib/jekyll/site.rb
2013-01-09 16:06:43 +08:00
edeustace
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
xiaojian cai
44822a252e
add regexp support for option 'include','exclude'
2013-01-06 21:23:31 +08:00
Tom Preston-Werner
dd0e208daa
Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1
2013-01-03 22:26:09 -08:00
Tom Preston-Werner
4c70c036e7
TomDoc lib/jekyll/post.rb.
2013-01-03 22:20:42 -08:00
Tom Preston-Werner
9328a1a0dd
Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs
2013-01-03 22:06:50 -08:00
Tom Preston-Werner
72c8ceba4e
Merge pull request #651 from alagu/master
...
Posterous importer update
2012-12-31 18:24:43 -08:00
stereobooster
a5a6900948
fix error for case with broken encoding
2012-12-30 00:07:21 +02:00
stereobooster
2dbce8ca9f
fix error for case with wrong encoding or error in YAML
2012-12-29 23:32:34 +02:00
Tom Preston-Werner
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
Fabio Neves
12a19eaf3a
Merge branch 'master' of git://github.com/mojombo/jekyll
2012-12-26 14:23:32 -05:00
Tom Preston-Werner
d58a0c1088
Release 0.12.0
2012-12-22 16:46:30 -07:00
Tom Bell
b9da30bc8f
Remove migrators
2012-12-22 17:49:33 +00:00
Tom Bell
a151a16f09
Remove command options from default config
...
Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.
2012-12-19 18:23:34 +00:00
Tom Bell
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
Nat Welch
934495b272
Adds some random docs for stuff I saw while skimming the code.
2012-12-18 22:42:42 -08:00
Tom Bell
dc139e2ac9
Update the sym->str key conversion
2012-12-18 22:13:17 +00:00
Tom Bell
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
Tom Bell
5b2e95b443
Add missing ] in self.watch string
2012-12-18 21:54:01 +00:00
Tom Bell
d8f328b87c
Update loop position so trap handler is used
2012-12-18 21:41:18 +00:00
Tom Bell
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