aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* [FiksGataMi] Update email templatesfiksgatami-email-templatesMarius Halden2019-10-31-46/+745
* Merge tag 'v2.6' into fiksgatami-devMarius Halden2019-10-30-56420/+104543
|\
| * Version 2.6.v2.6Matthew Somerville2019-05-03-23422/+25755
| * Update translations from Transifex.Matthew Somerville2019-05-03-202/+203
| * Do not use SET with html filter.Matthew Somerville2019-05-03-6/+6
| * Merge branch 'moderation-dst-time'Matthew Somerville2019-05-03-698/+405
| |\
| | * Rename DB::ReportExtraFields to ReportExtraField.Matthew Somerville2019-05-02-13/+19
| | * Use EncodedColumn subclass.Matthew Somerville2019-05-02-344/+130
| | * Refactor datetime inflation.Matthew Somerville2019-05-02-406/+316
| | * Fix some incorrect timezone code.Matthew Somerville2019-05-02-17/+20
| | * Stop warning in contact test.Matthew Somerville2019-05-02-0/+2
| * | Custom layout for admin user permission checkboxesZarino Zappia2019-05-02-1/+25
| * | Fieldsets/legends for admin checkbox listsZarino Zappia2019-05-01-50/+53
| * | Tidy up "Categories:" checkbox lists on admin pagesZarino Zappia2019-05-01-4/+7
| * | [UK] Deal with setup where county may be missing.Matthew Somerville2019-04-29-2/+5
| |/
| * Merge branch 'tidy_up' of https://github.com/tomhukins/fixmystreetMatthew Somerville2019-04-24-8/+5
| |\
| | * Remove an unused module from the dependency listTom Hukins2019-04-12-1/+0
| | * Explicitly pass one argument to encode_json()Tom Hukins2019-04-09-3/+3
| | * Avoid string evalTom Hukins2019-04-09-3/+2
| | * Stop loading an unused moduleTom Hukins2019-04-09-1/+0
| * | Use REQUEST_URI, not PATH_INFO, to infer path.Matthew Somerville2019-04-24-0/+6
| * | Escape body name in admin title.Matthew Somerville2019-04-24-2/+5
| * | [BANES] Turn on new duplicate suggesting.Matthew Somerville2019-04-23-0/+2
| * | [Northamptonshire] only clear current layer on reloadStruan Donald2019-04-23-3/+2
| * | [Northamptonshire] update vegetation subcategory layersStruan Donald2019-04-23-2/+2
| * | [Northamptonshire] set layer ids based on live/not liveStruan Donald2019-04-23-10/+11
| * | fire asset not found if asset layer is not visibleStruan Donald2019-04-23-0/+2
| * | [Northamptonshire] add streetlight category messageStruan Donald2019-04-23-1/+23
| * | [Open311] Ensures non_public/hidden reports aren’t visible at /open311Dave Arter2019-04-23-2/+45
| * | [Northamptonshire] include google tracking code in headerStruan Donald2019-04-12-0/+1
| |/
| * [Open311] handle bad FixMyStreet id in updatesStruan Donald2019-04-09-0/+40
| * [Northamptonshire] update layer idsStruan Donald2019-04-09-7/+7
| * set maxlength attribute on inputs if present in validationStruan Donald2019-04-09-0/+5
| * [Northamptonshire] restrict title to 120 charactersStruan Donald2019-04-09-2/+46
| * [Northamptonshire] use the correct layer environment for assetsStruan Donald2019-04-08-2/+12
| * [Northamptonshire] update footer privacy policy linkStruan Donald2019-04-08-1/+1
| * ignore always_visible layers in layer visibility changeStruan Donald2019-04-05-1/+1
| * [Northamptonshire] make no asset and emergency code cooperateStruan Donald2019-04-05-9/+37
| * [Northamptonshire] do not show emergency message for HE roadsStruan Donald2019-04-05-1/+1
| * Merge branch 'docs-email-update'Matthew Somerville2019-04-05-27/+4
| |\
| | * Remove email address from docs.abimysoc2019-04-05-27/+4
| * | Merge branch 'open311-better-get-error'Matthew Somerville2019-04-05-62/+42
| |\ \ | | |/ | |/|
| | * [Open311] Factor GET/POST calls together.Matthew Somerville2019-04-05-62/+42
| * | Merge branch '2435-admin-anonymous-report'Matthew Somerville2019-04-05-16/+22
| |\ \
| | * | Fix superusers creating anonymous reports.Matthew Somerville2019-04-05-16/+22
| | |/
| * | [UK] Deal with 2019 local government changes.Matthew Somerville2019-04-04-4/+49
| * | Factor to common FixMyStreet::MapIt call.Matthew Somerville2019-04-04-54/+50
| |/
| * [fixmystreet.com] extra not responsible messages for NCCStruan Donald2019-04-04-0/+13
| * [Northamptonshire] prevent reports unless clicking on an assetStruan Donald2019-04-04-0/+100
| * [Northamptonshire] No form on emergency categoriesMatthew Somerville2019-04-04-0/+26