Commit Graph

1086 Commits

Author SHA1 Message Date
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
Parker Moore 5dea057db7 Merge pull request #835 from larrylv/fix-typo
Fix typo.
2013-03-04 02:47:07 -08: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 da273b685a Update history for drafts feature. 2013-03-03 18:55:50 -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
Parker Moore ee057a99a7 Update history to reflect merge of #832. 2013-03-04 03:24:26 +01:00
Parker Moore 968ca6967c Merge pull request #832 from mojombo/features-html
Add rake features:html
2013-03-03 18:23:12 -08: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
Parker Moore 800bd290ec Update history to reflect merge of #831 2013-03-04 03:19:57 +01:00
Parker Moore e98053ea8a Merge pull request #831 from dhilgarth/feature/fix_post_url
Fix broken post_url with posts with a time in their YAML front matter.
2013-03-03 18:17:24 -08:00
Parker Moore 6cef28ed58 Add features:html task to Rakefile, use cucumber profiles 2013-03-04 03:13:06 +01:00
Parker Moore a4e37c9d0a Change default format to pretty and create travis profile 2013-03-04 03:12:31 +01:00
Tom Preston-Werner ef9388684b Turn off debug mode on feature to suppress output. 2013-03-03 18:04:31 -08: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
Tom Preston-Werner 197f52b0e6 Fix jekyll-import LoadError message. 2013-03-03 12:51:25 -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
Parker Moore 17c875f6f5 Fixed plugin test error. 2013-03-02 18:51:42 +01:00
Parker Moore 5c788582a8 Update history to reflect merge of #826. 2013-02-28 21:57:01 +01:00
Parker Moore e827797440 Merge pull request #826 from chapmajs/patch-1
Explicitly require HTTPS rubygems source
2013-02-28 12:55:56 -08: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
chapmajs 3a34957b41 Explicitly require HTTPS rubygems source
Use HTTPS rubygems.org source to help prevent MITM attacks
2013-02-27 20:28:09 -05:00
Parker Moore c648bc1157 Update history to reflect merge of #785. 2013-02-27 01:59:36 +01: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 3fbb615d19 Update history to reflect merge of #824. 2013-02-27 01:56:06 +01: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
Paul Leitmanis 849c34e913 Add tests for filtering symlink entries when safe mode enabled 2013-02-27 10:39:46 +11:00
Parker Moore 3253e4132e Update history to reflect merge of #654 2013-02-26 21:35:48 +01:00
Parker Moore 465e25021b Merge pull request #654 from mattr-/issue-653
Look for plugins under the source directory. Fixes #653.
2013-02-26 12:34:11 -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 ffc42310b4 Add back a test that was mistakenly removed. 2013-02-25 13:19:45 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore 83675ee095 Updated history to reflect merge of #822. 2013-02-24 02:01:10 +01:00
Parker Moore e0870fa178 Merge pull request #822 from mojombo/gist-tag
Add 'gist' liquid tag to master
2013-02-23 16:59:53 -08: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 cc0f84197a Updated history to reflect merge of #820. 2013-02-22 14:20:05 +01:00
Parker Moore f2299a2bf5 Merge pull request #820 from mojombo/fix-autoregen-loop
Fix issue with watching (auto-regeneration) continuously running
2013-02-22 05:19:11 -08: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 a22527c7ff Update history to reflect merge of #795. Fixes #790. 2013-02-20 23:16:56 +01:00
Parker Moore 02da17b769 Merge pull request #795 from mojombo/new-log-format
New log format
2013-02-20 14:15:36 -08:00