aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Indicate in report new AJAX if a category is privateDave Arter2019-07-09-0/+17
* Merge branch 'bucks-rename-asset_no'Matthew Somerville2019-07-09-15/+1
|\
| * [Bucks] Remove unneeded alt streetlight code.Matthew Somerville2019-07-08-15/+1
* | Merge branch 'darker-default-link-colour'Matthew Somerville2019-07-09-112/+54
|\ \
| * | WCAG AA compliant default link colourZarino Zappia2019-07-09-2/+2
| * | Sass variables for default link colour/decoration.Zarino Zappia2019-07-09-112/+54
| |/
* / Allow cobrands to disable admin resending.Matthew Somerville2019-07-09-6/+19
|/
* [Northamptonshire] turn on sending comments over Open311Struan Donald2019-07-05-3/+0
* Merge branch 'localise_optional' of git://github.com/Sambruk/fixmystreetMatthew Somerville2019-07-05-2/+2
|\
| * Localisation for 'optional' in contact forms.Joe Siltberg2019-07-05-2/+2
* | [Docs] Fix placeholder in templates docs.Matthew Somerville2019-07-05-1/+1
* | Merge branch 'keyboard-improvements'Matthew Somerville2019-07-05-2/+12
|\ \
| * | Fix label associations with category groups.Matthew Somerville2019-07-05-1/+4
| * | Dropzone accessible by keyboard.Matthew Somerville2019-07-05-1/+8
| |/
* | Update jquery.multi-select.min.jsMatthew Somerville2019-07-05-10/+11
* | [FixaMinGata] Multi-para formatting in email listsMatthew Somerville2019-07-05-2/+2
* | Remove quote mark in update emails.Matthew Somerville2019-07-05-1/+1
|/
* [Zurich] Change date for new FAQ category.Matthew Somerville2019-07-04-2/+2
* Merge branch 'newlines-in-updates'Matthew Somerville2019-07-02-2/+3
|\
| * Maintain formatting in email report/update lists.Matthew Somerville2019-07-02-2/+3
* | Merge branch 'zurich-help'Matthew Somerville2019-07-02-0/+6
|\ \
| * | [Zurich] Update FAQ text with new category.Matthew Somerville2019-07-02-0/+6
| |/
* | Merge branch '1084-quote-names'Matthew Somerville2019-07-02-193/+156
|\ \ | |/ |/|
| * Simpler admin search ordering.Matthew Somerville2019-06-26-3/+3
| * Fix Swedish number test in Ubuntu 18.04.Matthew Somerville2019-06-26-2/+4
| * Turn on quote_names.Matthew Somerville2019-06-26-189/+150
* | [Open311] Remove update problem matching warning.Matthew Somerville2019-06-26-11/+1
|/
* Merge branch 'improve-server-closest-road'Matthew Somerville2019-06-24-28/+62
|\
| * [UK] Improve server-side nearest road lookup.Matthew Somerville2019-06-21-26/+60
| * [Bexley] Increase road radius.Matthew Somerville2019-06-21-2/+2
* | Revert "[Bromley] Add temporary maintenance banner"Dave Arter2019-06-24-15/+0
|/
*-. Merge branches 'email-template-with-vars' and 'better-error-if-no-category'Matthew Somerville2019-06-21-28/+100
|\ \
| | * better error if category for report does not existStruan Donald2019-06-20-19/+47
| * | [Open311] Allow description in email template.Matthew Somerville2019-06-20-9/+53
| |/
* / [Bromley] Add temporary maintenance bannerDave Arter2019-06-20-0/+15
|/
* [Warwickshire] Reinstate footer template.Matthew Somerville2019-06-18-0/+7
* [UK} Remove now-unneeded functions.Matthew Somerville2019-06-17-5/+0
* Merge branch 'issues/2475-multiple-parents-for-categories'Matthew Somerville2019-06-17-48/+284
|\
| * admin interface for adding multiple groups to a categoryStruan Donald2019-06-17-3/+64
| * allow multiple groups in open311 services group tagStruan Donald2019-06-17-1/+182
| * display category under multiple groupsStruan Donald2019-06-17-3/+6
| * configure category_groups via COBRAND_FEATURESStruan Donald2019-06-17-41/+32
* | Merge branch 'issues/commercial/1375-bristol-redirects'Matthew Somerville2019-06-17-0/+17
|\ \
| * | [Bristol] redirect national site categoriesStruan Donald2019-06-17-0/+17
| |/
* | Merge branch 'cypress-vagrant-fix'Matthew Somerville2019-06-17-33/+54
|\ \ | |/ |/|
| * Add front-end testing support for WSL.Matthew Somerville2019-06-14-2/+17
| * Fix front-end testing script when run with VagrantZarino Zappia2019-06-14-32/+38
* | [Bristol] Fix duplicate footer.Matthew Somerville2019-06-14-54/+55
* | Merge remote-tracking branch 'origin/2366-access-map-filters-on-mobile'Matthew Somerville2019-06-14-14/+136
|\ \ | |/ |/|
| * Click behind map filters to close popup on small screensZarino Zappia2019-06-14-1/+21