aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge branch 'issues/commercial/1051-lincs-confirm'Dave Arter2018-08-20-141/+1015
|\
| * [Lincolnshire] Update front page wordingDave Arter2018-08-20-1/+9
| | | | | | | | Lincolnshire uses ‘division’ instead of ‘ward’ as well as Oxfordshire.
| * [Lincolnshire] Add contact email addressDave Arter2018-08-17-1/+8
| |
| * [Lincolnshire] Add admin_user_domain and base_url configDave Arter2018-08-17-0/+8
| |
| * [Lincolnshire] Add external contractors disclaimer textDave Arter2018-08-17-0/+12
| |
| * [Lincolnshire] Colour pins according to stateDave Arter2018-08-17-0/+10
| |
| * [Lincolnshire] Disable questionnairesDave Arter2018-08-17-1/+1
| |
| * [Lincolnshire] Send ‘report logged’ emails; don’t show FMS ID on ↵Dave Arter2018-08-17-0/+12
| | | | | | | | confirmation page
| * [Lincolnshire] Show external ID on report pagesDave Arter2018-08-17-1/+1
| |
| * [Lincolnshire] Update example places & geocoder configDave Arter2018-08-17-0/+17
| |
| * [Lincolnshire] Add assets to map & roadworks.org integrationDave Arter2018-08-17-0/+330
| |
| * [Lincolnshire] Only show certain district categories on cobrandDave Arter2018-08-17-0/+15
| |
| * [Lincolnshire] Add cobrand templates & stylesDave Arter2018-08-17-0/+422
| |
| * Set bodyclass on alert disambiguation/questionnaire pagesDave Arter2018-08-17-1/+2
| | | | | | | | This was causing layout issues on the Lincolnshire cobrand.
| * [Buckinghamshire] Use smaller template override for problem confirm messageDave Arter2018-08-17-44/+6
| |
| * Allow asset layer to hide ‘pick an asset’ message entirelyDave Arter2018-08-17-1/+1
| |
| * Don’t crash when fetching Open311 requests with missing descriptionDave Arter2018-08-17-1/+22
| |
| * Make roadworks.org integration more configurableDave Arter2018-08-17-6/+10
| | | | | | | | | | Allows cobrands to customise message displayed, and includes description in GeoJSON feature properties.
| * Fix asset filtering for single-category layersDave Arter2018-08-17-0/+1
| |
| * [Buckinghamshire] Factor roadworks.org organisation ID out to cobrand JSDave Arter2018-08-17-4/+12
| |
| * [Buckinghamshire] Factor lookup_site_code up into UKCouncils cobrandDave Arter2018-08-17-81/+112
| |
| * Allow asset layer ‘filter_value’ to be a functionDave Arter2018-08-17-1/+6
|/
* Don’t show photo tips if cobrand doesn’t allow photo uploadDave Arter2018-08-14-0/+2
|
* [UK] New House Rule forbidding impersonationZarino Zappia2018-08-10-0/+4
|
* Fix inspector dragging of pins.Matthew Somerville2018-08-09-7/+22
|
* [Oxfordshire] Load UK projection JS library.Matthew Somerville2018-08-09-0/+1
|
* [UK] OS map only shown from zoom 12+.Matthew Somerville2018-08-09-2/+2
| | | | Bing no longer shows it at zoom level 11.
* Merge remote-tracking branch 'origin/2012-new-report-near-here'Matthew Somerville2018-08-07-2/+88
|\
| * "Report a problem here" button in nav when viewing a locationZarino Zappia2018-08-07-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2016. When you load a page that includes either a problem report, or is centered on a location, the "Report a problem" button in the nav bar (that normally takes you to the homepage) becomes a "Report a(nother) problem here" button, that leads directly to the new report form for the location in question. On full map pages (/around and any /report/<id> pages loaded via it) the reporting form will be rendered client-side, avoiding a full page reload. On pages lacking the full map (eg: missing fixmystreet.bbox_strategy), namely /reports/<area> and any /report/<id> page that hasn’t been client-side loaded via /around, we fall back to a server-side page load. Finally, as you’d expect, the text and URL for the button dynamically update as you move around the map, or switch between the different client-side states of the reporting flow. We also hide the button entirely when you’re reporting a problem, which was something suggested a long time ago.
| * Better padding for "report a problem" nav buttonZarino Zappia2018-08-07-1/+1
| |
* | Merge remote-tracking branch 'origin/2012-report-another'Matthew Somerville2018-08-07-0/+13
|\ \
| * | "Report another problem here" button on confirmation pageZarino Zappia2018-08-07-0/+13
| |/ | | | | | | | | | | | | Part of #2012. Should make it much quicker to report multiple problems in the same location, one after the other.
* | [Buckinghamshire] Open reports only by default.Matthew Somerville2018-08-07-0/+2
| |
* | Merge branch 'issues/commercial/1118-confirm-flytipping'Matthew Somerville2018-08-07-23/+62
|\ \
| * | [Buckinghamshire] Update flytipping handling.Matthew Somerville2018-08-07-23/+62
| | | | | | | | | | | | | | | | | | Allow flytipping reporting on cobrand and .com, with road reports going to Bucks Confirm and email, and non-road reports going to district and Bucks emails.
* | | Merge branch 'bristol-map-resolution'Matthew Somerville2018-08-07-5/+14
|\ \ \
| * | | [Bristol] Fix display of assets on .com map.Matthew Somerville2018-08-07-2/+11
| | | |
| * | | [UK] Show assets at more zoomed out level.Matthew Somerville2018-08-07-3/+3
| | | |
* | | | call inspector setup when display reportStruan Donald2018-08-07-0/+9
| |_|/ |/| | | | | | | | | | | | | | | | | | | | If an inspector clicks on a report from an around page the code to setup the pin dragging needs to be called. This adds a method to the map to allow the setup code to be called on report load. Fixes #2073
* | | Add missing ID to /alert postcode input.Matthew Somerville2018-08-07-1/+1
|/ / | | | | | | Fixes #2197.
* | Merge branch 'issues/commercial/1123-fixed-state-thing'Matthew Somerville2018-08-06-2/+25
|\ \ | |/ |/|
| * [Open311] No update text on fixed state move.Matthew Somerville2018-08-06-2/+25
| | | | | | | | | | | | A move between fixed states (presumably from fixed-user to fixed-council) should not count as a state change for the purposes of generating comment text from templates.
* | Do update layer visibility on extras received.Matthew Somerville2018-08-06-0/+3
| | | | | | | | | | | | | | Asset layer visibility depends on fixmystreet.bodies, which is updated from ajax request by pin selection or category change, but the visibility change happens before the ajax request - so if visibility is not also checked when category_extras returns it can get out of sync.
* | allow front end to not send to specific bodyStruan Donald2018-08-06-12/+96
| | | | | | | | | | | | | | | | add a do_not_send parameter to reports which allows the front end to specify a comma separated list of bodies that reports should not be sent to even if there is a valid contact match. This enables asset layers to override backend body processing, e.g. if a body only accepts reports that are on a road this allows the front end to specify that.
* | [Buckinghamshire] Display not-road message better.Struan Donald2018-08-06-2/+9
| | | | | | | | | | | | is_only_body() checks if the supplied body is the only one listed in fixmystreet.bodies and hence if it's the only one that reports for the current pin position will be sent to.
* | show not on roads message on national siteStruan Donald2018-08-03-0/+11
| | | | | | | | currently will show even if it's only appropriate for one body
* | [UK] Pull in cobrand asset files on national site.Struan Donald2018-08-03-3745/+1141
| | | | | | | | | | | | | | Also add body name to layer defaults, so they are only used where appropriate. Switch mapit area javascript calls to GeoJSON, so we can drop KML support in OpenLayers.wfs.js which saves a small amount of bandwidth.
* | [Buckinghamshire] Fix hard-coded category lookup.Matthew Somerville2018-08-03-2/+2
|/
* [Bromley] Fix selection on TfL red routes.Matthew Somerville2018-08-03-1/+11
|
* Allow asset layer display to be body dependent.Struan Donald2018-08-03-57/+260
| | | | | | | | | | | Return a list of associated bodies on around/new pages and in category ajax calls, and use that when deciding whether to show/hide layers. If the layer has no body information, then we show it as before, maybe based on category selected; if it does, it is only shown if the layer body matches the bodies for the point. As part of this create a new VectorAsset class to handle all the visibility changes for asset layers as it makes it a bit tidier.