diff --git a/History.txt b/History.txt index 425647d2..16f51d0a 100644 --- a/History.txt +++ b/History.txt @@ -52,6 +52,7 @@ * Add source and destination directory protection (#535) * Better YAML error message (#718) * Bug Fixes + * Paginate in subdirectories properly (#1016) * Ensure post and page URLs have a leading slash (#992) * Catch all exceptions, not just StandardError descendents (#1007) * Bullet-proof limit_posts option (#1004) diff --git a/jekyll.gemspec b/jekyll.gemspec index 131b61cb..30817623 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -4,9 +4,9 @@ Gem::Specification.new do |s| s.rubygems_version = '1.3.5' s.name = 'jekyll' - s.version = '1.0.0.rc1' + s.version = '1.0.0' s.license = 'MIT' - s.date = '2013-04-16' + s.date = '2013-05-05' s.rubyforge_project = 'jekyll' s.summary = "A simple, blog aware, static site generator." @@ -102,14 +102,13 @@ Gem::Specification.new do |s| lib/jekyll/tags/highlight.rb lib/jekyll/tags/include.rb lib/jekyll/tags/post_url.rb + lib/site_template/.gitignore lib/site_template/_config.yml lib/site_template/_layouts/default.html lib/site_template/_layouts/post.html lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb - lib/site_template/css/screen.css + lib/site_template/css/main.css lib/site_template/css/syntax.css - lib/site_template/images/.gitkeep - lib/site_template/images/rss.png lib/site_template/index.html script/bootstrap site/.gitignore diff --git a/lib/jekyll.rb b/lib/jekyll.rb index cdd50c15..7e8a1f62 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -56,7 +56,7 @@ require_all 'jekyll/tags' SafeYAML::OPTIONS[:suppress_warnings] = true module Jekyll - VERSION = '1.0.0.rc1' + VERSION = '1.0.0' # Public: Generate a Jekyll configuration Hash by merging the default # options with anything in _config.yml, and adding the given options on top.