diff --git a/HISTORY.md b/HISTORY.md index 7edb4d1f..ea7b5651 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,10 @@ +[1.1.0](https://github.com/paularmstrong/swig/tree/v1.1.0) / 2013-10-02 +------------------------------------------------------------------------------- + +* **Added** Allow logic in default parsing. gh-326 +* **Fixed** Error when attempting to wrap spaceless tag around macro/function output. gh-336 +* **Fixed** Don't overwrite keys on the locals object. gh-337 + [1.0.0](https://github.com/paularmstrong/swig/tree/v1.0.0) / 2013-09-23 ------------------------------------------------------------------------------- diff --git a/browser/comments.js b/browser/comments.js index 130a205d..600dc3aa 100644 --- a/browser/comments.js +++ b/browser/comments.js @@ -1,2 +1,2 @@ -/*! Swig v1.0.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ +/*! Swig v1.1.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */ /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */ diff --git a/docs/docs.json b/docs/docs.json index 77dfc03d..a905d1aa 100644 --- a/docs/docs.json +++ b/docs/docs.json @@ -1,3 +1,3 @@ { - "version": "v1.0.0" + "version": "v1.1.0" } diff --git a/docs/index.json b/docs/index.json index 77dfc03d..a905d1aa 100644 --- a/docs/index.json +++ b/docs/index.json @@ -1,3 +1,3 @@ { - "version": "v1.0.0" + "version": "v1.1.0" } diff --git a/lib/swig.js b/lib/swig.js index 0b1694af..1565fac2 100644 --- a/lib/swig.js +++ b/lib/swig.js @@ -9,11 +9,11 @@ var fs = require('fs'), /** * Swig version number as a string. * @example - * if (swig.version === "1.0.0") { ... } + * if (swig.version === "1.1.0") { ... } * * @type {String} */ -exports.version = "1.0.0"; +exports.version = "1.1.0"; /** * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional. diff --git a/package.json b/package.json index ac7bee8b..344b1bcb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "swig", - "version": "1.0.0", + "version": "1.1.0", "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.", "keywords": [ "template", diff --git a/tests/basic.test.js b/tests/basic.test.js index 1bf75121..1e3ccc27 100644 --- a/tests/basic.test.js +++ b/tests/basic.test.js @@ -13,8 +13,8 @@ function resetOptions() { } describe('version', function () { - it('is 1.0.0', function () { - expect(swig.version).to.equal('1.0.0'); + it('is 1.1.0', function () { + expect(swig.version).to.equal('1.1.0'); }); });