aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* [Buckinghamshire] Function requires ID, not objectMatthew Somerville2019-01-25-1/+1
|
* Spot moderation conflicts.Matthew Somerville2019-01-25-10/+53
| | | | | If someone tries to moderate after someone else has, re-show the form and an error.
* Stop redirecting on moderation error.Matthew Somerville2019-01-25-30/+43
| | | | This will also be used by the moderation conflict code.
* Do not show Discard changes button if no JS.Matthew Somerville2019-01-25-2/+2
|
* [Buckinghamshire] Stop road-placement being sent.Matthew Somerville2019-01-25-0/+11
| | | | | The server doesn't need to know about it, it was only for us to pick the appropriate body.
* Merge branch 'bucks-flytipping-question'Matthew Somerville2019-01-23-123/+472
|\
| * [Buckinghamshire] Script to close old district flytipping reports.Matthew Somerville2019-01-23-18/+106
| |
| * [Buckinghamshire] Question for on-road flytipping.Matthew Somerville2019-01-23-31/+221
| | | | | | | | | | | | | | | | This adds a question to check whether a flytipping report concerns flytipping on a road or not. Client-side, it is asked when a road is selected and destination adjusted according to the answer; server side it uses the answer to direct any both-tier submissions (from e.g. non-JavaScript or phone app).
| * [Open311] Refactor cobrand specific code.Matthew Somerville2019-01-23-55/+140
| |
| * Factor out two identical loops.Matthew Somerville2019-01-21-19/+5
| |
* | Bugfix display of next-steps.Matthew Somerville2019-01-22-8/+2
|/ | | | | Missing a "&" in base selector, so wasn’t being applied, and use flex directly on layout rather than floating.
* Don’t show creation diffs with old history entries.Matthew Somerville2019-01-17-0/+2
| | | | | Old moderation history entries will have blank category/co-ords, and we don’t want to say they’ve changed on appearance.
* [Buckinghamshire] Show guidance message for gritting routesDave Arter2019-01-17-0/+35
| | | | | | | | | If a report is started on a road in the WinterRoutes asset layer in the "Snow and ice problem/winter salting" category, an extra guidance message is shown beneath the category UI with a link to the council's gritting schedule. Fixes mysociety/fixmystreet-freshdesk#25.
* Merge branch 'allow-state-moderation'Matthew Somerville2019-01-16-4/+64
|\
| * Allow state editing via moderation.Matthew Somerville2019-01-16-4/+66
| | | | | | | | | | If a state is passed in (on a cobrand), update problem state and add a comment to record this (as state changes are updates not moderations).
* | Merge branch 'moderation-in-front-end-updates'Matthew Somerville2019-01-16-16/+62
|\ \
| * | Include moderation history in report updates.Matthew Somerville2019-01-16-15/+61
| | | | | | | | | | | | | | | | | | If the user has moderating permission, or a cobrand allows the viewing of moderation history, show moderation history within the updates on a report page.
| * | Only show extra items that diff in moderation.Matthew Somerville2019-01-15-1/+1
| |/
* / [Oxfordshire] length checking for names, emails and phone NosStruan Donald2019-01-16-0/+43
|/ | | | | | | Add in validation to check names, email and phone numbers don't exceed maximum lengths permitted by HIAMS. Fixes mysociety/fixmystreet-commercial#1244
* Include areas in mock MapIt postcode calls.Matthew Somerville2019-01-15-1/+9
|
* Call confirm() during token confirmation.Matthew Somerville2019-01-14-2/+1
| | | | So state/confirmed setting in one place.
* Use pin_new_report_colour server-side too.Matthew Somerville2019-01-14-1/+1
|
* Merge branch 'lincolnshire-confirm-ref-in-updates'Matthew Somerville2019-01-14-85/+19
|\
| * [Lincolnshire] Include ref in alert updates.Matthew Somerville2019-01-14-0/+2
| |
| * Have separate alert-update council ref template.Matthew Somerville2019-01-14-4/+9
| | | | | | | | | | | | | | This is so a council could include the ref in other-* but not alert-update if not wanted. Update Bucks to use new template (not needed as it overrides for other reasons, but makes seeing those other reasons in a diff easier).
| * [UK Councils] Tidy up email templates.Matthew Somerville2019-01-14-81/+8
| | | | | | | | | | | | Try and include _council_reference always in other-reported, no need for BANES other-updated, and include HTML version of a Bucks template so that it is used.
* | Remove any use of `my $x if $foo`.Matthew Somerville2019-01-14-4/+8
|/ | | | | | | | As perlsyn says, "NOTE: The behaviour of a `my`, `state`, or `our` modified with a statement modifier conditional or loop construct (for example, `my $x if ...`) is undefined. The value of the `my` variable may be `undef`, any previously assigned value, or possibly anything else."
* [Demo] add start and end date fields to licensingStruan Donald2019-01-14-0/+4
|
* allow field type to be set on category extras fieldsStruan Donald2019-01-14-1/+1
| | | | | Checks for a fieldtype property and uses that for the input type to allow setting the type of the field for e.g. date fields.
* Switch .description_tips to use flexbox.Matthew Somerville2019-01-11-4/+2
|
* [Bromley] Lights code is now SLRS.Matthew Somerville2019-01-11-1/+1
|
* Delete cache photos upon photo moderation.Matthew Somerville2019-01-10-0/+2
|
* Check cached reports have photos before showing.Matthew Somerville2019-01-10-1/+3
|
* Only select body by default if user has a body.Matthew Somerville2019-01-10-2/+2
| | | | | Otherwise you can get an error trying to look up the body name on submission.
* 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
|