aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Allow override search to /report/new => /around.Matthew Somerville2019-01-10-4/+15
| | | | | | This is so you can have a search box on an around page (wrapped in a form going to /report/new) to start a new search, ignoring the lat/lon that will also be submitted.
* Factor out update form wrapper.Matthew Somerville2019-01-09-12/+13
|
* Add wrapper to map filters.Matthew Somerville2019-01-09-0/+4
|
* Remove fuzzy from Swedish locale header.Matthew Somerville2019-01-09-1/+0
|
* Merge branch 'double-green-pin-asset'Matthew Somerville2019-01-07-27/+42
|\
| * Compare assets on their ID field, not JS object.Matthew Somerville2019-01-04-4/+14
| | | | | | | | | | | | | | | | | | | | As the selected feature is a clone (so it survives e.g. layer reloading from server after a pan), we need to compare the asset ID field instead to see if we already have a match, to prevent a double select(). This also fixes a bug where an auto-selected asset would, after picking a different asset, reshow the selected pin image onmouseout, due to the way OL was storing old hover state internally.
| * Put find_matching_feature on the layer object.Matthew Somerville2019-01-04-24/+29
| |
* | Merge remote-tracking branch 'origin/master'Matthew Somerville2019-01-07-0/+10
|\ \
| * | [Borsetshire] add extra categories to demo siteStruan Donald2019-01-07-0/+10
| |/ | | | | | | Dropped Kerbs and Skips in a Licensing group.
* | Update other translations from Transifex.Matthew Somerville2019-01-07-10930/+3289
| |
* | New Swedish translations for v2.5Joe Siltberg2019-01-07-521/+1085
|/
* add private only report filterStruan Donald2019-01-04-15/+115
|
* [Open311] run cobrand description filtering if availableStruan Donald2019-01-04-0/+55
| | | | | When fetching reports run them through the cobrands filter_report_description method if it exists.
* [Buckinghamshire] add report description filteringStruan Donald2019-01-04-0/+88
| | | | | | Add a method to do some basic filtering of emails and phone numbers from report descriptions. To be used on reports pulled in from Confirm as a first pass at removing personal information.
* [Open311] handle non_public field when fetching requestsStruan Donald2019-01-04-0/+68
| | | | | | | | | If there is <non_public>1</non_public> tag in an incoming service request then set the created report to non_public.
* [Docs] Updated with AMI for release v2.5Sam Pearson2018-12-21-3/+3
|
* Version 2.5.v2.5Matthew Somerville2018-12-21-16167/+19359
|
* Update translations from Transifex.Matthew Somerville2018-12-21-1660/+1265
|
* Merge branch '2357-show-more-questionnaire-updates'Matthew Somerville2018-12-21-8/+59
|\
| * Show all questionnaire responses lacking updates.Matthew Somerville2018-12-20-8/+59
| | | | | | | | | | | | Since questionnaire responses were recorded on email link click, we should have been showing those that reopened or fixed reports, not just steady-state "Still open" ones.
* | [Open311] warn on staging if fail to match updatesStruan Donald2018-12-20-0/+4
|/ | | | | If we fail to match an update to a problem on the staging server then print a warning so we can diagnose issues.
* [fixmystreet.com] Add donate banner.Matthew Somerville2018-12-19-0/+5
|
* Merge branch '1072-reason-for-reporting'Matthew Somerville2018-12-19-127/+221
|\
| * [Buckinghamshire] Get topic when reporting abuse.Matthew Somerville2018-12-19-74/+129
| |
| * [fixmystreet.com] Get topic when reporting abuse.Matthew Somerville2018-12-19-6/+15
| |
| * Make who question more prominent.Matthew Somerville2018-12-19-35/+64
| |
| * Improved report/update display on contact form.Matthew Somerville2018-12-18-12/+13
| |
* | [Buckinghamshire] add more asset layers layersStruan Donald2018-12-19-1/+101
| | | | | | | | | | | | | | | | | | Add layers for: * Road crossings * Belisha Beacons * Gullies * Street signs * Bollards
* | [Buckinghamshire] allow different feature code attributesStruan Donald2018-12-19-31/+46
| | | | | | | | | | | | | | Not all the layers use the same attribute for the feature code so add and use a config option to set this, and extract out the style map settings so we can change them to use the correct attribute for the label.
* | [Buckinghamshire] change sidebar label depending on asset typeStruan Donald2018-12-19-16/+38
|/ | | | | | | use the asset code to determine what sort of type the asset is for displaying the 'you have selected $type $code' message. Also, pull this out into a new set of defaults so we can apply it across multiple asset types.
* cobrand hook for extra processing upon report inspectionStruan Donald2018-12-17-0/+2
| | | | | Add a hook to enable the cobrand to do some extra processing when saving a report on the inspect report screen.
* add a cobrand hook to save extra user dataStruan Donald2018-12-17-0/+4
| | | | | Enable the cobrand to save extra data when creating/editing users in the admin.
* Make sure map state stored if filters used first.Matthew Somerville2018-12-14-2/+3
|
* Stop both Unknown/In progress banners appearing.Matthew Somerville2018-12-13-6/+3
| | | | Previously, CSS was absolutely positioning one on top of the other.
* Increase clickable area for "Back to all reports" linkZarino Zappia2018-12-13-2/+2
|
* Modernise report "status" bannerZarino Zappia2018-12-13-218/+87
| | | | | | | | | | | | | * Simplify markup required for the status banner. * Simplify styles - the banner is now identical on all screen sizes. * Move the banner from `report/display.html` into `report/_main.html` so that it can appear after `.problem-back` in the source order. * Use real pin icon instead of `pin-flat-white-small.png`. * Set a default `$col_fixed_label` colour in `_base.scss`, so cobrands don’t have to define it themselves if they’re happy with green. * Introduce `$col_fixed_label_light`, with a sensible default for all cobrands, even ones that have a custom `$col_fixed_label`. * Remove `$col_fixed_label_dark` – no longer needed.
* Merge branch '2346-unescape-titles'Matthew Somerville2018-12-13-7/+38
|\
| * Don’t escape entities in report titles via ajax.Matthew Somerville2018-12-12-1/+31
| |
| * Activate test_mode on JS testing.Matthew Somerville2018-12-12-6/+7
| | | | | | | | | | | | This is so front-end tests will not try and send email, or call Gaze. Various co-ordinates have to be updated because the default zoom level of the map has now changed.
* | Merge branch 'bucks-roads-message-tweak'Matthew Somerville2018-12-13-7/+46
|\ \ | |/ |/|
| * [Buckinghamshire] Nicer not-our-road messages.Matthew Somerville2018-12-11-7/+46
| |
* | [UK Councils] Fix undefined body_validation_rules.Matthew Somerville2018-12-11-25/+22
|/ | | | The core validation_rules.js is not included on e.g. the front page.
* [Zurich] Add 2019/2020 extra holidays.Matthew Somerville2018-12-11-0/+2
|
* [Buckinghamshire] New tracking code.Matthew Somerville2018-12-08-14/+26
|
* [Bromley] Tidy up some form templates.Matthew Somerville2018-12-08-83/+33
|
* Show email form after logging in as leaving updateMatthew Somerville2018-12-08-12/+12
| | | | | | | | | With the recent login changes, the user form was being hidden after logging in while leaving an update, meaning you had to click "Continue" to see the thing it was asking you to check. Refactor the update flow slightly in this area to be more like reporting, showing the relevant bit of the user form immediately (and thus also not having it within a hidden section).
* Specify type variable to both in and out templatesMatthew Somerville2018-12-08-3/+3
| | | | All templates call private_details.html, which uses this variable.
* Make sure locale path specified in JS controller.Matthew Somerville2018-12-08-1/+3
| | | | | This doesn't appear to cause any issues on Linux, but on Mac it fails to find the translation file without this. Matches the code in App.pm.
* [Open311] Prevent warning on bad error response.Matthew Somerville2018-12-08-2/+5
|
* [fixmystreet.com] More categories in fixture.Matthew Somerville2018-12-08-11/+71
|