aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | [Bexley] Switch to use MasterMap map typeChris Mytton2019-11-27-84/+1
| | | | | | | | | | | | | | | | | | Now that both Peterborough and Bexley are using MasterMap data we can combine them into a single "MasterMap" map type to reduce code duplication.
| * | [Peterborough] Add OS MasterMap map tilesChris Mytton2019-11-27-0/+87
| | | | | | | | | | | | | | | This adds a new "MasterMap" map type which uses tiles from Tilma to display MasterMap data.
* | | Merge branch 'configured-update-disallowed-message'Matthew Somerville2019-11-28-12/+46
|\ \ \ | |/ / |/| |
| * | [UK] Updates disallowed template work out message.Matthew Somerville2019-11-27-12/+46
| | |
* | | [BANES] Only allow Damage to pavement reports on pavementStruan Donald2019-11-27-1/+6
| | |
* | | [BANES] Only allow Damage to road reports on road.Matthew Somerville2019-11-27-0/+23
|/ /
* | add bodies_id to stash for around and report/newStruan Donald2019-11-26-4/+7
| | | | | | | | | | | | | | | | This resolved the problem of checking user body permissions on both around and report/new by adding a variable to stash specifically for this purpose. Previously staff users could not see the mark private tick if the report form was loaded via javascript from the around page as there was no bodies variable in the stash.
* | Merge branch 'issues/freshdesk/100-state-names-in-email'Struan Donald2019-11-26-1/+45
|\ \
| * | pass cobrand name to state display from alert scriptStruan Donald2019-11-26-1/+45
| |/ | | | | | | | | This was passing the cobrand object so the checks in State::display that were relying on the moniker were not working.
* / [UK,Zurich] Remove use of new window.Function.Matthew Somerville2019-11-26-2/+2
|/ | | | | This is so the file is not blocked by a Content-Security-Policy header. This has already been done in the other OpenLayer files.
* Merge branch 'peterborough-include-email-categories-on-cobrand'Struan Donald2019-11-25-13/+0
|\
| * [Peterborough] Include email categories on cobrandChris Mytton2019-11-22-13/+0
| | | | | | | | They've requested that these be added to the cobrand now.
* | [UK] Add nonce to all script tags lacking it.Matthew Somerville2019-11-25-15/+21
| |
* | Merge branch 'csp-uk'Matthew Somerville2019-11-25-13/+109
|\ \
| * | [UK] Uses a feature to allow per-cobrand CSP.Matthew Somerville2019-11-25-10/+29
| | |
| * | Add configuration for setting CSP header.Matthew Somerville2019-11-25-3/+80
| |/ | | | | | | | | | | This allows you to output a working Content-Security-Policy header, with optional third-party domains, by setting a new CONTENT_SECURITY_POLICY configuration option.
* | Merge branch 'qr-code-generator'Matthew Somerville2019-11-25-11/+46
|\ \
| * | Switch to internal QR code generator.Matthew Somerville2019-11-23-11/+46
| | |
* | | [Oxfordshire] re-enable inspector permissionsStruan Donald2019-11-22-34/+0
| | | | | | | | | | | | | | | Re-enable the inspector permissions that were disabled at a cobrand level
* | | script to update permissions of a body's usersStruan Donald2019-11-22-0/+70
|/ / | | | | | | | | Allows adding or removing a list of permissions to the users belonging to a body.
* | Rotate session ID after successful login.Matthew Somerville2019-11-22-15/+44
| |
* | Escape pager.current_page.Matthew Somerville2019-11-22-1/+3
| |
* | Replace use of FixMyStreet::App with DB in tests.Matthew Somerville2019-11-22-224/+213
|/
* [UK] Updates only by reporter on open reports confMatthew Somerville2019-11-19-4/+12
|
* Recheck cached front page details against databaseMatthew Somerville2019-11-18-4/+8
| | | | | It was only checking the cached details, so not spotting if a report had been hidden in the time since being cached.
* Remove cached photos before updating db field.Matthew Somerville2019-11-18-15/+37
| | | | | If the photo field is updated first, then the cache removal doesn't think there are any photos to remove.
* [Peterborough] Fix email link colour.Matthew Somerville2019-11-18-1/+3
|
* Merge branch 'issues/freshdesk/98-staff-ignore-emergency-message'Struan Donald2019-11-15-0/+64
|\
| * allow staff to submit in disabled categoriesStruan Donald2019-11-15-0/+64
| | | | | | | | | | | | | | If a user belongs to a body override the disabled form check upon submission as mostly staff users can submit in those categories. Fixes mysociety/fixmystreet-freshdesk#98
* | Merge branch 'rss-fix-greenwich'Matthew Somerville2019-11-15-7/+30
|\ \
| * | [UK] Fix Greenwich RSS feed.Matthew Somerville2019-11-15-7/+30
| |/
* | [Peterborough] [Westminster] Fix email/RSS image.Matthew Somerville2019-11-15-4/+4
| |
* | Add cobrand-specific XSL to RSS feeds.Matthew Somerville2019-11-15-4/+99
|/
* Merge branch 'bexley-reviewed'Matthew Somerville2019-11-13-31/+134
|\
| * [Bexley] Map NSG_REF as site_code for Confirm reportsChris Mytton2019-11-13-4/+10
| | | | | | | | | | Map the `NSG_REF` attribute to the `site_code` field in Bexley's Streets asset layer.
| * Allow multiple USRN mappings in asset layersChris Mytton2019-11-13-6/+11
| | | | | | | | | | | | | | This change modifies the `updateUSRNField` code to accept an array of configuration objects to allow mapping multiple asset attributes to form fields. This will be used in the Bexley Confirm integration (see next commit.)
| * Add integration test for setting a Confirm site_codeChris Mytton2019-11-13-1/+25
| | | | | | | | | | | | | | I want to change the `updateUSRNField` method so that it can accept an array of objects in the `usrn` key, but before doing that I want to add a test to ensure the existing behaviour is tested, to ensure I'm not breaking anything.
| * [Bexley] Provide Confirm parameters required.Matthew Somerville2019-11-13-20/+71
| |
| * [Bexley] Add trees layer.Matthew Somerville2019-11-13-0/+17
| |
* | Merge branch 'cheshire-east-reviewed'Matthew Somerville2019-11-10-4/+1303
|\ \ | |/ |/|
| * [Cheshire East] Initial cobrand.Matthew Somerville2019-11-10-2/+1301
| |
| * Make general-notes text size match other metadata.Matthew Somerville2019-11-10-1/+1
| |
| * Fix spacing issue in alert local RSS text.Matthew Somerville2019-11-10-1/+1
| |
* | Merge branch 'admin-auditing'Matthew Somerville2019-11-10-715/+1039
|\ \
| * | Add user admin log page.Matthew Somerville2019-11-08-6/+237
| | |
| * | Store a moderation history on admin report edit.Matthew Somerville2019-11-08-1/+23
| | |
| * | Add admin log entry for more objects and things.Matthew Somerville2019-11-08-18/+44
| | | | | | | | | | | | | | | Namely templates, roles, bodies, categories, various user edits, and when using the inspect form and changing category.
| * | Ignore empty paragraphs in html_para.Matthew Somerville2019-11-08-2/+3
| | | | | | | | | | | | And do not generate them needlessly.
| * | Refactor user controller to use chained action.Matthew Somerville2019-11-08-14/+22
| | |
| * | Factor out admin reports code to own controller.Matthew Somerville2019-11-08-507/+529
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 11:53:07 +0000