From bd33ad9acdaca10d542857a19215cf5355ad6bce Mon Sep 17 00:00:00 2001 From: Joe Lanman Date: Fri, 12 Feb 2016 17:09:25 +0000 Subject: [PATCH 1/3] 2.1.0 release notes and version bump --- CHANGELOG.md | 10 ++++++++++ VERSION.txt | 2 +- package.json | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aebd2ed35..2d7febf64e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# 2.1.0 + +The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on. + +- Add example pages for branching (#143) +- Use grunt-sync for assets (#141) +- Fix warning for npm engine (#140) +- Add tmuxp config files to gitignore (#132) +- Improve 'port in use' errors, find a new port (#130) + # 2.0.0 This release switches templating language from [Mustache](http://mustache.github.io/) to [Nunjucks](https://mozilla.github.io/nunjucks/). diff --git a/VERSION.txt b/VERSION.txt index 227cea2156..7ec1d6db40 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -2.0.0 +2.1.0 diff --git a/package.json b/package.json index ac677dc2b9..34491d50e3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "express-prototype", "description": "GOVUK prototyping app in Express", - "version": "2.0.0", + "version": "2.1.0", "private": true, "engines": { "node": ">=4.0 <5.0" From fc85eee5979cd673afa84e0a13b4ecfbc2f5276f Mon Sep 17 00:00:00 2001 From: Joe Lanman Date: Wed, 17 Feb 2016 17:11:36 +0000 Subject: [PATCH 2/3] update references to version numbers --- CHANGELOG.md | 3 ++- README.md | 2 +- docs/install/install-the-kit.md | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d7febf64e..55ff86c3d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # 2.1.0 -The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on. +New documentation to make it easier to install and run from scratch. The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on. +- All-new documentation - tested with users and everything! - Add example pages for branching (#143) - Use grunt-sync for assets (#141) - Fix warning for npm engine (#140) diff --git a/README.md b/README.md index b22a62e085..c9712fb819 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## News -**Version 2.0.0 update:** the latest version of the kit (2.0.0) is not compatible with previous versions. If you update your old prototypes you'll need to [convert them as well](https://github.com/alphagov/govuk_prototype_kit/blob/master/docs/updating-the-kit.md). +**Upgrading from version 1 to 2:** the latest version of the kit (2.0.0 and later) is not compatible with previous versions. If you update your old prototypes you'll need to [convert them as well](https://github.com/alphagov/govuk_prototype_kit/blob/master/docs/updating-the-kit.md). ## About the prototype kit diff --git a/docs/install/install-the-kit.md b/docs/install/install-the-kit.md index 399d7e296b..f2ab653669 100644 --- a/docs/install/install-the-kit.md +++ b/docs/install/install-the-kit.md @@ -2,7 +2,7 @@ ## Download the kit as a zip -The simplest way to get the kit is to [download it as a zip](https://github.com/alphagov/govuk_prototype_kit/archive/v2.0.0.zip). You'll use a new copy of the kit for each new prototype you make. That way your prototypes don’t interfere with each other. +The simplest way to get the kit is to [download it as a zip](https://github.com/alphagov/govuk_prototype_kit/archive/v2.1.0.zip). You'll use a new copy of the kit for each new prototype you make. That way your prototypes don’t interfere with each other. ### Decide where you want to keep your prototypes @@ -20,7 +20,7 @@ Create a folder called `projects` in your `Documents` or `My Documents` folder. ### Unzip the kit -Unzip the kit you downloaded - you should end up with a folder called `govuk_prototype_kit-2.0.0` +Unzip the kit you downloaded - you should end up with a folder called `govuk_prototype_kit-2.1.0` ### Rename the kit From ab2cb3288eeb198296d228ef45d1e73e8c4beebf Mon Sep 17 00:00:00 2001 From: Joe Lanman Date: Wed, 17 Feb 2016 17:14:37 +0000 Subject: [PATCH 3/3] add link to docs PR --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ff86c3d5..5831da1e02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # 2.1.0 -New documentation to make it easier to install and run from scratch. The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on. +New documentation to make it easier to install and run from scratch - tested with users and everything! The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on. -- All-new documentation - tested with users and everything! +- Add default cookie message (#150) +- New documentation (#145) - Add example pages for branching (#143) - Use grunt-sync for assets (#141) - Fix warning for npm engine (#140)