aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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
| * Ignore empty paragraphs in html_para.Matthew Somerville2019-11-08-2/+3
| * 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
|/
* Fix about template name being passed as username.Matthew Somerville2019-11-06-1/+1
* Fix password reset on 2FA accounts again.Matthew Somerville2019-11-05-2/+10
* 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
|/ /
* | [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
| |/ /
* | / [Mobile] Make sure disable message findable by appMatthew Somerville2019-10-30-5/+17
| |/ |/|
* | Fix some tests not running offline.Matthew Somerville2019-10-28-4/+22
* | [UK] Fix couple of test warnings.Matthew Somerville2019-10-28-3/+3
* | [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
| * allow emergency message script to add category messagesStruan Donald2019-10-28-29/+52
| * [Northamptonshire] script to update emergency messageStruan Donald2019-10-28-0/+59
* | 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
|/