aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* 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
| | |
| * | Factor out admin template code to own controller.Matthew Somerville2019-11-08-169/+183
| | |
* | | Store email addresses report sent to on the reportMatthew Somerville2019-11-10-0/+11
| |/ |/|
* | [Docs] Fix name of template for email logo settingsChris Mytton2019-11-08-1/+1
|/ | | | | | | | The logo_width and logo_height are set in _email_color_overrides.html, not _email_setting_overrides.html, so update the documentation to reflect that. [ci skip]
* Fix about template name being passed as username.Matthew Somerville2019-11-06-1/+1
| | | | | As this detach() comes from an action with an argument, that argument then got picked up as the override username.
* Fix password reset on 2FA accounts again.Matthew Somerville2019-11-05-2/+10
| | | | | | Just after fixing it, 3d593bc68 broke it again, because it took anyone who must have 2FA switched on to the must-have-2FA sign up flow, even if they already had 2FA set up.
* Merge branch 'password-expiry'Matthew Somerville2019-11-05-12/+108
|\
| * Add optional enforced password expiry.Matthew Somerville2019-11-04-10/+95
| |
| * Record time of password change.Matthew Somerville2019-11-04-2/+13
| |
* | Merge branch 'bucks-9-roads'Matthew Somerville2019-11-05-0/+1
|\ \
| * | [Buckinghamshire] Allow reporting on "9" roads.Matthew Somerville2019-11-04-0/+1
| | |
* | | [Borsetshire] Hide mySociety header on map pagesZarino Zappia2019-11-04-0/+4
|/ / | | | | | | | | The extra header was causing layout issues on the mobile map page at the point when you confirm a new report’s location.
* | [Peterborough] Disable questionnairesChris Mytton2019-11-01-0/+2
| |
* | Merge branch 'remove-extra-cat-heading'Matthew Somerville2019-10-31-17/+46
|\ \ | |/ |/|
| * Sort reporting categories in display order.Matthew Somerville2019-10-31-15/+44
| |
| * Do not output empty disable_form hash in ajax call.Matthew Somerville2019-10-29-1/+1
| |
| * Make extra questions heading visually hidden.Matthew Somerville2019-10-29-1/+1
| |
* | Merge branch '2fa-improvements'Matthew Somerville2019-10-31-346/+469
|\ \
| * | If 2FA enforced, do it for an email login as well.Matthew Somerville2019-10-30-1/+66
| | |
| * | Fix password reset on 2FA accounts.Matthew Somerville2019-10-30-5/+45
| | |
| * | Tidy up Security page.Matthew Somerville2019-10-30-10/+21
| | |
| * | [UK] Mandate 2FA on superusers.Matthew Somerville2019-10-30-10/+38
| | |
| * | Allow enforcement of 2FA for staff users.Matthew Somerville2019-10-30-19/+198
| | |
| * | Require code to be entered when activating 2FA.Matthew Somerville2019-10-28-38/+95
| | |
| * | Allow non-superusers to store 2FA secrets.Matthew Somerville2019-10-28-15/+20
| | |
| * | Move 2FA form template to subdirectory.Matthew Somerville2019-10-28-1/+1
| | |
| * | Remove unused inspection required/reputation code.Matthew Somerville2019-10-28-264/+0
| | |
* | | Merge branch 'wfs-client-filtering'Matthew Somerville2019-10-30-72/+20
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 05:14:12 +0000