aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* [Northamptonshire] update Vegetation asset layersStruan Donald2020-02-06-3/+6
| | | | Allow all categories to make a report on roads or tree assets.
* [UK Councils] Make sure TfL link works everywhere.Matthew Somerville2020-02-06-1/+9
|
* Merge branch 'bexley-ooh-p1-highways'Matthew Somerville2020-02-05-6/+7
|\
| * [Bexley] Highways/covers out-of-hours matching P1.Matthew Somerville2020-02-04-6/+7
| |
* | [UK] Use feature flag for send_questionnaire.Matthew Somerville2020-02-04-11/+22
|/
* [Peterborough] Add message to front page.Matthew Somerville2020-02-03-0/+12
|
* Merge remote-tracking branch 'origin/2667-improve-mobile-try-again'Matthew Somerville2020-02-03-83/+118
|\
| * Improve try again on mobile.Matthew Somerville2020-01-31-9/+28
| |
| * Restrict lat/lon in URL/fields to 6dp.Matthew Somerville2020-01-31-6/+6
| |
| * No history entry for updates to new pin location.Matthew Somerville2020-01-31-3/+7
| |
| * Create helper function for translation template.Matthew Somerville2020-01-31-67/+79
| |
* | [Hounslow,IoW] Revert switch of map type.Matthew Somerville2020-01-31-2/+2
| | | | | | | | This reverts commit c82b1734cd2b5f224e3d4779972e4dcdefb41c7f.
* | Merge branch 'admin-user-logged-preference'Matthew Somerville2020-01-31-2/+2
|\ \ | |/ |/|
| * Default logging to logged in user.Matthew Somerville2020-01-31-2/+2
| | | | | | | | | | | | | | | | | | Historically, the FixMyStreet admin was accessed via HTTP Basic Auth and a secure proxy, so the auth user was used for logging purposes. Nowadays all admin use is by FixMyStreet user, and any Basic Auth is used for the purpose of hiding staging sites from bots. This configuration means that on those staging sites, all admin is logged by the one staging user, not the actual user, so let's swap that round.
* | Don’t highlight duplicate pins on mobileDave Arter2020-01-31-9/+15
| | | | | | | | | | The presence of the ‘mouseenter’ handler meant two taps were required to expand the report preview.
* | Display inline map for duplicate suggestions on mobileDave Arter2020-01-31-5/+31
|/ | | | For #2668.
* Merge branch 'tfl-map-filter-category-groups'Matthew Somerville2020-01-30-18/+68
|\
| * Enable category groups on map filter dropdown.Dave Arter2020-01-30-18/+68
| | | | | | | | Includes an updated version of jquery-multi-select.
* | Merge branch 'remove-pan-from-mobile'Matthew Somerville2020-01-30-15/+21
|\ \
| * | Remove pan control from mobile widths.Matthew Somerville2020-01-30-15/+21
| |/
* | [Zurich] Not sure what this exemption was for.Matthew Somerville2020-01-30-4/+2
| |
* | Stop capitalising key tools.Matthew Somerville2020-01-30-1/+0
| |
* | Keep report updates link in usual place on mobile.Matthew Somerville2020-01-30-1/+1
| |
* | After login during update, separate form/report.Matthew Somerville2020-01-30-0/+1
| |
* | Use nicer default photo upload message.Matthew Somerville2020-01-30-3/+8
| |
* | Merge branch 'issues/freshdesk/389-northamptonshire-add-index-step'Graeme Porteous2020-01-30-0/+18
|\ \ | |/ |/|
| * [Northamptonshire] customise index step templateGraeme Porteous2020-01-30-0/+18
|/ | | | Add 5 step to discourage more than one problem per enquiry.
* [Hounslow,IoW] Switch map type whilst server down.Matthew Somerville2020-01-29-2/+2
|
* Merge branch 'bodies-list-cats-by-group'Matthew Somerville2020-01-29-8/+35
|\
| * List categories in body admin by group.Matthew Somerville2020-01-28-8/+35
| |
* | Merge branch 'scrubber-allow-img'Matthew Somerville2020-01-29-0/+1
|\ \
| * | Allow img elements in scrubbed fields.Matthew Somerville2020-01-27-0/+1
| | |
* | | Merge branch 'allow-multiple-questions-to-disable-new-report-form'Chris Mytton2020-01-29-23/+107
|\ \ \ | |_|/ |/| |
| * | [Peterborough] Add test for multiple questions disabling new report formChris Mytton2020-01-29-2/+69
| | |
| * | Allow multiple question to disable the new report formChris Mytton2020-01-28-21/+38
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This changes the existing logic to account for the fact that multiple questions might have the disable form checkbox ticked for one of their options. At the moment this just displays one of the messages at a time, with the first one taking priority. So if you have a "Is this an emergency" question and a "Is this on private land" question which both disable the form, and the user has selected "Yes" to both, then only the message for the first question is displayed. This can potentially be improved in the future, but seemed out of scope for this change.
* / Only trigger one change event on initial popstate.Matthew Somerville2020-01-28-3/+4
|/ | | | | | | | When going back to the initial state with popstate, a change event was being triggered on every single option of the filter selects. This led to a lot of change events running on the category/status multi-selects which then needlessly repeated the same activities over and over. This locked up the browser for seconds in locations with many categories.
* Add per report OpenGraph imagesGraeme Porteous2020-01-27-12/+89
| | | | | | | | | | | | | Includes a bit of refactoring of PhotoSet::get_image_data to make it easier to call subsequent methods on the photo object. We then do this to get the width and height. Also adds width/height attributes to FixMyStreet::ImageMagick Attributes are updated every time the image is transformed and before the as_blob data, which also undefs the image, is returned so it always present for subsequent calls. Fixes #2394.
* [Open311] Factor together editor, note, and whenedited fields when updating ↵Dave Arter2020-01-24-22/+16
| | | | contacts
* [Open311] Don’t use full path to open311-populate-service-list in editor ↵Dave Arter2020-01-24-6/+7
| | | | column
* [Bexley] Out-of-hours email for all highways.Matthew Somerville2020-01-24-2/+4
| | | | | The changes in 27fe9940 to send more P1 emails meant the out-of-hours email wasn't being correct sent when it should have been.
* Fix bug in add_emergency_message scriptChris Mytton2020-01-22-2/+2
| | | | | | | There was a typo in the error message and the related conditional which meant it was checking for $opts->questions (which doesn't exist) rather than $opts->question, which prevented the script from being used to add a question.
* Merge branch 'allow-alert-signup'Matthew Somerville2020-01-21-1/+1
|\
| * Allow update signup even if updates disallowed.Matthew Somerville2020-01-21-1/+1
| | | | | | | | | | | | It is possible for a report to be closed to public updates, but it still could receive updates (eg updates only from problem reporter, or updates only by staff), so we should still allow people to sign up.
* | Merge branch 'tfl-update-shortlist-email-cobrand'Matthew Somerville2020-01-21-11/+27
|\ \
| * | [TfL] Always use TfL branding on shortlist email.Matthew Somerville2020-01-21-11/+27
| | | | | | | | | | | | It was using the branding/URL of the site the update was left on.
* | | Merge branch 'same-cat-different-groups'Matthew Somerville2020-01-21-20/+12
|\ \ \
| * | | Filter contacts before constructing options.Matthew Somerville2020-01-21-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we wait until after to filter the contacts and the constructed options, then we can end up in the situation where e.g. we've filtered out all the TfL contacts but the category option is still the TfL one (with its associated group).
* | | | Fix possible heatmap viewing when not logged in.Matthew Somerville2020-01-21-8/+15
| | | |
* | | | Factor out list filter sort section.Matthew Somerville2020-01-21-14/+16
| | | |
* | | | [SortMySign] Tweaks needed for tests.Matthew Somerville2020-01-21-2/+3
| | | |