Parker Moore
725b127f9b
Merge pull request #536 from fotos/fix_page_dir
...
Added path in url.
2013-03-09 17:07:16 -08:00
Fotos Georgiadis
f79662719b
Fix indentation.
2013-03-09 15:07:27 +02:00
larrylv
035bbdf99f
Fix typo.
2013-03-04 14:59:34 +08:00
Tom Preston-Werner
3a9ca0a796
Merge branch 'drafts-fixup'
...
Add a drafts feature. This allows you to place draft posts into an _drafts
folder in the site root while you're working on them, and then request that
they be rendered as normal posts via a command line switch.
Draft files should be named just like normal posts, except they must not
contain the date prefix. When you're ready to make a post live, rename it
with the date and move it to the proper place.
To preview your drafts, run Jekyll with the `--drafts` switch. This will
render all the posts with a date corresponding to the last time the file
was modified.
2013-03-03 18:57:36 -08:00
Tom Preston-Werner
b46000f6af
Kill unnecessary return keyword.
2013-03-03 18:43:54 -08:00
Parker Moore
0d3ea5b710
Forgot to escape newlines.
2013-03-04 03:41:18 +01:00
Tom Preston-Werner
2b9b613687
Normalize CLI options to match configuration expectations.
2013-03-03 18:23:02 -08:00
Parker Moore
5af8e1f40c
Applying a more 'Ruby' style to post_url.rb
2013-03-04 03:20:59 +01:00
Tom Preston-Werner
4caf613be8
Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts
2013-03-03 12:57:55 -08:00
Daniel Hilgarth
87f6f8c971
Fix invalid ordering of posts published on the same day and move post_url specific comparison of posts where it belongs: Into post_url
2013-03-03 15:36:16 +01:00
Daniel Hilgarth
ce8e1afba6
Add support for Ruby < 1.9
2013-03-03 15:12:21 +01:00
Daniel Hilgarth
cc83501489
Fix broken post_url with posts with a time in their YAML front matter.
2013-03-03 14:56:18 +01:00
scribu
1a351284ca
rename get_base() to containing_dir()
2013-03-03 12:56:12 +02:00
Fotos Georgiadis
441eddf1ca
Fix pretty url style paths.
...
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
Parker Moore
bd9a112ff1
Merge pull request #785 from lenniboy/master
...
Improve debugability of error message for a malformed highlight tag
2013-02-26 16:58:36 -08:00
Parker Moore
63d0eef646
Merge pull request #824 from sinamt/symlinked_folders
...
Allow symlinked folders in unsafe mode (with tests). Closes #796 , resolves #233 .
2013-02-26 16:54:52 -08:00
Matt Rogers
d58859570d
Fix up the whitespace.
...
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers
5a9c20983d
Rename setup_plugins to plugins_path
2013-02-25 13:20:32 -06:00
Matt Rogers
d2c79a8841
Merge branch 'master' into issue-653
2013-02-25 13:08:23 -06:00
Parker Moore
f8a90d711f
Using https protocol instead of http.
2013-02-24 01:54:13 +01:00
Parker Moore
cdd3c0ef0c
Remove 'type' attribute from script tag in gist liquid tag.
2013-02-24 01:30:41 +01:00
Parker Moore
7e7cee6e56
Strip space from the gist number, add test for gist tag
2013-02-24 00:58:13 +01:00
sterebooster
425f466842
'gist' liquid tag by @stereobooster. Fixes #463 .
2013-02-24 00:38:19 +01:00
Parker Moore
7457cbae25
Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457 .
2013-02-22 00:59:44 +01:00
Parker Moore
5d8e012899
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:10:42 +01:00
Parker Moore
9eb79ff135
Improved output for auto-regeneration.
2013-02-20 23:09:54 +01:00
Parker Moore
bf79b0ac37
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:09:34 +01:00
Parker Moore
11eb1ecae1
Safe loading of files and YAML.
2013-02-10 19:07:38 +01:00
scribu
538c2086a5
whitespace fixes
2013-02-10 04:49:27 +02:00
scribu
3e164d6daf
don't check if draft is published or if its date is in the future
2013-02-09 23:48:38 +02:00
scribu
2588d681c9
fix draft filename processing
2013-02-09 23:38:13 +02:00
scribu
78831d94cd
don't mess with dir parameter
2013-02-09 23:19:35 +02:00
scribu
642349f797
implement and use Draft.valid?
2013-02-09 22:41:47 +02:00
scribu
1ac46b17c4
Don't require date in draft filenames.
2013-02-09 21:35:41 +02:00
Alexander Ekdahl
4cd7c22ee7
Now uses the more semantically correct AND operator
2013-02-04 22:17:03 +01:00
Alexander Ekdahl
7512e6bb66
Allow symlinked folders in unsafe mode
2013-02-04 17:16:01 +01:00
Parker Moore
28a074ff7a
Remove Jekyll::Commands::Migrate
2013-01-31 00:18:22 +01:00
Parker Moore
b70c59667c
Requiring jekyll-import gem. Printing error and exiting if it does not exist.
2013-01-30 23:43:26 +01:00
Leonard Ehrenfried
a7f0d04bda
Improve error message for malformed highlight tags
2013-01-29 12:16:33 +01:00
Parker Moore
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
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
scribu
0ad623fb85
first pass at --drafts flag
2013-01-20 05:23:56 +02:00
Tom Bell
517e6f81d3
Remove new lines between module and class
2013-01-20 00:00:49 +00:00