aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
|\ \ \
| * | | [Lincolnshire] WFS layer for server-side filteringMatthew Somerville2019-10-28-64/+12
| | | |
| * | | Only add filter strategy if HTTP WFS being used.Matthew Somerville2019-10-28-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | If GET-based WFS is being used, no server-side filtering takes place, so we need a client side filter to perform the same job. But if normal POST WFS is being used, the server-side filtering has already been performed, so no need to do it again (in fact, no need to return the data necessary to do such filtering either).
* | / [Mobile] Make sure disable message findable by appMatthew Somerville2019-10-30-5/+17
| |/ |/| | | | | | | | | | | | | | | | | The mobile app is looking at the old extra.datatype_description location rather than the new disable_form location for per-question disabling (it does look there for all-category disabling). So we need to make sure the JSON includes the message in the place where it will be looking. Note if an extra data question has two answers that disable the form and they have different messaging, the app will only take one of them.
* | Fix some tests not running offline.Matthew Somerville2019-10-28-4/+22
| |
* | [UK] Fix couple of test warnings.Matthew Somerville2019-10-28-3/+3
| | | | | | | | Confirm phone validation, Westminster test name, BANES undef.
* | [UK] Factor out Confirm open311_config to role.Matthew Somerville2019-10-28-157/+58
|/
* Merge remote-tracking branch 'origin/master'Matthew Somerville2019-10-28-29/+178
|\
| * add a get_extra_field method to Extra roleStruan Donald2019-10-28-0/+67
| | | | | | | | | | accepts name or code for finding the field. Useful for checking for individual open311 fields that don't have a value.
| * allow emergency message script to add category messagesStruan Donald2019-10-28-29/+52
| | | | | | | | | | also add an update only option to only update existing messages and not add new ones
| * [Northamptonshire] script to update emergency messageStruan Donald2019-10-28-0/+59
| | | | | | | | To avoid having to do it all by hand
* | Use category text, not value in staff prefill.Matthew Somerville2019-10-25-1/+1
| |
* | [BANES] Override category display name.Matthew Somerville2019-10-25-2/+55
| |
* | Allow cobrands to override category display.Matthew Somerville2019-10-25-35/+50
| |
* | Allow editing of category name.Matthew Somerville2019-10-25-8/+36
| |
* | Make contact edit note optional on staging sites.Matthew Somerville2019-10-25-3/+4
| |
* | Refactor admin body creation/editing together.Matthew Somerville2019-10-25-153/+154
|/