Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'store-contributed-as' | Matthew Somerville | 2018-03-20 | -11/+25 |
|\ | ||||
| * | Store contributed-as data. | Matthew Somerville | 2018-03-20 | -11/+25 |
| | | | | | | | | | | Store if the report/update was created by someone using the contributed-as dropdown, and use that information to perhaps not send report-sent emails. | |||
* | | [Zurich] Prefetch report users, cache body lookups | Matthew Somerville | 2018-03-19 | -2/+6 |
| | | ||||
* | | Pass columns CSV needs into Problem->as_hashref. | Matthew Somerville | 2018-03-19 | -21/+16 |
|/ | | | | Then it can skip working out some things as they are not needed. | |||
* | Merge branch '2023-bad-open311-dates' | Matthew Somerville | 2018-03-16 | -4/+4 |
|\ | ||||
| * | Truncate dates in Open311 output to the second. | Matthew Somerville | 2018-03-15 | -4/+4 |
| | | | | | | | | This fixes #2023 by removing the comma. | |||
* | | Merge branch 'rutland-integration' | Struan Donald | 2018-03-15 | -6/+62 |
|\ \ | ||||
| * | | permit blank updates to be fetched over Open311 | Struan Donald | 2018-03-15 | -2/+5 |
| | | | | | | | | | | | | | | | Add a per body configuration option to allow Open311 updates to contain only a status change, rather than emitting a warning when this happens. | |||
| * | | Deal with 'automated' Open311 service attributes. | Struan Donald | 2018-03-15 | -4/+5 |
| | | | | | | | | | | | | | | | | | | This is part of the integration with our open311-adapter. The automated property indicates that it's an expected value but either it's going to be set by the server, or appear as a hidden field. | |||
| * | | send multiple photos over open311 | Struan Donald | 2018-03-15 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Per cobrand configurable option to send multiple photos over open311 instead of just a single one. Does this by sending multiple media_url parameters in the POST body. The default remains to send the first photo associated with a report. | |||
| * | | [Rutland] cobrand files for Rutland | Struan Donald | 2018-03-15 | -0/+44 |
| | | | | | | | | | | | | | | | Web and email template changes, CSS plus cobrand file with open311 config | |||
| * | | fetch new problems over open311 | Struan Donald | 2018-03-15 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the display of existing reports from the back end on FMS if the body is configured to do this. Reports will not be created if they are missing an id, a lat or a long, if the lat/long is outside the area covered by the body, if there is already a report with a matching id, or if we can't parse out the request time. | |||
* | | | [Zurich] Fix typo causing crash on /report/ajax | Dave Arter | 2018-03-15 | -1/+1 |
| | | | ||||
* | | | Fix JSON-encoding crash on /report/ajax | Dave Arter | 2018-03-15 | -1/+7 |
|/ / | ||||
* | | Merge branch 'add-cypress' | Matthew Somerville | 2018-03-15 | -36/+54 |
|\ \ | ||||
| * | | Add Cypress testing. | Matthew Somerville | 2018-03-15 | -36/+54 |
| | | | ||||
* | | | Allow searching for user reports if you have the user_edit permission | Dave Arter | 2018-03-14 | -1/+2 |
|/ / | | | | | | | | | This allows users (e.g. customer service staff) to search for a user's reports in the admin without being able to edit them. | |||
* | | Merge branch 'issues/commercial/987-zurich-csv-updates' | Matthew Somerville | 2018-03-14 | -393/+413 |
|\ \ | ||||
| * | | [Zurich] Switch to more modern database states. | Matthew Somerville | 2018-03-07 | -128/+131 |
| | | | | | | | | | | | | | | | | | | | | | The Zurich code was written a long time ago, and used overriding so that e.g. the hard-coded 'investigating' state referred to Wunsch (wish). Now that states are stored in the database, we can create ones specially for Zurich and use them instead. Hooray! | |||
| * | | [Zurich] Let SDM view awaiting reports. | Matthew Somerville | 2018-03-07 | -2/+7 |
| | | | ||||
| * | | [Zurich] Make wish state publicly visible. | Matthew Somerville | 2018-03-07 | -8/+8 |
| | | | ||||
| * | | [Zurich] Add abbreviation option to contacts. | Matthew Somerville | 2018-03-06 | -6/+14 |
| | | | ||||
| * | | Add a way to store extra cobrand data on contacts. | Matthew Somerville | 2018-03-06 | -0/+10 |
| | | | ||||
| * | | Remove category_options_copy. | Matthew Somerville | 2018-03-06 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | This variable existed to keep a copy of the categories before it was overwritten by report_edit_location (if a bad location was provided) calling the variable setup functions again. But really, the function shouldn't be overwriting the stash, it's only testing the lookup and so should restore the stash at its end. | |||
| * | | [Zurich] Add fixture script. | Matthew Somerville | 2018-03-06 | -139/+133 |
| | | | | | | | | | | | | Remove old unused setup-contacts code, superceded by fixtures. | |||
| * | | [Zurich] Admin stats/CSV per category. | Matthew Somerville | 2018-03-06 | -9/+16 |
| | | | | | | | | | | | | Adapt look of default dashboard filtering. | |||
| * | | [Zurich] Include user email/phone/name in CSV export. | Matthew Somerville | 2018-03-05 | -2/+7 |
| | | | ||||
| * | | [Zurich] Refactor to use same CSV generation code. | Matthew Somerville | 2018-03-05 | -111/+93 |
| | | | ||||
* | | | Merge branch 'warks-email-archive' | Matthew Somerville | 2018-03-14 | -11/+24 |
|\ \ \ | |_|/ |/| | | ||||
| * | | [Warwickshire] Add archive script data. | Matthew Somerville | 2018-03-14 | -11/+24 |
| |/ | | | | | | | Add an update with each report closure. | |||
* / | Show default start date on dashboard. | Matthew Somerville | 2018-03-13 | -24/+11 |
|/ | | | | This makes it clearer what is being shown. | |||
* | Merge branch 'issues/commercial/974-closed-report-incorrectly-reopened' | Matthew Somerville | 2018-03-02 | -4/+3 |
|\ | ||||
| * | [Zurich] Do not reopen closed reports by mistake. | Matthew Somerville | 2018-03-02 | -4/+3 |
| | | | | | | | | | | The code for moving a report to the intermediary state was running even if the report was in a closed state and had not been changed. | |||
* | | Fix post-edit issues on admin report edit page. | Matthew Somerville | 2018-03-02 | -34/+32 |
| | | | | | | | | | | If you rotated a photo, updates and the category list weren't loaded. If you changed a report's state, the map pin colour was derived from the old state. | |||
* | | [Zurich] Show to-be-hidden reports until confirmed | Matthew Somerville | 2018-03-02 | -2/+1 |
|/ | ||||
* | Add development email previewer. | Matthew Somerville | 2018-03-01 | -11/+155 |
| | ||||
* | Use `report` more in email templates. | Matthew Somerville | 2018-02-27 | -8/+0 |
| | ||||
* | Fix duplicate report selection | Dave Arter | 2018-02-20 | -2/+2 |
| | | | | | | | | The underlying DOM structure returned from /report/xx/nearby.json had changed, meaning the "Which report is it a duplicate of?" list on the inspector form wasn't displaying any reports. This commit introduces a template specifically for the nearby URL instead of overloading the on_map_list_items template. | |||
* | [Bristol] Always include an email address for Open311 reports | Dave Arter | 2018-02-19 | -0/+6 |
| | ||||
* | Merge branch '1939-questionnaire-links' | Matthew Somerville | 2018-02-19 | -27/+59 |
|\ | ||||
| * | Store questionnaire data as soon as opened. | Matthew Somerville | 2018-02-16 | -21/+40 |
| | | | | | | | | | | | | This means the questionnaire is considered 'answered' as soon as a (HTML) link is clicked, which I think is okay. Then filling in the questionnaire form will update the same questionnaire. | |||
| * | Show any ‘steady-state’ questionnaire response. | Matthew Somerville | 2018-02-16 | -1/+4 |
| | | ||||
| * | Link update made during questionnaire to it. | Matthew Somerville | 2018-02-16 | -2/+11 |
| | | | | | | | | | | This means we don't show separate 'Still open' messages when an update was also left at the same time. | |||
| * | Prefill first question from questionnaire email. | Matthew Somerville | 2018-02-16 | -3/+4 |
| | | ||||
* | | [Oxfordshire] Remove response days, add home page message. | Matthew Somerville | 2018-02-15 | -1/+5 |
| | | ||||
* | | [Bristol] Switch back to own map tiles/assets | Dave Arter | 2018-02-13 | -1/+1 |
| | | | | | | | | This reverts commit 549d1cc66e591cf2da6b5243fbd28c7f40e75f14. | |||
* | | Merge branch 'issues/forcouncils/276-staff-only-reports' | Matthew Somerville | 2018-02-13 | -33/+79 |
|\ \ | |/ |/| | ||||
| * | Show non_public reports to staff on list pages. | Matthew Somerville | 2018-02-13 | -16/+51 |
| | | ||||
| * | Allow inspectors to see/change non_public reports. | Matthew Somerville | 2018-02-09 | -2/+11 |
| | | ||||
| * | Only leave inspect update if text or state change. | Matthew Somerville | 2018-02-08 | -15/+17 |
| | | | | | | | | | | We don't want to leave a blank update when e.g. only internal things have changed. |