Version 2.1.

5 files changed, 79 insertions, 5 deletions

diff --git a/.tx/config b/.tx/config
index ee63ffc4c..e5d53703f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[fixmystreet.v2-0]
+[fixmystreet.v2-1]
 file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po
 source_file = locale/FixMyStreet.po
 source_lang = en_GB
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2ed2bc39..fe34c6064 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,74 @@
 ## Releases
 
+* Unreleased
+
+* v2.1 (8th July 2017)
+    - New features:
+        - Allow users to hide their name on reports/updates. #658
+        - New /reports page. #1630 #1726 #1753
+    - Front end improvements:
+        - Resize photos client-side before uploading. #1734
+        - CSS header/content/navigation refactoring/simplification. #1719 #1718
+        - Consolidate state dropdowns, make sure existing state is included. #1707
+        - Simplify `footer-marketing.html` for most cobrands. #1709
+        - Change the contact form Post button label to Send. #1750
+        - Add an optional phone field to the contact form. #1750
+        - Double resolution pin icons in core. #1713
+    - Admin improvements:
+        - Don't resend if category change subsets body. #1725
+        - Fix styling of 'remove from site' button. #1700
+        - Add inactive state to categories. #1757
+        - Inspect form:
+            - Make more visually distinct, better on medium screens. #1700 #1701
+            - Populate defect types dropdown on category change. #1698
+            - Update templates when category/state changed. #1729
+            - Fix bug when switching state to duplicate and back. #1729
+            - Don't preselect inspector template on page load. #1747
+        - Allow inspectors to shortlist all reports in view. #1652
+        - Subscribe inspectors to updates when state changes. #1694
+        - Streamline new reports for inspectors. #1636
+    - Bugfixes:
+        - Make three strings translatable. #1744 #1735
+        - Reinstate geolocation on alert page. #1726
+        - Fix clickable spaces on inspect form/ward page. #1724
+        - Make sure segmented control input not offscreen. #1749
+        - Remove superfluous quote in HTML script element. #1705
+        - Add missing closing </dl> to base FAQ.
+    - Development improvements:
+        - Allow static home page template override. #1745
+        - Add Debian stretch/perl 5.24 support. #1746
+        - Add scripts to rule them all. #1740
+        - Update submodule on any Vagrant provisioning. #1702
+        - Fix imbalanced paragraph tags in glossary. #1737
+        - Spot badly configured SMTP type. #1758.
+        - Add MAPIT_API_KEY support
+        - Hooks:
+            - Add hook for post-title field content in report form. #1735
+            - Add hook so cobrands can change pin hover title. #1713
+            - Allow cobrands to define pin colour for new reports. #1713
+        - Testing:
+            - Run each test file in a transaction. #1721
+            - Test script should run 't' when other args given. #1721
+            - Auto-add strict/warnings/Test::More with TestMech. #1554
+            - Fix test that would not run offline. #1712
+            - Fix timing edge case test failure.
+    - Backwards incompatible changes:
+        - The `nav-wrapper-2` class has been removed. If you have a
+          custom footer template, replace that class with 'container'. #1718
+        - The `/reports` page now uses different generated data. If you
+          have a custom `reports/index.html` template, you may need to
+          call `update-all-reports` with the `--table` argument.
+    - Internal things:
+        - Move third party libraries into vendor directories. #1704
+        - Stop using sudo on Travis, improve locale support. #1712
+        - Add CodeCov coverage testing. #1759
+    - UK:
+        - Add fixture script. #1720
+        - Add Borsetshire demo cobrand. #1717
+        - Remove requirement for fixed body IDs. #1721
+        - Show all pins on two-tier councils only. #1733
+        - Stop nearest request with scientific notation. #1695
+
 * v2.0.4 (13th April 2017)
     - Front end improvements:
         - On /reports maps, only include reports in view. #1689
diff --git a/README.md b/README.md
index 41cfb914f..8529e83d1 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ RSS alerts of problems in their area.
 
 It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting
 problems to UK councils and has been copied around the world. The FixMyStreet
-Platform is now at version 2.0.4; see CHANGELOG.md for a version history.
+Platform is now at version 2.1; see CHANGELOG.md for a version history.
 
 ## Installation
 
@@ -22,6 +22,11 @@ We've been working hard to make the FixMyStreet Platform easy to install and
 re-use in other countries - please see our site at <http://fixmystreet.org/>
 for help and documentation in installing the FixMyStreet Platform.
 
+For development, if you have Vagrant installed, you can clone the repo and run
+'vagrant up'. We use [Scripts to Rule Them All](https://githubengineering.com/scripts-to-rule-them-all/)
+so `script/update` will update your checkout, `script/server` will run a dev
+server, and `script/test` will run the tests.
+
 ## Contribution Guidelines
 
 Whilst many contributions come as part of people setting up their own
diff --git a/Vagrantfile b/Vagrantfile
index 575eec765..536974693 100755
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -54,7 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         echo "****************"
         echo "You can now ssh into your vagrant box: vagrant ssh"
         echo "The website code is found in: ~/fixmystreet"
-        echo "You can run the dev server with: script/fixmystreet_app_server.pl [-d] [-r] [--fork]"
+        echo "You can run the dev server with: script/server"
         echo "Access the admin with username: superuser@example.org and password: password"
     else
         echo "Unfortunately, something appears to have gone wrong with the installation."
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index d780b7f94..df1870dae 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Set this to the version we want to check out
-VERSION=${VERSION_OVERRIDE:-v2.0.4}
+VERSION=${VERSION_OVERRIDE:-v2.1}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
 
@@ -67,5 +67,5 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
     echo Installation complete - you should now be able to view the site at:
     echo   http://$HOST/
     echo Or you can run the tests by switching to the "'$UNIX_USER'" user and
-    echo running: $REPOSITORY/bin/run-tests t
+    echo running: $REPOSITORY/script/test
 fi