Merge branch 'version-2.3'

mysociety · Dec 18, 2017 · 7e15bd3 · 7e15bd3
2 parents e04f4c4 + 1d18714
commit 7e15bd3
Show file tree

Hide file tree

Showing 40 changed files with 30,182 additions and 22,164 deletions.
diff --git a/.tx/config b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[fixmystreet.v2-2]
+[fixmystreet.v2-3]
 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
@@ -1,35 +1,37 @@
 ## Releases
 
 * Unreleased
+
+* v2.3 (18th December 2017)
     - New features:
         - Optional verification of reports and updates, and logging in,
-          using confirmation by phone text.
+          using confirmation by phone text. #1856 #1872
         - Improved email/phone management in your profile.
-        - Area summary statistics page in admin #1834
-        - Allow multiple wards to be shown on reports page
-        - Don't cover whole map with pin loading indicator.
-        - Add Expand map toggle to more mobile maps.
-        - Add functionality to have per-body /reports page.
-        - Cobrands can disable sending of moderation emails. #1910
+        - Don't cover whole map with pin loading indicator. #1874
+        - Add Expand map toggle to more mobile maps. #1875
+        - Allow multiple wards to be shown on reports page. #1870
+        - Add functionality to have per-body /reports page. #1880
         - Open311 category group support. #1923
     - Front end improvements:
+        - Paginate reports on `/around`. #1805 #1577 #525
+        - Improve performance of various pages, especially front. #1901 #1903
+        - More prominent "Hide pins" link on map pages, to aid reporting in busy areas. #525
+        - Optimised sprite file down from 97 KB to 36 KB. #1852
         - SVG assets for core elements like button icons and map controls #1888
         - Remove unneeded 2x PNG fallback images.
-        - Individual cobrands can disable social login #1890
-        - Improve performance of various pages, especially front. #1903
-        - Don't show geolocation link on non-HTTPS pages.
-        - More prominent "Hide pins" link on map pages, to aid reporting in busy areas. #525
         - Improve location disambiguation page on small screens. #1918
+        - Don't show geolocation link on non-HTTPS pages. #1915
+        - Public report page shows state changes made in admin interface #1846
     - Bugfixes
         - Shortlist menu item always remains a link #1855
         - Fix encoded entities in RSS output. #1859
         - Only save category changes if staff user update valid #1857
         - Only create one update when staff user updating category #1857
         - Do not include blank updates in email alerts #1857
-        - Redirect inspectors correctly on creation in two-tier.
+        - Redirect inspectors correctly on creation in two-tier. #1877
         - Report status filter All option works for body users #1845
         - Always allow reports to be removed from shortlist #1882
-        - Remove shortlist form from inspect duplicate list.
+        - Remove shortlist form from inspect duplicate list. #1889
         - Fix pin size when JavaScript unavailable.
         - Fix display of text only body contacts #1895
         - Prevent text overflow bug on homepage stats #1722
@@ -42,27 +44,29 @@
     - Admin improvements:
         - Character length limit can be placed on report detailed information #1848
         - Inspector panel shows nearest address if available #1850
-        - Return a 200 rather than 404 for ref ID lookup.
-        - Public report page shows state changes made in admin interface #1846
+        - Return a 200 rather than 404 for ref ID lookup. #1867
         - Remove hidden from default staff state dropdown. #1878
-        - Marking an item as a duplicate enforces providing duplicate id or
-          a public update #1873
+        - Marking an item as a duplicate enforces providing ID/update. #1873
         - Report field pre-filling for inspectors configurable #1854
         - Admins can now unban users #1881
-        - Council dashboard has date range for report generation #1885
-        - More JavaScript-enhanced `<select multiple>` elements #1589
-        - Council dashboard CSV export now has token based authentication #1911
-        - And uses machine-readable dates. #1929
-        - Consolidate various admin summary statistics page. #1919.
+        - More JavaScript-enhanced `<select multiple>` elements. #1589 #1892
         - 'Auto-response' flag on response templates is honoured for fetched
           Open311 updates. #1924
+        - Individual cobrands can disable social login #1890
+        - Cobrands can disable sending of moderation emails. #1910
         - Store all successful send methods. #1933
+    - Dashboard/statistics:
+        - Improve/consolidate various admin summary statistics pages,
+          all now under /dashboard. #1834 #1919
+        - Add date range for report generation #1885
+        - CSV export now has token based authentication. #1911
+        - And uses machine-readable dates. #1929
     - Development improvements:
         - Add hook for pre-wrapper content.
         - Include JSON representation of extra fields in category_extras output
     - UK:
         - Use SVG logo, inlined on front page. #1887
-        - Inline critical CSS on front page.
+        - Inline critical CSS on front page. #1893
 
 * v2.2 (13th September 2017)
     - New features:
@@ -77,10 +81,8 @@
         - Always show pagination figures even if only one page. #1787
         - Report pages list more updates to a report. #1806
         - Clearer wording and more prominent email input on alert page. #1829
-        - Paginate reports on `/around`. #1805 #1577 #525
         - Cobrands can implement `hide_areas_on_reports` to hide outline on map.
         - Templates to allow extra messages through problem confirmation. #1837
-        - Optimised sprite file down from 97 KB to 36 KB. #1852
     - Admin improvements:
         - Highlight current shortlisted user in list tooltip. #1788
         - Extra fields on contacts can be edited. #1743

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.2; see CHANGELOG.md for a version history.
+Platform is now at version 2.3; 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.2}
+VERSION=${VERSION_OVERRIDE:-v2.3}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh