diff options
| -rw-r--r-- | README.md | 22 | ||||
| -rwxr-xr-x | bin/handlemail | 9 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Bristol.pm | 4 | ||||
| -rwxr-xr-x | templates/web/fixmystreet.com/about/faq-en-gb.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/contact/who.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/questionnaire/completed-open.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/static/unresponsive.html | 2 |
7 files changed, 35 insertions, 10 deletions
@@ -48,16 +48,34 @@ web-based cross-browser testing tools for this project. * In development - Front end improvements: - Add ability to make map full screen on mobile report pages. #1655 + - Move staff-only JavaScript to separate file. #1666 + - Show loading indicator when loading pins. #1669 - Allow users to reopen closed reports. #1607 - Admin improvements: - Redirect to category-filtered /reports on login if present. #1622 - Follow redirect to /admin after login if allowed. #1622 - Include /admin link on top-level nav for admin users. - Add shortlist filters. #1629 + - Add submit buttons to admin index search forms. #1551 + - Store user object when deleting report. #1661 + - Use name at time of moderation, include superusers. #1660 + - Add customisable defect types. #1674 - Bugfixes: - Fix crash on reports with empty `bodies_str`. #1635 - Only output appcache/manifest for shortlist users. #1653 - Fix placeholder typo in French translation. + - Make sure report Ajax call is not cached by IE11. #1638 + - Check cobrand users list when admin merging users. #1662 + - Make sure emails are lowercased in admin. #1662 + - Specify options in 'all' status filter. #1664 + - Be clearer if no states selected is not all states. #1664 + - Set up correct environment in cobrand PO script. #1616 + - Allow superuser to leave update when inspecting. #1640 + - Remove duplicate <> around envelope senders. #1663 + - Fix invisible segmented controls in old Webkit. #1670 + - Remove superfluous lists from Open311 JSON output. #1672 + - Upgrade to using Email::Sender. #1639 + - Fix bug if test run c. 55 hours before BST starts. - Development improvements: - Send open reports regardless of current state. #1334 - Clarify ‘inspected’ behaviour. #1614 @@ -65,6 +83,10 @@ web-based cross-browser testing tools for this project. - Refactor main navigation into reusable blocks. - Add Problem->time_ago for pretty-printed duration. - Add `external_id` field to ResponsePriority. + - Use sender in From if From and To domains match. #1651 + - Refactor SendReport::Open311 to use cobrand hooks. #792 + - Do upload_dir check on start up, not each report. #1668 + - Make sure all tests can run offline. #1675 * v2.0.2 (3rd February 2017) - Front end changes: diff --git a/bin/handlemail b/bin/handlemail index cc671f786..e027b8f58 100755 --- a/bin/handlemail +++ b/bin/handlemail @@ -172,20 +172,19 @@ sub handle_non_bounce_to_null_address { To => $data{return_path}, _body_ => $template, }); - send_mail($mail->as_string, '<>', $data{return_path}); + send_mail($mail->as_string, $data{return_path}); } sub forward_on_to { my $recipient = shift; my $text = join("\n", @lines) . "\n"; - my $sender = $data{return_path} || '<>'; - send_mail($text, $sender, $recipient); + send_mail($text, $recipient); } sub send_mail { - my ($text, $sender, $recipient) = @_; + my ($text, $recipient) = @_; if (mySociety::EmailUtil::EMAIL_SUCCESS - != mySociety::EmailUtil::send_email($text, $sender, $recipient)) { + != mySociety::EmailUtil::send_email($text, '<>', $recipient)) { exit(75); } } diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm index ecb19b867..fa7f98666 100644 --- a/perllib/FixMyStreet/Cobrand/Bristol.pm +++ b/perllib/FixMyStreet/Cobrand/Bristol.pm @@ -40,6 +40,10 @@ sub disambiguate_location { }; } +sub get_geocoder { + return 'OSM'; # use OSM geocoder +} + sub pin_colour { my ( $self, $p, $context ) = @_; return 'grey' if $p->state eq 'not responsible'; diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index 496282341..0bf55742b 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -318,8 +318,8 @@ correspondence to you – or if you only have an auto-response, you may be able to find further contact details there. <p>If you still have no joy, we suggest starting a new FixMyStreet report. You may also like to use another useful mySociety website, <a -href="https://www.writetothem.com/">WriteToThem.com</a>, to contact your local -councillors and ask them to help. +href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=static_links&utm_medium=link&utm_content=help+what_now">WriteToThem</a>, +to contact your local councillors and ask them to help. </dd> <dt>Someone has marked my problem was fixed, but it isn't</dt> diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html index cdfc4eff8..5fad05dd2 100644 --- a/templates/web/fixmystreet.com/contact/who.html +++ b/templates/web/fixmystreet.com/contact/who.html @@ -44,7 +44,7 @@ <p> <strong>If you're not having any luck getting your community problems fixed</strong>, you could try contacting your local councillor, using another useful mySociety site: - <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>. + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=contact_workflow_links&utm_medium=link&utm_content=contact+not_fixed">WriteToThem</a>. </p> [% END %] diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index 073fb0438..f10d5d266 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -13,7 +13,7 @@ </p> <p> - You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another + You can do this on <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=completed+unfixed">WriteToThem</a>, another useful mySociety website. </p> [% END %] diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html index be8a3c6e1..8014ab8e1 100644 --- a/templates/web/fixmystreet.com/static/unresponsive.html +++ b/templates/web/fixmystreet.com/static/unresponsive.html @@ -26,7 +26,7 @@ <h2>If you’d prefer to use FixMyStreet next time:</h2> - <a href="https://www.writetothem.com/" class="unresponsive-council-cta"> + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=unresponsive_council+cta" class="unresponsive-council-cta"> <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay </a> |