aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'issues/forcouncils/171-filter-dropdown-all'Matthew Somerville2017-03-10-3/+5
|\
| * Specify options in 'all' status filter.Matthew Somerville2017-03-09-3/+5
| | | | | | | | | | A cobrand may have a blank default that isn't everything, so the "All reports" option must specify all the possible options.
* | Move staff-only JavaScript to separate file.Matthew Somerville2017-03-10-346/+362
| |
* | Merge branch 'issues/forcouncils/174-dupe-user-tweaks'Matthew Somerville2017-03-09-18/+22
|\ \
| * | Check cobrand users list when admin merging users.Matthew Somerville2017-03-09-1/+8
| | |
| * | Make sure emails are lowercased in admin.Matthew Somerville2017-03-09-17/+14
| |/
* | Add submit buttons to admin index search forms.Matthew Somerville2017-03-09-0/+17
| | | | | | | | Also slightly tidy up display.
* | Reduce unneeded admin CSS specificity.Matthew Somerville2017-03-09-47/+52
| |
* | Make sure report Ajax call is not cached by IE11.Matthew Somerville2017-03-09-1/+1
| | | | | | | | | | IE11 caches this Ajax call, not calling out to the server at all if it is made again (e.g. after an update has been made). Fixes #1638.
* | Refactor SendReport::Open311 to use cobrand hooks.Matthew Somerville2017-03-09-80/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid doing cobrand-specific logic within SendReport::Open311. The hooks defined are: open311_config: set extra fields open311_pre_send: set endpoints and munge data These are tested in the new t/app/sendreport/open311.t, which does not send any actual reports, but just checks that all the data is munged into the expected format. (tests under t/open311* should already test the actual sending) Remove unused Open311 special cases.
* | [UK] Exclude Bristol from open311-populate-service-list.Matthew Somerville2017-03-09-1/+2
|/
* Bring changelog up to date.Matthew Somerville2017-03-03-0/+21
|
* Merge branch '1553-fms4c-contact-form'Matthew Somerville2017-03-03-34/+40
|\
| * [fixmystreet.com] Avoid /about/council redirects.Zarino Zappia2017-03-03-13/+13
| |
| * [fixmystreet.com] Clarify council contact form.Zarino Zappia2017-03-03-21/+27
| | | | | | | | | | | | | | | | | | | | * Tweak wording to make it clearer that the form is unsuitable for residents wanting to report street problems. * Record HTTP Referer when form is submitted, so we can see which pages are leading people to the FMS4C page. * Tidy up capitalisation elsewhere in headings on the page. Fixes #1553.
* | Add buttons to resize maps on report pagespezholio2017-03-02-12/+67
|/ | | | | | | | This improves usability on mobile devices, allowing users to pan around the problem and see the area in more detail. I've also changed the CSS around a bit, so we can use the `map-fullscreen` class in other places.
* Fix placeholder typo in French translation.Matthew Somerville2017-02-28-1/+1
|
* Only output appcache/manifest for shortlist users.Matthew Somerville2017-02-28-2/+8
| | | | The interception of 404s etc is too much of an inconvenience.
* Merge branch 'reduce-the-stats'Matthew Somerville2017-02-28-7/+2
|\
| * Assume photo ID given in database exists on disk.Matthew Somerville2017-02-28-6/+1
| | | | | | | | | | | | | | The list code was checking the photo ID given in the database existed on disk – this shouldn't ever not be the case, and if it was, all that would happen would be a broken image when the full photo code looks for it (this is only for e.g. lists of reports).
| * Do not re-stat non-existent files.Matthew Somerville2017-02-28-1/+1
| | | | | | | | | | The versioning code wasn't remembering when it had found that a file did not exist, so was checking for them each time.
* | Correct pluralise ‘days ago’ on problem last updateDave Arter2017-02-27-1/+1
| |
* | Merge branch 'issues/forcouncils/98-add-pretty-duration-to-report-list'Dave Arter2017-02-27-3/+51
|\ \ | |/ |/|
| * [Oxfordshire] Use 'days ago' format on problem listspezholio2017-02-27-3/+51
|/ | | | Fixes mysociety/fixmystreetforcouncils#98
* [Travis] Switch notification to Freenode.Matthew Somerville2017-02-20-1/+1
|
* Merge branch 'issues/forcouncils/168-stateful-sending-solution'Dave Arter2017-02-20-3/+4
|\
| * Reports need external_id to be included in RDI downloadDave Arter2017-02-20-0/+1
| | | | | | | | | | | | | | | | | | | | | | Reports in the generated Exor RDI file need to have an external_id so they can be linked to existing enquiries (PEMs) when the RDI is imported into Exor. There is a small window of opportunity for a report to be created, inspected and downloaded in an RDI before it's been sent to Exor via Open311 and had an external_id assigned. This commit closes that window by excluding reports from the RDI that don't have an external_id. Fixes mysociety/fixmystreetforcouncils#168
| * Send open reports regardless of current stateDave Arter2017-02-20-3/+3
|/
* Include /admin link on top-level nav for admin usersDave Arter2017-02-16-0/+4
| | | | Fixes mysociety/fixmystreetforcouncils#166
* [Oxfordshire] Open311 update timestamps should be in UTCDave Arter2017-02-15-1/+17
| | | | | | | | | | The timestamps returned from the database are in server-local time, not UTC. Because FMS expects timestamps in Open311 responses to be UTC, the timestamps of updates from OCC appear one hour ahead when DST is in effect. This commit converts the timestamps to UTC before outputting them. Fixes mysociety/FixMyStreet-Commercial#499
* Merge branch 'issues/forcouncils/127-exor-rdi-csv-output'Dave Arter2017-02-15-57/+483
|\
| * [Oxfordshire] Add Exor RDI file download featureDave Arter2017-02-15-5/+342
| | | | | | | | | | | | | | | | | | | | The RDI file format encapsulates information about inspections that have taken place, and can be uploaded into Exor to create defects in bulk. This commit adds a page to the Oxfordshire cobrand's admin allowing RDI files to be generated and downloaded from FMS. For mysociety/fixmystreetforcouncils#127
| * [Oxfordshire] Don't show user reputation on other cobrandsDave Arter2017-02-15-8/+9
| |
| * [Oxfordshire] Add initials field to admin user edit formDave Arter2017-02-15-0/+36
| |
| * Allow cobrands to control which states affect reputationDave Arter2017-02-15-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | Rather than assigning +1 to a user's reputation every time a report is inspected, this allows cobrands to specify which states should increment or decrement the reputation value when a report is inspected. The default behaviour is for reputation to never be changed, but the Oxfordshire cobrand will increment the reputation when a report is marked as 'action scheduled'. For mysociety/fixmystreetforcouncils#119
| * Clarify ‘inspected’ behaviourDave Arter2017-02-15-14/+20
| | | | | | | | | | | | A report is now considered 'inspected' if its state was changed by an inspector. Additionally, an AdminLog entry is created so the time of inspection and inspector can be recorded.
| * Add external_id field to ResponsePriority for use with ExorDave Arter2017-02-15-2/+23
| |
| * Add cobrand call_hook fn, calls a fn if defined.Matthew Somerville2017-02-15-25/+23
|/
* Merge branch 'issues/forcouncils/51-close-old-reports'Dave Arter2017-02-15-11/+584
|\
| * [Oxfordshire] Old report archiving scriptpezholio2017-02-15-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script can be used for the bulk closure of old reports that haven't been updated in a long time. Reports that haven't been updated in a *really* long time (since 2014, by default) are simply closed, and those that haven't been updated since 2015 (by default) are closed and an email explaining the closure is sent to the report creator. This script can be used for other cobrands, but they'll need an archive.{txt,html} template in order for the emails to be sent. For mysociety/fixmystreetforcouncils#51
| * Use Token params for redirect on loginpezholio2017-02-15-3/+7
| | | | | | | | | | Tokens can include a 'p' field in their data to set query params for the post-login redirect URL.
| * Add Problem->tokenised_url for logging user inpezholio2017-02-15-2/+55
| | | | | | | | | | | | This method creates a token that logs the reporting user in, optionally with some parameters which are stored with the token for use when redirecting after login.
| * Allow users to reopen closed reportspezholio2017-02-15-3/+7
| | | | | | | | Users can reopen their own reports when leaving an update.
| * Add Problem->time_ago for pretty-printed durationpezholio2017-02-15-0/+58
| |
| * Utils::prettify_duration improvementspezholio2017-02-15-3/+38
|/ | | | | - Add year and month to $nearest options - Allow prettify_duration to choose a sensible $nearest if omitted
* Merge branch 'issues/forcouncils/69-redirect-on-login'Dave Arter2017-02-14-245/+135
|\
| * [SeeSomething] Use new main_nav.html for main menuDave Arter2017-02-14-9/+4
| |
| * [UK Councils] Use new main_nav.html for main menuDave Arter2017-02-14-205/+30
| |
| * Refactor main nav into reusable blocksDave Arter2017-02-14-29/+80
| |
| * Redirect to category-filtered /reports on loginDave Arter2017-02-14-1/+20
| | | | | | | | If the user has a from_body and at least one category set.