aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* [EastSussex] set the group to the optgroup labelStruan Donald2020-04-29-1/+11
| | | | | Some categories are in multiple groups so pass back the optgroup label so we can assign it to the correct group and category
* [EastSussex] display assets on .comStruan Donald2020-04-29-0/+98
| | | | | Add assets for drains, grit bins and street lights. Uses east sussex specific protocol and format
* [East Sussex] add additional question to text for open311Struan Donald2020-04-29-0/+32
| | | | | The extra question data is added here rather than in the adapter as we have the question text along with the answer here.
* [EastSussex] add basic cobrandStruan Donald2020-04-29-0/+9
| | | | | This is required so we can use groups when fetching categories over open311.
* Merge branch 'peterborough-skanska-ref'Matthew Somerville2020-04-28-0/+15
|\
| * [Peterborough] Include Skanska ref in description.Matthew Somerville2020-04-28-0/+15
| |
* | Error page when submitting /import with web param.Matthew Somerville2020-04-28-24/+44
|/ | | | | | If the web param is used, show an error web page rather than the normal plain text output. Also do the normal remember/show uploaded photos feature, and hide the inputs better if unneeded.
*---. Merge branches '2961-disable-private-tickbox', ↵Matthew Somerville2020-04-28-66/+93
|\ \ \ | | | | | | | | | | | | '2962-pin-move-category-group' and 'move-admin-index-stats-to-stats-page'
| | | * Move stats from main admin index to stats index.Matthew Somerville2020-04-24-57/+68
| | | | | | | | | | | | | | | | | | | | These stats can take a while to generate, and we don't want to slow down people mostly coming to the admin index to do something else.
| | | * [UK] No FMS graph link on UK cobrand pages.Matthew Somerville2020-04-24-0/+2
| | | |
| | | * Do not calculate user count on status page.Matthew Somerville2020-04-24-7/+4
| | | |
| | * | Maintain category group on pin move.Matthew Somerville2020-04-24-1/+5
| | |/ | | | | | | | | | | | | | | | | | | If the same category is in multiple groups, upon moving the pin and fetching new categories from the server it would then pick the last instance of that category in the list. Instead of using val(), pick the correct entry in the previously selected optgroup.
| * / Disable staff private tickbox if category private.Matthew Somerville2020-04-24-1/+14
| |/ | | | | | | | | | | | | If a category is marked private, new reports are always marked private regardless of the setting of the private checkbox shown to relevant staff when making a new report. So tick/disable this box in that situation to prevent any confusion.
* | Add contact flag to protect category/group names from Open311 changesDave Arter2020-04-28-2/+73
| | | | | | | | | | | | | | Adds a new tickbox to the contact editing form that protects the category and group names from being changed by Open311. For mysociety/fixmystreet-commercial#1776
* | Respect SKIP_PACKAGES_INSTALL when not in Docker tooDave Arter2020-04-27-7/+7
|/ | | | | | When working locally it’s not convenient to always run install_packages as part of ./script/update, so this commit allows you to define the SKIP_PACKAGES_INSTALL environment variable to stop that.
* Factor out some new report tests into own files.Matthew Somerville2020-04-24-881/+874
|
* Merge branch 'bristol-remove-group'Matthew Somerville2020-04-24-0/+3
|\
| * [Bristol] Remove Open311 groups.Matthew Somerville2020-04-23-0/+3
| |
* | [Docs] Remove analytics.Matthew Somerville2020-04-23-11/+0
| |
* | [Buckinghamshire] Update mapping server.Matthew Somerville2020-04-23-2/+2
|/
* [TfL] Update homepage messageChris Mytton2020-04-23-7/+11
| | | | Request from client to update the text on the homepage.
* Switch round staff/superuser staff-category check.Matthew Somerville2020-04-17-4/+4
| | | | | If it checks the body first, then a superuser who is also assigned to a body would not be able to see staff categories in a different body.
* [Bromley] Fix heatmap category filter.Matthew Somerville2020-04-17-12/+17
| | | | | As it has switched to using category groups, the special subcategory code needs updating to update the correct variable.
* [Cheshire East] COVID-19 message on .com.Matthew Somerville2020-04-15-0/+9
|
* [Peterborough] Improve extra question handling.Matthew Somerville2020-04-15-12/+15
| | | | | | | Ignore (for Open311-sending purposes) any questions whose code starts "PCC-", so that it is easier to use the admin to add extra questions, and move the removal of the extra questions to a more normal location so answers are not lost when extra fields is reset post-send.
* Merge branch 'bromley-covid'Matthew Somerville2020-04-14-0/+19
|\
| * [Bromley] COVID-19 message and nav item.Matthew Somerville2020-04-14-0/+19
| |
* | Merge branch 'factor-report-nav-link'Matthew Somerville2020-04-14-43/+14
|\ \ | |/ |/|
| * Refactor/stop double escape in report nav link.Matthew Somerville2020-04-14-43/+14
| |
* | Merge branch 'he-pin-move-fix'Matthew Somerville2020-04-14-27/+21
|\ \
| * | [UK] Fix Highways England categories on pin move.Matthew Somerville2020-04-08-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you clicked on a non-HE location (so showing non-HE categories), then moved the pin to a HE location, the HE message box would show and update categories (but there would be no HE ones at the time). The server would return the new categories (including HE ones), but as the issue location had now not changed on this second call, the categories would not update to hide non-HE ones (it would show both HE and non-HE categories). So, instead of going off a location, check the road name - if it has not changed, do not recreate the whole HE message box, but do call the right HE selected/not selected function to update the categories. Note that this, if "Somewhere else" is selected, then causes an infinite loop, because the highways_change event triggers a category_change event which fires the layer's road found function, and then repeat. The highways_change->category_change event firing, according to the code comment, is so that asset selection can take place, or to remove stopper messages being shown. Previously, HE did not have its own categories but overrode the body to be sent to; HE now does have categories of its own, so I think this code can be removed.
* | | Merge branch 'full-name-field-label'Matthew Somerville2020-04-14-6/+1
|\ \ \ | |_|/ |/| |
| * | [UK] Make it clearer that full name is required.Zarino Zappia2020-04-08-6/+1
| | |
* | | Stop double escape in Google Maps URL.Matthew Somerville2020-04-10-1/+1
| | |
* | | [HE] message about being able to use report ids in searchStruan Donald2020-04-09-0/+1
| |/ |/|
* | Merge branch 'tfl-stroke-opacity'Matthew Somerville2020-04-08-9/+34
|\ \
| * | [TfL] Restrict HE categories to HE roads.Matthew Somerville2020-04-08-8/+33
| | | | | | | | | | | | The checks added in 285e183db missed the TfL cobrand.
| * | [TfL] Increase stroke opacity of red routes.Matthew Somerville2020-04-08-1/+1
| |/ | | | | | | | | In Firefox/Edge on Windows, having a translucent stroke causes a large slowdown in page painting.
* / [Open311] external status code takes precedence.Struan Donald2020-04-08-3/+83
|/ | | | | | | | Order the response templates query by external status code so if you have an update with an external status code the response template matching that is always used. Previously with the database left to determine the order it could pick a response template with a matching state rather than a matching external status.
* Merge branch 'uk-he-cobrand-fix'Matthew Somerville2020-04-07-5/+9
|\
| * [UK] Show Highways England categories on cobrands.Matthew Somerville2020-04-07-5/+9
| | | | | | | | | | | | Without allowing through the Highways England body, clicking on a Highways England road in these cobrands would leave no categories to be selected.
* | Merge branch 'bexley-confirm-p1-email'Matthew Somerville2020-04-07-4/+15
|\ \
| * | [Bexley] Treat any oil spillage report as P1.Matthew Somerville2020-04-07-0/+9
| | |
| * | [Bexley] Use other P1 email for Confirm reports.Matthew Somerville2020-04-07-4/+6
| |/
* | Merge branch 'send-reports-tidy'Matthew Somerville2020-04-07-82/+80
|\ \ | |/ |/|
| * Ignore sending failures within the database query.Matthew Somerville2020-04-06-35/+32
| | | | | | | | This means the code can assume it should be trying to send a report.
| * Tidy up verbose/debug handling of send-reports.Matthew Somerville2020-04-06-53/+54
| | | | | | | | | | Use verbose for all log output, and debug only for overriding the should_skip check.
* | [Highways England] Allow lookup with “FMS” prefix.Matthew Somerville2020-04-07-0/+14
|/ | | | This form of reference is shown on a report confirmation page.
* Merge branch 'admin-access-doc-2937' of git://github.com/Sambruk/fixmystreetMatthew Somerville2020-04-06-16/+2
|\
| * Removes documentation about restricting access to /adminJoe Siltberg2020-04-06-16/+2
| | | | | | | | Fixes #2937