diff --git a/History.markdown b/History.markdown index 63e26039..b0285112 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,17 @@ ## HEAD +### Major Enhancements + +### Minor Enhancements + +### Bug Fixes + +### Development Fixes + +### Site Enhancements + +## 1.4.0 / 2013-12-07 + ### Major Enhancements * Add support for TOML config files (#1765) @@ -19,7 +31,7 @@ * Fixed case of a word in the Jekyll v1.3.0 release post (#1762) * Fixed the mime type for the favicon (#1772) -## 1.3.1 / 2013-11/26 +## 1.3.1 / 2013-11-26 ### Minor Enhancements * Add a `--prefix` option to passthrough for the importers (#1669) diff --git a/jekyll.gemspec b/jekyll.gemspec index dcd7da43..9176f2fa 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.3.1' + s.version = '1.4.0' s.license = 'MIT' - s.date = '2013-11-26' + s.date = '2013-12-07' s.rubyforge_project = 'jekyll' s.summary = "A simple, blog aware, static site generator." @@ -159,6 +159,7 @@ Gem::Specification.new do |s| site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown site/_posts/2013-11-04-jekyll-1-3-0-released.markdown site/_posts/2013-11-26-jekyll-1-3-1-released.markdown + site/_posts/2013-12-07-jekyll-1-4-0-released.markdown site/css/gridism.css site/css/normalize.css site/css/pygments.css @@ -212,6 +213,7 @@ Gem::Specification.new do |s| test/helper.rb test/source/+/foo.md test/source/.htaccess + test/source/_config.dev.toml test/source/_data/languages.yml test/source/_data/members.yaml test/source/_data/products.yml diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 2ec3c8ec..4b45e2ba 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -63,7 +63,7 @@ require_all 'jekyll/tags' SafeYAML::OPTIONS[:suppress_warnings] = true module Jekyll - VERSION = '1.3.1' + VERSION = '1.4.0' # Public: Generate a Jekyll configuration Hash by merging the default # options with anything in _config.yml, and adding the given options on top. diff --git a/site/_posts/2013-12-07-jekyll-1-4-0-released.markdown b/site/_posts/2013-12-07-jekyll-1-4-0-released.markdown new file mode 100644 index 00000000..d7a0c14f --- /dev/null +++ b/site/_posts/2013-12-07-jekyll-1-4-0-released.markdown @@ -0,0 +1,30 @@ +--- +layout: news_item +title: 'Jekyll 1.4.0 Released' +date: 2013-12-07 13:55:28 -0600 +author: mattr- +version: 1.4.0 +categories: [release] +--- + +About a month after the release of Jekyll v1.3.0, we are releasing +Jekyll v1.4.0. This release will be the last non-patch release to support Ruby +1.8.7 and our next release will be Jekyll 2.0.0. + +Here are a few things we think you'll want to know about this release: + +* TOML is now a supported markup language for config files. + +* Maruku has been updated to 0.7.0 which provides some new features and + a ton of bugfixes over the previous 0.6.x releases. + +* Non-`gem` Plugins are now sorted alphabetically by filename before they're + processed, which can provide a rudimentary way to establish a load order for + plugins. + +For a full run-down, visit our [change log](/docs/history/)! + +As always, Jekyll wouldn't be possible without the contributions from +others in the Jekyll community. We'd like to thank the following people +for contributing to this release: Anatol Broder, David Sawyer, Greg +Karékinian, Jordon Bedwell, Matthew Iversen, Persa Zula, and Yi Zeng. diff --git a/site/docs/history.md b/site/docs/history.md index 2c681aec..db10e10d 100644 --- a/site/docs/history.md +++ b/site/docs/history.md @@ -5,7 +5,28 @@ permalink: /docs/history/ prev_section: contributing --- -## 1.3.1 / 2013-11/26 +## 1.4.0 / 2013-12-07 + +### Major Enhancements +- Add support for TOML config files ([#1765]({{ site.repository }}/issues/1765)) + +### Minor Enhancements +- Sort plugins as a way to establish a load order ([#1682]({{ site.repository }}/issues/1682)) +- Update Maruku to 0.7.0 ([#1775]({{ site.repository }}/issues/1775)) + +### Bug Fixes +- Add a space between two words in a Pagination warning message ([#1769]({{ site.repository }}/issues/1769)) +- Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 ([#1778]({{ site.repository }}/issues/1778)) + +### Development Fixes +- Remove some whitespace in the code ([#1755]({{ site.repository }}/issues/1755)) +- Remove some duplication in the reading of posts and drafts ([#1779]({{ site.repository }}/issues/1779)) + +### Site Enhancements +- Fixed case of a word in the Jekyll v1.3.0 release post ([#1762]({{ site.repository }}/issues/1762)) +- Fixed the mime type for the favicon ([#1772]({{ site.repository }}/issues/1772)) + +## 1.3.1 / 2013-11-26 ### Minor Enhancements - Add a `--prefix` option to passthrough for the importers ([#1669]({{ site.repository }}/issues/1669))