Merge branch 'version-2.0'

mysociety · Nov 15, 2016 · c94ed44 · c94ed44
2 parents dace204 + 46f4eda
commit c94ed44
Show file tree

Hide file tree

Showing 39 changed files with 39,602 additions and 23,509 deletions.
diff --git a/.tx/config b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[fixmystreet.v1-8]
+[fixmystreet.v2-0]
 file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po
 source_file = locale/FixMyStreet.po
 source_lang = en_GB

diff --git a/README.md b/README.md
@@ -45,13 +45,14 @@ web-based cross-browser testing tools for this project.
 
 ## Releases
 
-* In development
+* v2.0 (15th November 2016)
     - Front end improvements:
         - Add HTML emails. #1281 #1103
         - Stop map being underneath content sidebar/header. #1350 #361
         - Use Ajax/HTML5 history to pull in reports and improve map views.
           #1351 #1450 #1457 #1173
         - Allow multiple states and categories to be filtered. #1547
+        - Add sort order options to list pages. #308
         - Invert area highlight on body pages. #1564
         - Allow users to change their own email. #360 #1440
         - Improve change password form/success page. #1503
@@ -82,6 +83,7 @@ web-based cross-browser testing tools for this project.
             - Feature to create report as body/other user. #1473
             - Add user permissions system. #1486
             - Allow user to have an area assigned in admin. #1488
+            - Allow user to have categories assigned in admin. #1563
             - Add inspector report detail view. #1470
             - Add user shortlists. #1482
             - Add response templates and priorities. #1500 #1517

diff --git a/bin/gettext-extract b/bin/gettext-extract
@@ -7,7 +7,7 @@
 # Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
-cd "$(dirname $(readlink -f $BASH_SOURCE))/.."
+cd "$(cd "$(dirname "$BASH_SOURCE")" && pwd -P)"/..
 
 # Install required code if needed
 vendor/bin/carton install --path local-gettext --cpanfile locale/cpanfile --deployment

diff --git a/bin/gettext-merge b/bin/gettext-merge
@@ -6,7 +6,7 @@
 # Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
-cd "$(dirname $(readlink -f $BASH_SOURCE))/.."
+cd "$(cd "$(dirname "$BASH_SOURCE")" && pwd -P)"/..
 
 for X in locale/*.UTF-8
 do

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

diff --git a/bin/update_po_header.bash b/bin/update_po_header.bash
@@ -7,7 +7,7 @@
 # Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
-cd "$(dirname $(readlink -f $BASH_SOURCE))/.."
+cd "$(cd "$(dirname "$BASH_SOURCE")" && pwd -P)"/..
 
 # File to write to, clear it to start with
 PO=$1