aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | [Lincolnshire] WFS layer for server-side filteringMatthew Somerville2019-10-28-64/+12
| | | |
| * | | Only add filter strategy if HTTP WFS being used.Matthew Somerville2019-10-28-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | If GET-based WFS is being used, no server-side filtering takes place, so we need a client side filter to perform the same job. But if normal POST WFS is being used, the server-side filtering has already been performed, so no need to do it again (in fact, no need to return the data necessary to do such filtering either).
* | / [Mobile] Make sure disable message findable by appMatthew Somerville2019-10-30-5/+17
| |/ |/| | | | | | | | | | | | | | | | | The mobile app is looking at the old extra.datatype_description location rather than the new disable_form location for per-question disabling (it does look there for all-category disabling). So we need to make sure the JSON includes the message in the place where it will be looking. Note if an extra data question has two answers that disable the form and they have different messaging, the app will only take one of them.
* | Fix some tests not running offline.Matthew Somerville2019-10-28-4/+22
| |
* | [UK] Fix couple of test warnings.Matthew Somerville2019-10-28-3/+3
| | | | | | | | Confirm phone validation, Westminster test name, BANES undef.
* | [UK] Factor out Confirm open311_config to role.Matthew Somerville2019-10-28-157/+58
|/
* Merge remote-tracking branch 'origin/master'Matthew Somerville2019-10-28-29/+178
|\
| * add a get_extra_field method to Extra roleStruan Donald2019-10-28-0/+67
| | | | | | | | | | accepts name or code for finding the field. Useful for checking for individual open311 fields that don't have a value.
| * allow emergency message script to add category messagesStruan Donald2019-10-28-29/+52
| | | | | | | | | | also add an update only option to only update existing messages and not add new ones
| * [Northamptonshire] script to update emergency messageStruan Donald2019-10-28-0/+59
| | | | | | | | To avoid having to do it all by hand
* | Use category text, not value in staff prefill.Matthew Somerville2019-10-25-1/+1
| |
* | [BANES] Override category display name.Matthew Somerville2019-10-25-2/+55
| |
* | Allow cobrands to override category display.Matthew Somerville2019-10-25-35/+50
| |
* | Allow editing of category name.Matthew Somerville2019-10-25-8/+36
| |
* | Make contact edit note optional on staging sites.Matthew Somerville2019-10-25-3/+4
| |
* | Refactor admin body creation/editing together.Matthew Somerville2019-10-25-153/+154
|/
* [Peterborough] Exclude email categories from cobrandDave Arter2019-10-21-0/+13
|
* Merge branch 'peterborough-reviewed'Dave Arter2019-10-21-81/+816
|\
| * [Peterborough] Include reference number in emails & report pagesDave Arter2019-10-21-0/+26
| |
| * [Peterborough] Add USRN/site_code lookupDave Arter2019-10-21-0/+65
| |
| * [Peterborough] Confirm-specific configurationDave Arter2019-10-21-0/+45
| | | | | | | | | | | | - Apply Confirm validation rules - Add admin_user_domain and Confirm-required open311 fields - Prefix Open311 updates with notice that it’s come from FMS
| * [Peterborough] add GA tracking codeStruan Donald2019-10-21-0/+22
| | | | | | | | Fixes mysociety/fixmystreet-commercial#1473
| * [Peterborough] Initial cobrandMartin Wright2019-10-21-0/+571
| |
| * Make sure disable form message is in view.Matthew Somerville2019-10-21-0/+1
| |
| * [fixmystreet.com] Generalise emergency message script.Matthew Somerville2019-10-21-73/+85
| |
| * [UK Councils] Remove MultiCurveFix asset layer formatterDave Arter2019-10-21-8/+1
|/ | | | | | | | | This is no longer needed on tilma-served layers since we have upgraded to MapServer 7. A side-effect of using the MultiCurveFix format_class was that it implied the use of GML v3 as that was its base class. This commit sets the default format_class to OpenLayers.Format.GML.v3, which is required to parse the GML v3 responses from tilma.
* Do not clear asset attributes on category change.Matthew Somerville2019-10-18-3/+3
|
* [IsleOfWight] do not mention council in not responsibleStruan Donald2019-10-18-0/+32
| | | | | | Use Island Roads in place of council in not responsible message. Fixes mysociety/fixmystreet-freshdesk#93
* [Northamptonshire] small tweaks to backfill scriptStruan Donald2019-10-17-1/+11
| | | | | Fix a couple of issues discovered in testing where the Response to customer wasn't being detected in the database;
* Merge branch 'subcat-asset-pick'Matthew Somerville2019-10-17-38/+48
|\
| * Check asset attribute fields on category change.Matthew Somerville2019-10-16-0/+16
| | | | | | | | | | | | It's possible an asset has been selected before a category (e.g. if assets are showing for a whole category group. So on category change, make sure we check if any attribute fields need setting/clearing.
| * Stop VectorNearest listening on assets:selected.Matthew Somerville2019-10-16-8/+4
| | | | | | | | | | | | An assets:selected event is always accompanied by a maps:update_pin event, which is already being listened on. Reorder the asset selection so the event still occurs before any attribute field setting.
| * Make attribute field functions class methods.Matthew Somerville2019-10-16-31/+29
| |
* | [Northamptonshire] add max resolution for gully layerStruan Donald2019-10-16-10/+15
| |
* | [Northamptonshire] update live layer versionsStruan Donald2019-10-16-11/+11
| |
* | [Northamptonshire] change drain categories to use gully layerStruan Donald2019-10-16-5/+13
|/
* [Northamptonshire] updated report status backfill scriptStruan Donald2019-10-16-18/+45
| | | | | Update the script for updating all statuses rather than just the investigating ones
* Restore debug toolbar on non-contact admin pagesDave Arter2019-10-15-6/+8
| | | | | | sortable() returns undefined if no elements match, so on admin pages that weren't the contact editing page a TypeError was being thrown by the [0] line which resulted in the debug toolbar not being shown.
* Merge branch 'fix-dupes-'Matthew Somerville2019-10-15-38/+87
|\
| * Fix issue loading inspector duplicates on /around.Matthew Somerville2019-10-15-3/+33
| | | | | | | | | | | | As there are two category drop-downs in this situation (one in the hidden reporting form, one in the inspect form), the correct entry needs to be specified.
| * Fix issue loading duplicates when not to be shown.Matthew Somerville2019-10-15-35/+54
| | | | | | | | | | | | | | If the duplicates.js file is loaded, then its mechanisms come into play, and it fetches duplicates and hides the reporting form if there are any. So we only want this to happen in the same situations as it being loaded elsewhere, on a relevant cobrand and not just after signing in.
* | Merge branch 'issues/commercial/1538-heatmap'Matthew Somerville2019-10-15-172/+244
|\ \ | |/ |/|
| * Default heatmap page to showing heatmap.Matthew Somerville2019-10-15-2/+9
| |
| * Add map filter debouncing.Matthew Somerville2019-10-15-6/+20
| |
| * Generalise heatmap code to be under /dashboard.Matthew Somerville2019-10-15-111/+143
| |
| * Default dashboard users to cobrand they are on.Matthew Somerville2019-10-14-7/+12
| |
| * Refactor Reports controller a bit.Matthew Somerville2019-10-14-54/+76
| | | | | | | | | | Split load_and_group_problems in two, split out category list/map setup, and factor out sort stash setting. No actual changes.
| * [Isle of Wight] Allow pagination of triaged categories.Matthew Somerville2019-10-14-10/+2
| |
* | [Zurich] Warnfix.Matthew Somerville2019-10-14-1/+1
| |
* | [Westminster] Test warnfixes.Matthew Somerville2019-10-14-4/+9
| |