Version 2.6.

Include the usual generate new .pot file, gettext-merge, push to
Transifex, pull from Transifex step.

.tx/config

@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[fixmystreet.v2-5]
+[fixmystreet.v2-6]
 file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po
 source_file = locale/FixMyStreet.po
 source_lang = en_GB

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+
+* v2.6 (3rd May 2019)
     - New features:
         - (Optional) auto-suggestion of similar nearby problems,
           while reporting, to discourage duplicate reports. #2386

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

bin/install-as-user

@@ -109,5 +109,5 @@ fi
 
 # Generate po and mo files (these invocations taken from Kagee's script):
 echo "Creating locale .mo files"
-commonlib/bin/gettext-makemo FixMyStreet
+commonlib/bin/gettext-makemo FixMyStreet 2>&1
 echo $DONE_MSG

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

docs/_includes/admin-tasks-content.md

@@ -35,11 +35,14 @@ members will see reports within these categories by default.
 
 <span class="admin-task__permissions">Permissions required: none</span>
 
-If required, you can also use the controls to the right of the screen to zoom in or out, or pan across
-the map. As you’ll see, the list of reports always reflects the area you are viewing on the map, so
-this is another way of refining your view.
-
-Once you've found a satisfactory view, and if you are likely to want to revisit it, click on the 'Permalink' button at the bottom of the screen. This will alter the URL displayed in your browser, and allow you it as a bookmark which you may revisit, so you don't have to define the location again in the future.
+If required, you can also use the controls to the right of the screen to zoom
+in or out, or pan across the map. As you’ll see, the list of reports and URL
+(web address) always reflect the area you are viewing on the map, so this is
+another way of refining your view.
+
+Once you've found a satisfactory view, and if you are likely to want to revisit
+it, you can bookmark or otherwise take a copy of the URL displayed in your
+browser, so you don't have to define the location again in the future.
 
 </div>
 

docs/_posts/2019-04-29-v2.6.md

@@ -0,0 +1,37 @@
+---
+layout: post
+title: Version 2.6
+author: matthew
+---
+
+<div class="r" align="right">
+<img src="/assets/posts/v2.6-image.jpeg" alt="">
+Image &copy; <a href="https://twitter.com/StillWalkers">Ben Waddington</a>
+</div>
+
+Today we have released **version 2.6** of FixMyStreet.
+
+This release fixes a cross-site scripting security issue where someone could
+create a report through the site with a specially constructed query parameter,
+and then viewing that report on the admin report edit page would allow the
+report creator to run their own JavaScript. We have also released version 2.5.1
+which is identical to 2.5 including this fix.
+
+There's a new, optional, feature to auto-suggest similar nearby problems while
+reporting, to discourage duplicate reports; and the map state is now updated in
+the URL to make sharing links easier. A bit more work has been done on
+moderation, spotting conflicts and showing moderation history to staff on
+report pages, as well as in the admin.
+
+Mostly this release is bugfixes, please see the
+[changelog](https://github.com/mysociety/fixmystreet/releases/tag/v2.6) for
+full details.
+
+## Upgrading
+
+The admin body and user sections have been refactored – if you have custom
+templates/code, you may need to update links to those.
+
+If you wish the default for the showname checkbox to be checked, you can add
+`sub default_show_name { 1 }` to your cobrand file.
+