Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch '1347-fold-back-zurich' | Matthew Somerville | 2016-06-29 | -84/+45 |
|\ | ||||
| * | Add external field editing to admin report edit. | Matthew Somerville | 2016-06-29 | -47/+20 |
| | | | | | | | | Show bodies for which details are missing, and any send method used. | |||
| * | Improve admin report edit page. | Matthew Somerville | 2016-06-29 | -17/+14 |
| | | | | | | | | | | Show map, break into two columns, fix display of sent time after clicking "Mark as sent", tidy up labels. | |||
| * | Tidy up some UK specific easting/northing handling | Matthew Somerville | 2016-06-22 | -19/+10 |
| | | ||||
| * | Warnfix when admin editing user. | Matthew Somerville | 2016-06-22 | -1/+1 |
| | | ||||
* | | [UK] Update base urls for Harrogate, Stevenage. | Matthew Somerville | 2016-06-27 | -3/+12 |
|/ | | | | Default future unknown ones to HTTPS. | |||
* | Show any waiting reports on admin index page. | Matthew Somerville | 2016-06-22 | -0/+7 |
| | ||||
* | Allow admin to edit user's phone number. | Matthew Somerville | 2016-06-22 | -0/+3 |
| | ||||
* | Merge branch 'alert-missing-id' | Matthew Somerville | 2016-06-22 | -13/+10 |
|\ | ||||
| * | Catch alert subscription with missing ID. | Matthew Somerville | 2016-06-20 | -13/+10 |
| | | ||||
* | | Merge branch '360-change-email' | Matthew Somerville | 2016-06-20 | -78/+161 |
|\ \ | |/ |/| | ||||
| * | Allow users to update their email address. | Matthew Somerville | 2016-06-20 | -15/+81 |
| | | ||||
| * | Improve CSRF tokens and add to more forms. | Matthew Somerville | 2016-06-20 | -58/+74 |
| | | ||||
| * | Improve auth flow taken when return key used. | Matthew Somerville | 2016-06-20 | -5/+6 |
| | | ||||
* | | [Bristol] Use BCC's base map tiles | Dave Arter | 2016-06-17 | -0/+420 |
| | | | | | | | | | | | | | | | | | | This refactors the Map::Zurich module into something that makes it easier to use custom map tiles for a cobrand. This also includes some refactoring of the JS & map templates to make it easier to use a custom WMTS base map in future cobrands. | |||
* | | [Bristol] Bristol City Council cobrand frontend | Dave Arter | 2016-06-17 | -0/+54 |
| | | | | | | | | For mysociety/FixMyStreet-Commercial#766. | |||
* | | Fix check for old-style parsed XML. | Dave Arter | 2016-06-16 | -1/+1 |
| | | | | | | | | | | It errored on new-style parsed XML, rather than let it through. Add a new category to the test that highlights this. | |||
* | | Merge branch 'open311-improvements' | Matthew Somerville | 2016-06-15 | -3/+8 |
|\ \ | ||||
| * | | Improve template check for extra Open311 fields. | Matthew Somerville | 2016-06-15 | -1/+0 |
| | | | ||||
| * | | Tidy up Open311 XML handling. | Matthew Somerville | 2016-06-15 | -2/+8 |
| |/ | | | | | | | | | Parse the XML in such a way other parts of the code do not have to worry about single-value folding or the like. | |||
* | | Remove stringify call from template paths | Dave Arter | 2016-06-15 | -11/+11 |
| | | ||||
* | | [UK Councils] Send correct confirm emails for updates | Dave Arter | 2016-06-15 | -9/+39 |
|/ | | | | | | | | | | | | | | | | | | | | | | Some UK councils with Open311 integrations (e.g. Bromley) have a custom wording in the confirmation email sent when updates are left on reports, to make the user aware that the update is sent to the council in question. Bromley noticed that some emails were being sent without this wording, leading at least one user to contact the council directly about the report. It turns out that although the email template contains an IF clause to use the appropriate wording for Bromley (and Stevenage) reports, the incorrect template file was being used when updates were made via the Bromley cobrand. This commit solves the problem by introducing a new `Cobrand::Default::path_to_email_templates` method, which is overridden by `Cobrand::UKCouncils` to include the `templates/email/fixmystreet` path. Paths returned by this method are used as the `additional_template_paths` param when templating emails. A regression test is included. Additionally moves email templates for fixmystreet.com to a directory name reflecting their purpose, in the same way the web templates are arranged. | |||
* | Merge remote-tracking branch 'mysociety/1422-fix-non-js-filter' | Matthew Somerville | 2016-06-08 | -2/+5 |
|\ | ||||
| * | Redirect correctly if filter used sans JavaScript. | Matthew Somerville | 2016-06-08 | -2/+5 |
| | | | | | | | | | | It was being treated as a new report and showing errors, rather than showing you the same page with updated filters. Fixes #1422. | |||
* | | Move some cobrands into separate repository. | Matthew Somerville | 2016-06-08 | -35/+0 |
|/ | ||||
* | Strip line end spaces in emails. | Matthew Somerville | 2016-06-07 | -0/+1 |
| | ||||
* | Stop using Text::Wrap to wrap email bodies. | Matthew Somerville | 2016-06-07 | -8/+0 |
| | | | | | | | | | | | If we don't do this, the default quoted-printable encoding will make sure the lines are physically wrapped anyway. format=flowed could be an alternative, but I think "=" acting as a quasi-hyphen is somewhat nicer than every line ending with "=20". A better solution could be quoted-printable doing soft wrapping only at word breaks, making each line be readable though end with a " =", but that didn't seem worth the effort involved. | |||
* | Update copyright year shown on OS & Bing maps | Dave Arter | 2016-06-07 | -1/+1 |
| | ||||
* | Handle reports/updates by logged in abuse entries. | Matthew Somerville | 2016-05-27 | -0/+10 |
| | ||||
* | Merge branch '1410-email-template' | Matthew Somerville | 2016-05-25 | -86/+79 |
|\ | ||||
| * | Use only one templating system for emails. | Matthew Somerville | 2016-05-25 | -86/+79 |
| | | | | | | | | | | | | | | Historically, emails sent offline (alerts, questionnaires, etc) used a different templating system from those sent by the website (e.g. login emails), though the newer system was also being used for the site name and signature of offline emails. | |||
* | | Merge branch '694-summary-string-template-tidy' | Matthew Somerville | 2016-05-25 | -30/+0 |
|\ \ | |/ |/| | ||||
| * | Move processed_summary_string function to template | Matthew Somerville | 2016-05-24 | -30/+0 |
| | | | | | | | | Fixes #694. | |||
* | | Warnfix if belongs_to_body called with no string. | Matthew Somerville | 2016-05-24 | -2/+3 |
|/ | ||||
* | Add search boxes to admin index page, move stats. | Matthew Somerville | 2016-05-20 | -28/+41 |
| | | | | Move most index page statistics to their own pages. | |||
* | Merge branch '1286-catching-gaze' | Matthew Somerville | 2016-05-18 | -25/+40 |
|\ | ||||
| * | Fallback if request to Gaze fails. | Matthew Somerville | 2016-05-18 | -25/+40 |
| | | | | | | | | Fixes #1286. | |||
* | | Improve in-place moderation UI | Zarino Zappia | 2016-05-18 | -0/+11 |
|/ | | | | | | | | | | | This rearranges the moderation UI into logical chunks, and improves the 'revert to original' checkboxes by: - hiding them unless there's some original text to revert to - displaying the text that will be reverted to in the appropriate input fields when checked. Part of mysociety/FixMyStreet-Commercial#731 | |||
* | Remove specific files rather than glob. | Matthew Somerville | 2016-05-18 | -4/+15 |
| | | | | This should improve performance when there are a lot of cached photos. | |||
* | Don't allow photo IDs to be prepended with 0s. | Matthew Somerville | 2016-05-18 | -1/+1 |
| | ||||
* | Fix removal of cached update photos. | Matthew Somerville | 2016-05-18 | -4/+6 |
| | | | | | It was possible that rotating an update photo did not remove its cached copy. | |||
* | Merge remote-tracking branch 'mysociety/1207-update-email-to-existing' | Matthew Somerville | 2016-05-06 | -3/+15 |
|\ | ||||
| * | Allow change of email in admin to existing entry. | Matthew Somerville | 2016-04-27 | -3/+15 |
| | | ||||
* | | Switch external jhead call to use IPC::Open3. | Matthew Somerville | 2016-05-03 | -1/+8 |
| | | ||||
* | | Store Open311 error in report on failure. | Matthew Somerville | 2016-04-27 | -3/+2 |
| | | | | | | | | | | | | It will still output via cron on the first failure. However, reduce the verbosity of a couple of SendReport modules which are reporting failure every time. | |||
* | | [UK] Remove West Berkshire temporary fix. | Matthew Somerville | 2016-04-27 | -4/+0 |
|/ | ||||
* | Merge branch '1383-remove-dead-projects' | Matthew Somerville | 2016-04-22 | -939/+81 |
|\ | ||||
| * | Remove final web/fixmystreet templates. | Matthew Somerville | 2016-04-20 | -5/+2 |
| | | | | | | | | And associated, e.g. nothing references fixmystreet-old-box.js any more. | |||
| * | Remove some unused cobrands. | Matthew Somerville | 2016-04-20 | -934/+79 |
| | | ||||
* | | Don't warn on bad photo hashes. | Matthew Somerville | 2016-04-22 | -2/+2 |
| | |