Commit Graph

1105 Commits

Author SHA1 Message Date
Parker Moore
b49bba9351 Renamed test under wrong name. 2013-03-16 13:15:15 +01:00
Parker Moore
bc673722d6 Release 1.0.0.beta1 v1.0.0.beta1 2013-03-14 21:26:42 +01:00
Parker Moore
5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Parker Moore
7ba7328d47 Release 1.0.0.pre 2013-03-14 21:23:53 +01:00
Parker Moore
dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Parker Moore
98b37a54b1 Merge pull request #855 from danielgrieve/remove-ruby-version
ignore .ruby-version
2013-03-13 12:24:45 -07:00
Daniel Grieve
e8b8234898 ignore .ruby-version 2013-03-13 18:47:07 +00:00
Parker Moore
df9964c3b5 Merge pull request #838 from mattr-/dedupe-entry-generation
Remove code duplication during site generation
2013-03-12 11:27:56 -07:00
Parker Moore
2053a8fa8c Update history to reflect merge of #847 2013-03-12 19:07:51 +01:00
Parker Moore
2473bdbd7c Merge pull request #847 from mojombo/mime_file
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
Parker Moore
4e794a73e0 Merge pull request #829 from stomar/patch-1
Update Readme to link to the Plugins wiki page
2013-03-11 14:17:37 -07:00
Parker Moore
8886727bd8 Requiring safe_yaml ~> 0.7.0 because 0.8.x has weird bugs. 2013-03-11 22:17:19 +01:00
Marcus Stollsteimer
605332cc05 Fix link in Readme 2013-03-11 20:34:34 +01:00
Parker Moore
005f58c900 Update history to reflect merge of #536 2013-03-10 02:09:15 +01:00
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
524aa1f36a Jekyll::Commands::Serve reads in mime.types file. 2013-03-08 20:12:52 +01:00
Parker Moore
5e6c2f6e4b Added mime.types file from Apache SVN repo. 2013-03-08 20:12:21 +01:00
Matt Rogers
6399ec9b2b Remove duplication when aggregating post information 2013-03-05 19:11:07 -06:00
Matt Rogers
2dd98816d4 Remove duplication when generating list of entries to process
Posts and Drafts share the same logic to get the list of files to
process into objects when generating the site. Factor this logic into
its own method and use it when reading posts and reading drafts.
2013-03-05 19:06:20 -06: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
Marcus Stollsteimer
053373de27 Update Readme to link to the Plugins wiki page 2013-03-02 13:00:37 +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