aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Fix lookups in templates of categories with &s.Matthew Somerville2020-07-16-26/+37
| | | | | | | | | | | | A hash lookup in a template is escaping the key used, meaning the lookup is failing anywhere we are using a category containing an ampersand as a key. A continuation of the changes made in 527d763b.
* | Merge branch 'osm-aerial-tiles'Matthew Somerville2020-07-16-33/+32
|\ \
| * | Default to aerial map in JS if aerial given in URL.Matthew Somerville2020-07-16-0/+4
| | |
| * | Add aerial option to OSM maps.Matthew Somerville2020-07-16-20/+20
| | |
| * | Tidy up map_sub_links in templates.Matthew Somerville2020-07-16-14/+9
| |/
* | Spot user set on update not at object creation.Matthew Somerville2020-07-16-0/+21
| | | | | | | | | | | | | | The changes in 67823bc78 create the necessary metadata at the creation of a Comment object, but if the user is not included at that point but later (as is done by the normal public update flow), then it would not be created. Wrap the user accessor so we can make sure it is set.
* | [TfL] remove COVID-19 front page textStruan Donald2020-07-16-12/+0
|/ | | | Fixes mysociety/fimystreet-commercial#1939
* Merge branch '2930-sudo-optional'Matthew Somerville2020-07-16-21/+13
|\
| * Do not have bootstrap run sudo commands.Matthew Somerville2020-07-15-21/+13
| | | | | | | | | | | | | | | | | | Your site user may not have access to sudo, and your admin user may cause permission issues if used to do the git checkout, or the Perl module installation. Document the separate script to install system packages instead. Co-authored-by: Sam Pearson <sam@mysociety.org>
* | Merge branch 'issues/commercial/1886-site-wide-permissions'Matthew Somerville2020-07-16-2/+50
|\ \
| * | [UK] Show message if site-wide update disallowed.Matthew Somerville2020-07-14-0/+37
| | |
| * | [.com] Fix original-reporter-only update message.Matthew Somerville2020-07-14-2/+13
| | | | | | | | | | | | The function call was changed/renamed in 4fe75bb17.
* | | [HighwaysEngland] change where heard from optionsStruan Donald2020-07-15-1/+1
| | |
* | | [HighwaysEngland] add notice about offensive languageStruan Donald2020-07-15-0/+6
| |/ |/| | | | | Below description.
* | Centralise update creation to include fields.Matthew Somerville2020-07-14-103/+107
| | | | | | | | | | | | Given the user, we can infer the name if not provided, and the extra data if a staff user. We can also provide defaults for various other fields. Always have superuser take precedence over from_body.
* | Remove use of jQuery toggle().Matthew Somerville2020-07-14-2/+10
| |
* | Make aerial/roads translatable in JavaScript.Matthew Somerville2020-07-14-7/+4
| |
* | Fix non-JS aerial tile display.Matthew Somerville2020-07-14-6/+73
|/
* Merge branch 'issues/commercial/1870-aerial-maps'Matthew Somerville2020-07-13-62/+131
|\
| * Add aerial view toggle to Bing Maps & subclasses.Struan Donald2020-07-10-20/+91
| | | | | | | | | | Co-authored-by: Dave Arter <davea@mysociety.org> Co-authored-by: Matthew Somerville <matthew@mysociety.org>
| * Use up-to-date Bing map URLs.Matthew Somerville2020-07-10-31/+30
| |
| * [Bromley] Tidy up tilma URL bits.Matthew Somerville2020-07-10-14/+12
| |
* | Merge branch 'peterborough-remove-link-repeat'Matthew Somerville2020-07-13-19/+2
|\ \
| * | [Peterborough,TfL] Remove unneeded CSS.Matthew Somerville2020-07-10-19/+2
| | |
* | | [Northamptonshire] handle further investigation stateStruan Donald2020-07-13-4/+45
|/ / | | | | | | | | | | If an update has an external_status code of further we display 'Under futher investigation' on the site. This is for acknowledging comments from users.
* / [Open311] Make exclude field list case-insensitive.Matthew Somerville2020-07-10-1/+1
|/
* [UK] Show data from StreetManager.Matthew Somerville2020-07-09-109/+150
|
* Merge branch 'he-category-interactions'Matthew Somerville2020-07-09-81/+48
|\
| * Change that fixes test on Travis.Matthew Somerville2020-07-08-1/+1
| |
| * [UK] Ignore Highways England extra data.Matthew Somerville2020-07-08-1/+2
| | | | | | | | | | | | | | | | | | If a report is made on a HE road, but it is not to be sent to HE (so the user has picked it's not on the HE road) and the category name is shared between council and HE, then the extra HE data (area, road, & sector) is still saved on the report, and our open311-adapter rejects it due to the additionnal information present. So make sure we remove this data before sending.
| * [UK] More consistent use of open311_extra_data.Matthew Somerville2020-07-08-78/+27
| | | | | | | | | | Have function call two functions set in subclasses, clearer and fewer overrides needed.
| * [Buckinghamshire] Handle HE flytipping reports.Matthew Somerville2020-07-08-1/+18
| | | | | | | | | | We do not want to recategorise a report into the off-road category if it is going to be sent to Highways England.
* | [fixmystreet.com] Advertise webinars in _submit_footer.htmlMyfanwyNixon2020-07-08-5/+7
|/ | | | | Change the dashboard promo to a webinar promo, in the email sent to councils.
* Merge branch 'hibp'Matthew Somerville2020-07-08-14/+62
|\
| * Add option to check password on Have I Been Pwned.Matthew Somerville2020-07-07-14/+62
| | | | | | | | | | | | | | If switched on, sends first five letters of the SHA1 hash of the entered password to HIBP's API, which then returns all matching hashes in their database of breached passwords. If we find a match, tell the user they need to pick a different password.
* | Merge branch 'fix-moderation-diff-display'Matthew Somerville2020-07-08-4/+21
|\ \
| * | Provide list of keys to ignore in moderation diff.Matthew Somerville2020-07-07-1/+16
| | | | | | | | | | | | | | | This is a current full list of extra keys that could be set on a report that could confuse the moderation diff display.
| * | Only show removed in moderation diff if non-blank.Matthew Somerville2020-07-07-1/+1
| | |
| * | Handle arrayrefs in moderation extra diff display.Matthew Somerville2020-07-07-1/+3
| | |
| * | Make sure string_diff does not return undef.Matthew Somerville2020-07-07-1/+1
| |/ | | | | | | | | As string_diff is used in hash values, it must always return something, otherwise you could end up with e.g. category => 'extra'.
* / Better sort admin user table.Matthew Somerville2020-07-07-14/+10
|/ | | | | Sort the table when showing search results, and show users without name at the bottom, rather than at the top.
* Merge branch 'fix-duplicate-asset-selection-message'Matthew Somerville2020-07-07-3/+8
|\
| * Fix duplicate message after dismissing suggestionsMatthew Somerville2020-07-06-2/+7
| | | | | | | | | | | | | | | | If we create one category_meta_message for each category, removing when not relevant, then duplicat suggestion showing leads to duplicate messages because the layer is still relevant, just not visible, and so the old layer message is not removed. Instead, repurpose the ID of any existing category_meta_message, so there is only ever one in existence.
| * [Buckinghamshire] Default unknown types to street light.Matthew Somerville2020-07-06-1/+1
| |
* | Merge branch 'rewrite-open311-update-reports'Matthew Somerville2020-07-07-494/+392
|\ \
| * | Factor out/default Open311 construction object.Matthew Somerville2020-07-06-44/+23
| | | | | | | | | | | | This simplifies the code wherever used.
| * | Rewrite open311-update-reports to share code.Matthew Somerville2020-07-06-465/+384
| |/ | | | | | | | | Make GetUpdates and GetServiceRequestUpdates share a common base; spot all visible states.
* | [Hackney] skip hackney categories for TfL red routesStruan Donald2020-07-06-2/+36
| | | | | | | | | | | | Because Hackney doesn't have any matching categories for TfL red routes skip sending the body, otherwise you get a "no contact details" message when you click on a red route in Hackney
* | Merge branch 'issues/commercial/1934-bristol-cobrand-categories'Struan Donald2020-07-06-1/+12
|\ \ | |/ |/|
| * [Bristol] Ensure categories edited via the admin are visible on cobrandDave Arter2020-07-03-1/+12
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 11:38:29 +0000