aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'issues/commercial/875-old-reports'Matthew Somerville2018-06-21-8/+16
|\ \
| * | Show message on reports closed to updates.Matthew Somerville2018-06-21-8/+16
| |/
* / Map Open311 CLOSED status to closed state if extended statuses enabled.Dave Arter2018-06-21-5/+20
|/ | | | | | | | | | | | | | | | | | | | | The Open311 specification has two values for a report's status: - open: it has been reported. - closed: it has been resolved. FixMyStreet previously mapped 'closed' to 'fixed - council', but this has been causing issues with Open311 endpoints that want to mark a FMS report as closed but not fixed. The mySociety Open311 additions introduce extended statuses, some of which represent a 'closed' state e.g. duplicate, no_further_action, but there are times when a report should simply be closed without any indication why - for example, if open311-adapter is being used to integrate with a council system which has a closed state not represented by the extended statuses. Marking a report as 'closed' on a council system and displaying that as 'fixed' on the FixMyStreet front end is not an ideal situation. This commit changes the mapping of the Open311 'closed' status to the 'closed' FMS state when extended_statuses is enabled.
* send unresponsive details back with category extrasStruan Donald2018-06-20-0/+11
| | | | | | | This allows the mobile app to explicitly detect when a body is unresponsive and display the category_extra text. For mysociety/fixmystreet-mobile#266
* Merge branch 'issues/commercial/1060-highway-flytipping-to-tfb'Matthew Somerville2018-06-20-6/+79
|\
| * [Buckinghamshire] Support extra recipient for road flytipping.Matthew Somerville2018-06-19-1/+70
| |
| * [Buckinghamshire] Add admin_user_domain.Matthew Somerville2018-06-19-0/+2
| |
| * Use body_handler hook finding cobrand in SendReport::Email.Matthew Somerville2018-06-19-0/+2
| |
| * Treat SendMethod Email subclasses like Email.Matthew Somerville2018-06-18-5/+5
| |
* | Merge branch 'issues/commercial/1064-main-road-br5'Matthew Somerville2018-06-20-10/+30
|\ \
| * | [Bromley] Deal with partial postcodes in search.Matthew Somerville2018-06-20-8/+27
| | |
| * | Keep commas in geocode lookups.Matthew Somerville2018-06-18-2/+3
| |/
* / cobrand hook to deny access to pagesStruan Donald2018-06-19-0/+18
|/ | | | | | | Add a check in the root controller `auto` to a cobrand hook that denies access if it returns true. This goes here so that cobrands and users are set up, which is not the case for `check_login_required`. Used to do things like deny site access unless the user is a superuser.
* Merge branch '2107-foot-the-bill'Matthew Somerville2018-06-18-136/+114
|\
| * Reduce complexity of footer CSS.Matthew Somerville2018-06-15-104/+89
| |
| * [UK] Remove long-gone Ovi store app reference.Matthew Somerville2018-06-15-8/+0
| |
| * [Stevenage] Factor out footer-marketing.html.Matthew Somerville2018-06-14-25/+26
| |
* | [UK] Ignore TfL body in get_body_handler_for_problem.Matthew Somerville2018-06-18-1/+1
|/
* Merge branch 'issues/commercial/1038-bromley-tfl-direct'Matthew Somerville2018-06-14-223/+147
|\
| * [Bromley] Include TfL reports on map, in grey.Matthew Somerville2018-06-14-4/+38
| |
| * [Bromley] [Bucks] Tidy up _item.html template.Matthew Somerville2018-06-14-162/+10
| |
| * [UK] Improve owns_problem &c for use with TfL bodyMatthew Somerville2018-06-14-13/+13
| | | | | | | | | | We need to call owns_problem all the time, not just in two-tier areas, for pin colour and base URL, and ignore TfL in owns_problem and body lookup function.
| * [TfL] Add SendReport plugin to ignore contact selection.Matthew Somerville2018-06-14-0/+55
| |
| * If single_body_only set, skip contact body check.Matthew Somerville2018-06-14-15/+16
| | | | | | | | This assumes the SendReport code will deal with the issue.
| * Update council text with single_body_only value if set.Matthew Somerville2018-06-14-4/+13
| |
| * [Bromley] Remove TfL warning message, use default handling.Matthew Somerville2018-06-12-24/+1
| |
| * Do not set single_body_only if asset selected.Matthew Somerville2018-06-12-1/+1
| |
* | Merge branch 'leaf-that-does-not-know-it-is-part-of-a-tree'Matthew Somerville2018-06-13-116/+132
|\ \
| * | Catch errors whilst quote_char is set.Matthew Somerville2018-06-13-113/+124
| | | | | | | | | | | | That way we can make sure we always reset quote_char even if something breaks.
| * | Use correct created column in problem timeline.Matthew Somerville2018-06-13-4/+9
| |/ | | | | | | The User model now also has a created column.
* / Remove small border to left of Fixed banner.Martin Wright2018-06-13-1/+6
|/ | | | This was caused by the header overlapping the state banner
* include automated field when editing contactsStruan Donald2018-06-11-5/+83
| | | | | | | | Display fields that are automatically filled in the contact editing form otherwise the data is lost. Also include the automated field in the form. Fixes #2136
* [Oxfordshire] Remove homepage winter damage messageDave Arter2018-06-08-10/+0
|
* [Oxfordshire] use localtime in open311 get update callStruan Donald2018-06-08-0/+39
| | | | | | | | | | As Oxfordshire uses local time and not UTC use that when calling the get update script. Also handle a date with a timezone being passed on the server side. And add some tests in for the oxfordshire open311 endpoint Fixes mysociety/fixmystreet-commercial#1062
* [UK] Tweaks to council privacy policy.Matthew Somerville2018-06-07-43/+36
| | | | [BANES] Some associated wording.
* [Buckinghamshire] Enable non-road asset selection.Matthew Somerville2018-06-07-4/+13
|
* Version 2.3.4.v2.3.4masterMatthew Somerville2018-06-07-2/+7
|
* Fix issue displaying anonymous account email.Matthew Somerville2018-06-07-5/+10
|
* Fix pin clicking on non-/around pages.Matthew Somerville2018-06-07-2/+6
| | | | | The fix in de36c49d1 broke pin clicking on other map list pages, such as /my and /reports.
* Update translations that have new plural forms.Matthew Somerville2018-06-06-22/+160
|
* Version 2.3.3.v2.3.3Matthew Somerville2018-06-06-610/+1178
|
* Improve inspect form position and configurability.Matthew Somerville2018-06-06-6/+11
| | | | | | Dealing with the map UI changes earlier leads to a better display position, and we add a global variable check to allow cobrands to not use this behaviour. Fixes #1863.
* Fix display going back from report as inspector.Matthew Somerville2018-06-06-1/+6
| | | | | The scroll position wa being remmbered, meaning the full-page map was not being shown correctly.
* Merge branch '2130-jump-for-my-love'Matthew Somerville2018-06-06-7/+12
|\
| * Remove unneeded base in main navigation.Matthew Somerville2018-06-06-4/+2
| | | | | | | | | | | | This can cause issues with e.g. multi-language sites, and was only needed for cases where the admin was proxied, which we do not suggest any more.
| * Fix pointer event issue selecting pin on map.Matthew Somerville2018-06-06-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a mobile device that implements pointer events, there are two events that can happen on an /around page – touching the map starts a new report (or goes back to the map if already on a report page); touching a pin pulls in that report’s page. The map touch, which uses an OpenLayers.Handler.Click, operates on click, whereas the pin touch, which uses an OpenLayers.Handler.Feature, operates on touchstart. Neither event cancels the other, which means you can end up either starting a new report, and then it tries to pull in an undefined pin ID report and errors, or the pin report loads and then you instantly go back to the map page. In order to work around this, we disable the map click control when the feature control event starts, and reactivate once the report data has been loaded.
* | Don’t delete email contacts on devolved bodies.Matthew Somerville2018-06-06-21/+8
| | | | | | | | | | If we assume that any body with can_be_devolved set is probably a mix of Open311/email, we can ignore any email address contacts for such a body.
* | error on bad update ids passed to contact formStruan Donald2018-06-05-9/+73
| | | | | | | | | | Return an error if an id for either a hidden update or one not associated with the problem id is passed to the contact form.
* | add reminder to include link to report on contact formStruan Donald2018-06-05-0/+6
|/ | | | | | We get quite a few emails to support that are about a specific problem but fail to include a link to that problem. This adds some text to the contact form to ask people to do so.
* Merge branch 'issues/commercial/1037-bromley-wording'Matthew Somerville2018-06-04-34/+48
|\