Commit Graph

600 Commits

Author SHA1 Message Date
Parker Moore
aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
paco
23a01e7766 Patch for multibyte URI problem. Closes #723. 2013-03-16 21:20:11 +01:00
Parker Moore
5d34a4c533 Merge pull request #864 from mojombo/prioritize_plugins
Prioritize plugins & DRY subclass instantiation
2013-03-16 12:09:43 -07:00
Tommy Sullivan
caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers
10ee5c8999 Remove the duplication when creating Converters and Generators
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Parker Moore
7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +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
dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Daniel Grieve
4be5dfdb9a fix copying of site template files 2013-03-13 21:27:41 +00:00
Daniel Grieve
099fcc27d6 raise ArgumentError if no args. rename sample post 2013-03-13 19:21:11 +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
2473bdbd7c Merge pull request #847 from mojombo/mime_file
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
Jonathan Roes
7a86d901f1 Refactor Commands::New a bit and remove scaffold post once copied. 2013-03-12 00:48:22 -04:00
Jonathan Roes
b71ec624f8 Add commands/new and scaffold post to gemspec so they get copied over. 2013-03-12 00:47:42 -04: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
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
Parker Moore
7258b10f88 We don't need YAML in the new command. 2013-02-28 22:19:38 +01:00
Parker Moore
149b95d767 Typos in sample post. 2013-02-28 22:17:24 +01: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