aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'missing-council-js'Matthew Somerville2020-02-14-164/+51
|\ \
| * | [UK Councils] Factor footer JS templates together.Matthew Somerville2020-02-13-171/+51
| | |
| * | [UK Councils] Include highways code where relevantMatthew Somerville2020-02-13-0/+7
| | |
| * | [UK Councils] Make sure js.js included in all.Matthew Somerville2020-02-13-17/+17
| | |
* | | Merge branch 'private-in-email'Matthew Somerville2020-02-14-46/+216
|\ \ \ | |/ / |/| |
| * | Reword/hide things viewing unauthed private reportMatthew Somerville2020-02-13-0/+13
| | | | | | | | | | | | | | | | | | If you've e.g. come from an email link that lets you view a private report, hide reporting/getting updates/sharing, and replace the update form with a link saying you need to sign in.
| * | Link in other-reported email shows private report.Matthew Somerville2020-02-13-46/+132
| | | | | | | | | | | | | | | Use a token that does not log the user in, but lets the report be shown, even if it's a private report. Allow old tokens of that type to work.
| * | Include explanation in email if a private report.Matthew Somerville2020-02-13-0/+71
| |/
* | Reveal report form heading when making a private reportDave Arter2020-02-12-1/+1
| | | | | | | | | | | | jQuery.show doesn’t override the `visibility: hidden` applied to the .hidden-js class, so we remove this class on the form heading at the same time as showing it.
* | Fix category extra AJAX call for categories with ampersandsDave Arter2020-02-12-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `IF category_extras.$category.size` condition in category_extras.html was using an escaped string for `$category`, meaning the lookup would always fail for categories that had an ampersand in their name. The result of this was an empty `<div id="category_meta">`, and no extra fields shown to the user. This caused issues when one or more of the fields were required, as they were always empty and the error message wasn't being rendered and shown to the user. This meant the user would see their report form over and over again when submitting instead of useful feedback. We also ensure $category is always a SafeString when used as a key into a hashref in other templates. Fixes https://github.com/mysociety/fixmystreet-freshdesk/issues/126
* | Merge branch 'issues/freshdesk/377-adopted-highways-restrictions'Graeme Porteous2020-02-12-3/+12
|\ \ | |/ |/|
| * [BANES] Limit categories to adopted highways layerGraeme Porteous2020-02-11-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Restrict the following categories to 'Adopted Highways' layer: 'Blocked drain surface' 'Blocked drain' 'Damaged Railing, manhole, or drain cover' 'Damaged bollard or post' 'Damaged road sign' 'Damaged street nameplate' 'Faded road markings' 'Flooding of a road or pavement'
* | [Isle of Wight] Add extra advisory text above report form.Dave Arter2020-02-11-0/+1
| | | | | | | | For https://github.com/mysociety/fixmystreet-freshdesk/issues/123
* | [Zürich] Fix crash on certain /report/ajax/<id> URLsDave Arter2020-02-10-1/+17
|/ | | | | | | | | | | | Attempting to load the /report/ajax/<id> URL for a problem that had a public response and wasn't in the ‘external’ state was causing a crash because the call to FixMyStreet::App::View::Web::add_links in updates_as_hashref was returning a FixMyStreet::Template::SafeString that the JSON module didn't know how to serialise. This commit adds a TO_JSON method to SafeString, and ensures the output of /report/ajax is JSON-encoded with convert_blessed turned on so the TO_JSON method is called.
* Merge remote-tracking branch 'Sambruk/libpng-in-generic-packages'Matthew Somerville2020-02-07-0/+2
|\
| * Add libpng-dev to package lists (generic and for Docker)Joe Siltberg2020-02-07-0/+2
| |
* | [TfL] Include borough flytipping categories on red routesDave Arter2020-02-07-10/+22
| | | | | | | | | | | | | | | | | | | | | | On the TfL cobrand, this treats the 'Flytipping (TfL)' category the same as the existing 'General Litter' and redirects users to fixmystreet.com. On fixmystreet.com, borough flytipping categories are included in those available on red routes. For https://github.com/mysociety/fixmystreet-freshdesk/issues/120
* | Allow class attribute to be set on a elements in form fieldsDave Arter2020-02-07-1/+1
| | | | | | | | | | This is handy for certain inputs that tie in to existing JS in the codebase, e.g. the TfL ‘category disabled’ messages that have a lat/lon appended by JS.
* | Merge remote-tracking branch 'origin/travis-cypress-3'M Somerville2020-02-07-1/+1
|\ \
| * | [Travis] Pin cypress to version 3.Matthew Somerville2020-02-07-1/+1
| |/
* / [Northamptonshire] Update front page steps textDave Arter2020-02-06-2/+2
|/ | | | For https://github.com/mysociety/fixmystreet-freshdesk/issues/119
* ignore tilma and rw.org requests in cypress testsStruan Donald2020-02-06-1/+1
|
* [Northamptonshire] switch cypress tests away from treesStruan Donald2020-02-06-26/+26
| | | | | Because trees now allow you to click on a highway as well as a tree it's simpler to switch the tests to a different type
* enable layer snap threshold to be 0 to disable snappingStruan Donald2020-02-06-1/+4
|
* [Northamptonshire] remove snapping for Trees layerStruan Donald2020-02-06-1/+5
|
* [Northamptonshire] update Vegetation asset layersStruan Donald2020-02-06-3/+6
| | | | Allow all categories to make a report on roads or tree assets.
* [UK Councils] Make sure TfL link works everywhere.Matthew Somerville2020-02-06-1/+9
|
* Merge branch 'bexley-ooh-p1-highways'Matthew Somerville2020-02-05-6/+7
|\
| * [Bexley] Highways/covers out-of-hours matching P1.Matthew Somerville2020-02-04-6/+7
| |
* | [UK] Use feature flag for send_questionnaire.Matthew Somerville2020-02-04-11/+22
|/
* [Peterborough] Add message to front page.Matthew Somerville2020-02-03-0/+12
|
* Merge remote-tracking branch 'origin/2667-improve-mobile-try-again'Matthew Somerville2020-02-03-83/+118
|\
| * Improve try again on mobile.Matthew Somerville2020-01-31-9/+28
| |
| * Restrict lat/lon in URL/fields to 6dp.Matthew Somerville2020-01-31-6/+6
| |
| * No history entry for updates to new pin location.Matthew Somerville2020-01-31-3/+7
| |
| * Create helper function for translation template.Matthew Somerville2020-01-31-67/+79
| |
* | [Hounslow,IoW] Revert switch of map type.Matthew Somerville2020-01-31-2/+2
| | | | | | | | This reverts commit c82b1734cd2b5f224e3d4779972e4dcdefb41c7f.
* | Merge branch 'admin-user-logged-preference'Matthew Somerville2020-01-31-2/+2
|\ \ | |/ |/|
| * Default logging to logged in user.Matthew Somerville2020-01-31-2/+2
| | | | | | | | | | | | | | | | | | Historically, the FixMyStreet admin was accessed via HTTP Basic Auth and a secure proxy, so the auth user was used for logging purposes. Nowadays all admin use is by FixMyStreet user, and any Basic Auth is used for the purpose of hiding staging sites from bots. This configuration means that on those staging sites, all admin is logged by the one staging user, not the actual user, so let's swap that round.
* | Don’t highlight duplicate pins on mobileDave Arter2020-01-31-9/+15
| | | | | | | | | | The presence of the ‘mouseenter’ handler meant two taps were required to expand the report preview.
* | Display inline map for duplicate suggestions on mobileDave Arter2020-01-31-5/+31
|/ | | | For #2668.
* Merge branch 'tfl-map-filter-category-groups'Matthew Somerville2020-01-30-18/+68
|\
| * Enable category groups on map filter dropdown.Dave Arter2020-01-30-18/+68
| | | | | | | | Includes an updated version of jquery-multi-select.
* | Merge branch 'remove-pan-from-mobile'Matthew Somerville2020-01-30-15/+21
|\ \
| * | Remove pan control from mobile widths.Matthew Somerville2020-01-30-15/+21
| |/
* | [Zurich] Not sure what this exemption was for.Matthew Somerville2020-01-30-4/+2
| |
* | Stop capitalising key tools.Matthew Somerville2020-01-30-1/+0
| |
* | Keep report updates link in usual place on mobile.Matthew Somerville2020-01-30-1/+1
| |
* | After login during update, separate form/report.Matthew Somerville2020-01-30-0/+1
| |
* | Use nicer default photo upload message.Matthew Somerville2020-01-30-3/+8
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 19:14:20 +0000