Merge branch 'version-2.3.1'

mysociety · Feb 12, 2018 · 6e2da95 · 6e2da95
2 parents 236f615 + f640d08
commit 6e2da95
Show file tree

Hide file tree

Showing 35 changed files with 15,963 additions and 12,273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,23 @@
 ## Releases
 
 * Unreleased
+
+* v2.3.1 (12th February 2018)
     - Front end improvements:
         - Zoom out as much as necessary on body map page, even on mobile. #1958
         - Show loading message on initial /around map load #1976
         - Ask for current password/send email on password change. #1974
-        - Add minimum password length and common password checking.
-        - Nicer display of national phone numbers.
+        - Add minimum password length and common password checking. #1981
+        - Nicer display of national phone numbers. #1982
         - 'Report as another user' allows phone number without email. #1978
         - Display loading spinner on map when asset layers are loading. #1991
     - Bugfixes:
         - Fix bug specifying category in URL on /around. #1950
         - Fix bug with multiple select-multiples on a page. #1951
-        - Make sure dashboard filters all fit onto one line.
-        - Fix issue with red bars on bar graph of many categories.
-        - Prefetch translations in /reports list of bodies.
-        - Ignore deleted/area-less bodies in dashboard list.
+        - Make sure dashboard filters all fit onto one line. #1938
+        - Fix issue with red bars on bar graph of many categories. #1938
+        - Prefetch translations in /reports list of bodies. #1941
+        - Ignore deleted/area-less bodies in dashboard list. #1941
         - Add missing CSS class from final questionnaire question. #1953
         - Fix JavaScript error on /my calculating bounds #1954
         - Change text on /reports to match lower down (fix translation).

diff --git 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.3; see CHANGELOG.md for a version history.
+Platform is now at version 2.3.1; see CHANGELOG.md for a version history.
 
 ## Installation
 

diff --git 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.3}
+VERSION=${VERSION_OVERRIDE:-v2.3.1}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh