aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Allow invalid MapServer6 GML to be parsedDave Arter2018-02-22-0/+21
|
* Show hidden report extra fields on inspector formDave Arter2018-02-22-3/+3
|
* Preserve hidden fields’ values when saving inspector formDave Arter2018-02-22-1/+2
|
* Populate `usrn` field with USRN of clicked asset, if availableDave Arter2018-02-22-16/+105
| | | | | | | | | | | | | | | | | | | | | | | | Some cobrands require reports to include the USRN of the clicked road. This commit allows an asset layer to be added and designated as a 'USRN provider' by setting its `usrn_field` property when calling fixmystreet.assets.add. Initially this feature used OpenLayers' getFeatureFromEvent method, however that doesn't work if the layer isn't topmost. This is because it uses the clicked element in the DOM to determine which feature was clicked. This doesn't work if the layer you're trying to get the feature from wasn't actually the DOM element that was clicked. Instead, we add a new method, OpenLayers.Layer.Vector.getFeatureAtPoint method which takes a Point object and iterates through the features' geometries to find the matching point. To make things a little more user-friendly, if an asset isn't clicked directly we find the closest to the clicked point and use that for the USRN. To accomplish this, this commit factors out the ‘select nearest asset’ code into a new method OpenLayers.Layer.Vector.getNearestFeature, which takes a Point and a distance threshold and finds the nearest feature.
* Set asset layers’ z-indexes appropriately so they don’t cover the marker ↵Dave Arter2018-02-22-12/+19
| | | | layer
* [UK] Track clicks on ".big-green-button"Zarino Zappia2018-02-21-0/+6
| | | | | | | | | We’re interested in seeing whether people are mistakenly clicking the (inert) "Click map to report a problem" banner on the `/around` page. This will record a Google Analytics event if and when they do. Fixes mysociety/fixmystreet-commercial#963.
* Fix duplicate report selectionDave Arter2018-02-20-3/+5
| | | | | | | | The underlying DOM structure returned from /report/xx/nearby.json had changed, meaning the "Which report is it a duplicate of?" list on the inspector form wasn't displaying any reports. This commit introduces a template specifically for the nearby URL instead of overloading the on_map_list_items template.
* [Bristol] Always include an email address for Open311 reportsDave Arter2018-02-19-0/+13
|
* Merge branch '1939-questionnaire-links'Matthew Somerville2018-02-19-59/+205
|\
| * Store questionnaire data as soon as opened.Matthew Somerville2018-02-16-22/+58
| | | | | | | | | | | | This means the questionnaire is considered 'answered' as soon as a (HTML) link is clicked, which I think is okay. Then filling in the questionnaire form will update the same questionnaire.
| * Show any ‘steady-state’ questionnaire response.Matthew Somerville2018-02-16-5/+16
| |
| * Link update made during questionnaire to it.Matthew Somerville2018-02-16-7/+36
| | | | | | | | | | This means we don't show separate 'Still open' messages when an update was also left at the same time.
| * Move report under first question, number questions.Matthew Somerville2018-02-16-22/+21
| |
| * Prefill first question from questionnaire email.Matthew Somerville2018-02-16-12/+14
| |
| * Add Don’t know button to questionnaire email.Matthew Somerville2018-02-16-0/+11
| |
| * Add some /photo and questionnaire update tests.Matthew Somerville2018-02-16-3/+61
| |
* | [UK Councils] Improve prefilled report text.Matthew Somerville2018-02-15-2/+2
| |
* | [Oxfordshire] Remove response days, add home page message.Matthew Somerville2018-02-15-52/+15
| |
* | [Bristol] Switch back to own map tiles/assetsDave Arter2018-02-13-1/+33
| | | | | | | | This reverts commit 549d1cc66e591cf2da6b5243fbd28c7f40e75f14.
* | Refactor asset loading code to be more idiomaticDave Arter2018-02-13-81/+87
| | | | | | | | | | | | | | This simplifies the asset layer loading code to allow multiple layers to be created and added to the map at the correct time. This also means always_visible layers are, in fact, always visible, and not hidden when the map is clicked or a category-specific asset layer is shown.
* | WFS asset layers can set their name attributeDave Arter2018-02-13-4/+6
| |
* | Improvements to asset layer user interactionDave Arter2018-02-13-33/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows asset layers to be added to the map that have more complex behaviours than simply 'click a marker'. - Layers can be non-interactive and/or always visible Previously an asset layer would only be shown when its associated category was chosen from the dropdown. You can now add layers which are always visible, as well as ignoring user input. Useful for, e.g. showing an LLPG overlay on the map. - Stylemaps can be provided for individual layers This means you can, for example, have custom rules for styling features based on their attributes or other complex rules. - Functions can be used for the feature/report field mapping Instead of a one-to-one mapping between feature attributes and fields on the new report form, you can provide a callback function which can provide a calculated value to the report form.
* | Make asset layer WFS configuration more customisableDave Arter2018-02-13-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes it easier to customise the way asset layers are loaded over WFS, including: - Adds support for WFS layers via GET method The standard HTTP method for WFS GetFeature requests is POST, but some WFS services only support GET. OpenLayers.Protocol.WFS is hardcoded to use POST, but we can use OpenLayers.Protocol.HTTP instead to use GET. The options passed to fixmystreet.add_assets should include a 'http_options' object which configures the HTTP protocol. - Allows HTTP asset layers to provide their own format This makes it simpler to use GeoJSON, for example, instead of the default of GML. - Asset layers can provide their own loading strategy The default strategy can be overridden if, for example, you want to use a BBOX strategy with a smaller ratio in order to load fewer features at a time.
* | Fix OpenLayers.Projection.OS transformsDave Arter2018-02-13-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the projectInverse/projectForward methods in OpenLayers.Layer.SphericalMercator have been renamed which was causing problems. Additionally this gem was buried in the OpenLayers.Projection.transform docs: Returns point - [...] The original point is modified. The previous code didn't seem to modify the original point which was confusing OpenLayers.
* | Merge branch 'issues/forcouncils/276-staff-only-reports'Matthew Somerville2018-02-13-37/+132
|\ \ | |/ |/|
| * Show non_public reports to staff on list pages.Matthew Somerville2018-02-13-16/+51
| |
| * Allow inspectors to see/change non_public reports.Matthew Somerville2018-02-09-6/+63
| |
| * Only leave inspect update if text or state change.Matthew Somerville2018-02-08-15/+17
| | | | | | | | | | We don't want to leave a blank update when e.g. only internal things have changed.
* | Merge branch 'version-2.3.1'v2.3.1Matthew Somerville2018-02-12-12273/+15963
|\ \
| * | Version 2.3.1.Matthew Somerville2018-02-12-8/+10
| | |
| * | Update locale files with new strings.Matthew Somerville2018-02-12-11382/+15542
| | |
| * | Updated translations from transifex.Matthew Somerville2018-02-12-901/+429
| | |
* | | Merge branch 'banes-improvements-grab-bag'Matthew Somerville2018-02-12-13/+83
|\ \ \ | |/ / |/| |
| * | Cobrands can pass `components` to Google Geocoder.Dave Arter2018-02-12-4/+72
| | | | | | | | | | | | | | | | | | This allows more fine grained control over the geocoder search, e.g. to specify the administrative area or town. See the geocoder api docs: https://developers.google.com/maps/documentation/geocoding/intro#ComponentFiltering
| * | Improvements to report_sent_confirmation_email functionDave Arter2018-02-12-6/+7
| | | | | | | | | | | | | | | | | | - Send ‘report sent’ emails from cobrand’s contact address - Don’t send email when report is made using contribute-as-other and report_sent_confirmation_email is active.
| * | Display report extra fields on inspect formDave Arter2018-02-08-3/+4
| | | | | | | | | | | | | | | | | | | | | This commit restores display of report extra fields on the inspect form, previously missing because of a typo. Also improves the compactness of the form by hiding ‘notice’ extras and any extra guidance attached to each field.
* | | Script to remove expired sessions.Matthew Somerville2018-02-09-0/+81
| | | | | | | | | | | | | | | This also can set up users so that the admin "Log user out" function works correctly.
* | | Fix warning when sending reports from user with no emailDave Arter2018-02-09-1/+1
| | |
* | | prevent timezone related util test failureStruan Donald2018-02-09-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that the prettify_dt tests use the same timezone as FMS otherwise the test can fail if now in the local timezone is actually yesterday/tomorrow in the FMS timezone. Fixes #1984
* | | [Bristol] Switch map to OSM temporarilyDave Arter2018-02-08-33/+1
|/ / | | | | | | maps.bristol.gov.uk is currently offline, so the Bristol map tiles aren’t loading.
* | Show loading spinner on map for assets as well as markersDave Arter2018-02-08-2/+10
| |
* | Factor map loading spinner code out so multiple things can load at onceDave Arter2018-02-08-6/+28
|/
* Allow updates to be left as another user with phone numberDave Arter2018-02-07-9/+76
|
* Don’t require SMS_AUTHENTICATION to view/edit user email/phone_verifiedDave Arter2018-02-07-8/+14
| | | | | | | Previously this would force phone_verified to false for all user edits, as well as forcing email_verified to true - which would be the wrong thing to do if the user had been created/verified via the ‘report as another user’ flow.
* Allow ‘report as another user’ to only provide a phone numberDave Arter2018-02-07-10/+96
|
* Increase two-factor skew to 2 time periods.Matthew Somerville2018-02-07-1/+1
|
* Merge branch '2fa-superuser'Matthew Somerville2018-02-07-36/+423
|\
| * Allow two-factor to work during creation flow.Matthew Somerville2018-02-07-18/+84
| |
| * Add two-factor authentication for superusers.Matthew Somerville2018-02-07-18/+339
| |
| * [Travis] Do not ignore Authentication::CredentialsMatthew Somerville2018-02-07-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 21:46:43 +0000