aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'version-3.0.1'v3.0.1Matthew Somerville2020-05-06-4286/+4229
|\
| * Version 3.0.1.Matthew Somerville2020-05-06-4286/+4229
| |
* | [Bristol] Add admin_user_domainDave Arter2020-05-06-0/+2
|/ | | | Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1882
* [East Sussex] Fix sending of notices, tidy up.Matthew Somerville2020-05-06-18/+52
| | | | | variable is the string 'true' or 'false' from Open311. Store the original detail so we can reset back to it more easily.
* Fix breaking test.Matthew Somerville2020-05-06-1/+1
| | | | The change in cc2b8f54 made a typo in the default argument.
* [Buckinghamshire] Add additional domain to admin_user_domainDave Arter2020-05-06-1/+1
|
* [BANES] Add script to close redundant reportsChris Mytton2020-05-06-2/+72
| | | | | | | | | B&NES have sent us a spreadsheet with a list of reports along with their IDs that they want marking as "No further action" along with a specific update. This script takes a comma-separated list of report IDs and closes those reports, leaving the appropriate comment text.
* Pass class argument to council_area_id in fixture scriptChris Mytton2020-05-05-1/+1
| | | | | The TfL council_area_id sub uses the `$_[0]` argument to call other cobrand methods, but that argument wasn't being passed in here.
* Merge branch 'comment-count-fix'Matthew Somerville2020-05-05-11/+26
|\
| * Fix sorting by most commented on /around map view.Matthew Somerville2020-05-04-11/+26
| |
* | [Peterborough] Add COVID-19 bannerDave Arter2020-05-05-1/+20
| | | | | | | | For https://github.com/mysociety/fixmystreet-commercial/issues/1880
* | Merge branch 'fix-oxfordshire-test'Matthew Somerville2020-05-05-25/+14
|\ \
| * | Fix unpredictable tests.Matthew Somerville2020-05-05-25/+14
| |/ | | | | | | The database could return rows in differing orders.
* | Merge remote-tracking branch 'origin/remove-postcode-form-margin-right'Matthew Somerville2020-05-05-1/+1
|\ \
| * | Remove unnecessary margin-right on #postcodeFormZarino Zappia2020-05-04-1/+1
| |/ | | | | | | | | Not sure why this margin was even here. Appears to have been present since the original FMS redesign in 2012.
* / Allow template to be an initial update on reports.Matthew Somerville2020-05-04-5/+121
|/
* Merge branch '3003-update-g-l-d'Matthew Somerville2020-05-01-10/+8
|\
| * Update Getopt::Long::Descriptive to stop warning.Matthew Somerville2020-04-30-10/+8
| | | | | | | | Fixes #3003.
* | [Docs] Add deep linking page to Pro manual.Matthew Somerville2020-05-01-3/+96
| |
* | Merge remote-tracking branch 'origin/remove-survey-banner-april-2020'Matthew Somerville2020-05-01-151/+0
|\ \
| * | Revert "[fixmystreet.com] Survey banner"Martin Wright2020-04-30-151/+0
| | | | | | | | | | | | This reverts commit 724dde2244262d9a51ba55203a9f63c6e6a345f8.
* | | [Oxfordshire] Include Exor problem reference in CSV exportDave Arter2020-04-30-5/+18
|/ / | | | | | | | | | | The Exor reference was missed from the previous commit. For https://github.com/mysociety/fixmystreet-commercial/issues/1876
* / [TfL] Add shelter_id asset attribute mappingDave Arter2020-04-29-0/+1
|/
* Merge branch 'server-side-cursor-dashboard-export'Matthew Somerville2020-04-29-7/+151
|\
| * Only request needed join data in places.Matthew Somerville2020-04-28-7/+16
| | | | | | | | | | The export flow and the admin search request more data from the database than they need, which slows it down.
| * Use server cursors on dashboard export.Matthew Somerville2020-04-28-0/+2
| |
| * Add dbic-pg-server-cursors library, set as defaultMatthew Somerville2020-04-28-0/+133
| | | | | | | | Found at https://github.com/mzealey/dbic-pg-server-cursors, not on CPAN.
* | Merge branch 'sending-dæmon'Matthew Somerville2020-04-29-78/+288
|\ \
| * | Add sending updates capability to daemon.Matthew Somerville2020-04-28-49/+99
| | |
| * | Have a daemon that can send reports.Matthew Somerville2020-04-28-30/+190
| | |
* | | Merge branch 'cached_recent_order' of git://github.com/Sambruk/fixmystreetMatthew Somerville2020-04-29-1/+1
|\ \ \
| * | | Makes sure cached recent reports are displayed in order.Joe Siltberg2020-04-29-1/+1
| | | | | | | | | | | | | | | | Fixes #2999
* | | | [Oxfordshire] Include external problem reference in CSV exportDave Arter2020-04-29-0/+44
|/ / / | | | | | | | | | For https://github.com/mysociety/fixmystreet-commercial/issues/1876
* | | [EastSussex] display council reference number on reportStruan Donald2020-04-29-1/+1
| | |
* | | [EastSussex] display information about selected assetsStruan Donald2020-04-29-3/+35
| | | | | | | | | | | | Also update list of categories for asset display
* | | [EastSussex] set the group to the optgroup labelStruan Donald2020-04-29-1/+11
| | | | | | | | | | | | | | | Some categories are in multiple groups so pass back the optgroup label so we can assign it to the correct group and category
* | | [EastSussex] display assets on .comStruan Donald2020-04-29-0/+98
| | | | | | | | | | | | | | | Add assets for drains, grit bins and street lights. Uses east sussex specific protocol and format
* | | [East Sussex] add additional question to text for open311Struan Donald2020-04-29-0/+32
| | | | | | | | | | | | | | | The extra question data is added here rather than in the adapter as we have the question text along with the answer here.
* | | [EastSussex] add basic cobrandStruan Donald2020-04-29-0/+9
|/ / | | | | | | | | This is required so we can use groups when fetching categories over open311.
* | Merge branch 'peterborough-skanska-ref'Matthew Somerville2020-04-28-0/+15
|\ \
| * | [Peterborough] Include Skanska ref in description.Matthew Somerville2020-04-28-0/+15
| |/
* / Error page when submitting /import with web param.Matthew Somerville2020-04-28-24/+44
|/ | | | | | If the web param is used, show an error web page rather than the normal plain text output. Also do the normal remember/show uploaded photos feature, and hide the inputs better if unneeded.
*---. Merge branches '2961-disable-private-tickbox', ↵Matthew Somerville2020-04-28-66/+93
|\ \ \ | | | | | | | | | | | | '2962-pin-move-category-group' and 'move-admin-index-stats-to-stats-page'
| | | * Move stats from main admin index to stats index.Matthew Somerville2020-04-24-57/+68
| | | | | | | | | | | | | | | | | | | | These stats can take a while to generate, and we don't want to slow down people mostly coming to the admin index to do something else.
| | | * [UK] No FMS graph link on UK cobrand pages.Matthew Somerville2020-04-24-0/+2
| | | |
| | | * Do not calculate user count on status page.Matthew Somerville2020-04-24-7/+4
| | | |
| | * | Maintain category group on pin move.Matthew Somerville2020-04-24-1/+5
| | |/ | | | | | | | | | | | | | | | | | | If the same category is in multiple groups, upon moving the pin and fetching new categories from the server it would then pick the last instance of that category in the list. Instead of using val(), pick the correct entry in the previously selected optgroup.
| * / Disable staff private tickbox if category private.Matthew Somerville2020-04-24-1/+14
| |/ | | | | | | | | | | | | If a category is marked private, new reports are always marked private regardless of the setting of the private checkbox shown to relevant staff when making a new report. So tick/disable this box in that situation to prevent any confusion.
* | Add contact flag to protect category/group names from Open311 changesDave Arter2020-04-28-2/+73
| | | | | | | | | | | | | | Adds a new tickbox to the contact editing form that protects the category and group names from being changed by Open311. For mysociety/fixmystreet-commercial#1776
* | Respect SKIP_PACKAGES_INSTALL when not in Docker tooDave Arter2020-04-27-7/+7
|/ | | | | | When working locally it’s not convenient to always run install_packages as part of ./script/update, so this commit allows you to define the SKIP_PACKAGES_INSTALL environment variable to stop that.