aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge branch 'bexley-map-tiles'Matthew Somerville2019-09-19-23/+222
|\
| * [Bexley] Add specific geocoder.Matthew Somerville2019-09-19-4/+110
| |
| * Switch geocoders to be pluggable.Matthew Somerville2019-09-19-18/+28
| |
| * [Bexley] Add new map tiles.Matthew Somerville2019-09-19-1/+84
| |
* | Merge branch 'some-bits-from-ce-cobrand'Matthew Somerville2019-09-19-221/+97
|\ \
| * | Replace inline submit form with flexbox.Matthew Somerville2019-09-19-117/+31
| | |
| * | Fix some heading structure.Matthew Somerville2019-09-19-7/+9
| | |
| * | Add legend to alert form fieldset.Matthew Somerville2019-09-19-0/+1
| | |
| * | Darken front page step numbers.Matthew Somerville2019-09-19-1/+2
| | |
| * | Factor out alert index text.Matthew Somerville2019-09-19-24/+26
| | |
| * | Factor out local alert input selection template.Matthew Somerville2019-09-19-10/+11
| | |
| * | Factor out reporting form h1 heading.Matthew Somerville2019-09-19-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | form_heading.html was a misleading name for a partial containing the optional message that some cobrands display after the reporting form title, so we’ve now renamed it to make it clearer. This also allowed us to spin out the actual “Report your problem” heading into its own partial template, called form_heading.html.
| * | Remove on-map permalink.Matthew Somerville2019-09-19-57/+9
| | | | | | | | | | | | We retain the code as it is updating the URL on map move.
| * | Use container-max-width in front page container.Matthew Somerville2019-09-19-1/+3
| | |
* | | strip quote from contact group namesStruan Donald2019-09-19-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an open311 category has multiple groups it puts them in the groups element using CSV escaping. This means that group names can sometimes feature double quotes. If we send these to the front end then putting them into the optgroup name attribute breaks the HTML as if the group name is in the database as `"group name"` you end up with <optgroup name="" group="" name=""> instead of <optgroup name="group name"> Hence, stripping the double quotes.
* | [Northamptonshire] Always update report with Open311 state change.Matthew Somerville2019-09-18-0/+11
| |
* | Merge branch 'westminster-com-emails'Matthew Somerville2019-09-17-14/+26
|\ \
| * | [Westminster] No email alerts on .com reports.Matthew Somerville2019-09-10-14/+26
| | |
* | | [Hounslow] Send report to inbox after first Open311 send attemptDave Arter2019-09-16-11/+45
| |/ |/|
* | [Hounslow] Send report to inbox before Open311 send, not afterDave Arter2019-09-13-6/+15
| |
* | Merge branch 'fix-contact-form-auto-bug'Matthew Somerville2019-09-13-2/+16
|\ \
| * | Make sure determine_contact_type called later.Matthew Somerville2019-09-12-2/+16
| |/ | | | | | | | | | | | | The request cobrand is set on the schema during the app's setup_request(), which is called by the root auto action. So anything in a controller's begin action will access an incorrect cobrand (if one has already been set).
* | do not reproject uk wmts map if no coordinatesStruan Donald2019-09-13-0/+12
| | | | | | | | | | | | | | | | If the coordinates are (0,0) then return that straight back as trying to reproject causes Geography::NationalGrid::GB to fall over as 0 lat is outside UK Fixes #2617
* | [Bexley] Reduce radius around red routes.Matthew Somerville2019-09-13-0/+1
| |
* | Make /alert page RSS links clickableZarino Zappia2019-09-10-10/+21
|/ | | | | | | | | | | | Fixes a bug that appears to have been introduced in edf8456, where the RSS icons on the /alert page were being stacked behind the relatively positioned form labels, making them unclickable. While I was there, I also standardised the markup for all three RSS images to use the translatable alt text and double quotes for the HTML attributes. Fixes #2624.
* Merge branch 'swedish-locale' of https://github.com/mysociety/fixmystreetMatthew Somerville2019-09-10-1/+1
|\
| * Add Swedish locale instead of NorwegianGraeme Porteous2019-09-05-1/+1
| | | | | | | | | | | | Fixes test suite failures in new Vagrant environments. See also: #2487
* | Merge branch 'bexley-tfl'Matthew Somerville2019-09-10-5/+47
|\ \
| * | [Bexley] Add TfL road support.Matthew Somerville2019-09-04-5/+34
| | |
| * | Add multipolygon containsPoint() support.Matthew Somerville2019-09-04-0/+13
| | |
* | | [Bristol] Add roadworks.Matthew Somerville2019-09-06-22/+53
| | |
* | | [Bexley] Switch map to OSM.Matthew Somerville2019-09-06-0/+1
| | |
* | | Merge branch 'nicer-non-js-category-stuff'Matthew Somerville2019-09-06-41/+125
|\ \ \
| * | | Improve user flow when JavaScript is not availableMatthew Somerville2019-09-05-8/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the reporting journey to only ask for category, and then category extra questions if appropriate, first, so that if the choice would lead to the form being disabled, this can be shown immediately.
| * | | Remove HTML required email restriction.Matthew Somerville2019-09-05-12/+2
| | | | | | | | | | | | | | | | | | | | In non-JS scenario, this means you must enter email in both boxes to continue. JS still makes it required appropriately when available.
| * | | Slightly simplify new report category handling.Matthew Somerville2019-09-05-23/+6
| | |/ | |/|
* | | [Northamptonshire] Update not-a-road message.Matthew Somerville2019-09-05-2/+3
| | |
* | | Merge branch 'issues/commercial/1543-asset-ordering'Matthew Somerville2019-09-05-37/+57
|\ \ \ | |/ / |/| |
| * | Make sure extras hidden when only_send is active.Matthew Somerville2019-09-04-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | The extras may be a confusing stopper message that only applies to the 'main' body, or it may be extra questions that are now not required. Either way, we should hide this information, and we need to make sure the server no longer checks if required extra questions have been answered.
| * | Always perform layer loadend one-off setup.Matthew Somerville2019-09-04-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This was previously restricted to coming directly to /report/new, but this meant it wasn't being run when e.g. Buckinghamshire winter routes or Westminster TfL roads were being loaded after the appropriate category selection, so their effects did not occur (as the checkFeature code was called prior to the layer finishing loading).
| * | [Westminster] Run stopper check after layer check.Matthew Somerville2019-09-04-0/+4
| | | | | | | | | | | | | | | | | | | | | The stopper check runs first, which could mean that if the asset layer has not yet loaded, the form is disabled when it should not be (e.g. on a TfL road in a road category). Make sure that we always run the stopper check after the TfL layer check, in case it changes something.
| * | Factor out stopper matching check function.Matthew Somerville2019-09-04-34/+39
| |/
* | Merge branch 'allow-undevolving'Matthew Somerville2019-09-05-1/+20
|\ \
| * | Allow contact send method to be unset always.Matthew Somerville2019-09-05-1/+20
| | | | | | | | | | | | | | | | | | If a body was set to Open311, and a contact set to Email, it was impossible to unset the contact's send method and set an Open311 code, because it would always demaned a valid email address.
* | | [Hounslow] Disable trees asset layer again.Dave Arter2019-09-05-34/+36
|/ / | | | | | | | | | | It's still not working as expected, with lots of rejected reports. This reverts commit 49c74ded4275005e766a948ec47d4cc722e0567e.
* / [UK] Do not show error on HE page.Matthew Somerville2019-09-04-0/+1
|/
* [Bromley] Use live map server.Matthew Somerville2019-09-04-1/+1
|
* [UK] Fix issue with body_overrides.Matthew Somerville2019-09-03-7/+7
| | | | | | | | Note how in road_not_found, the Highways England check could never pass because the only_send was being removed the line before. When the Buckinghamshire and Northamptonshire code was factored together, it looks like bits were taken from one that weren't present in the other, and so should not have been present in the shared code.
* [UK] Empty category meta when HE selected.Matthew Somerville2019-09-03-0/+2
| | | | | Any message being included there will be for the appropriate council and not relevant.
* Allow more characters in name splitting.Matthew Somerville2019-09-03-2/+2
| | | | Not sure how this has not arisen before!