aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | [Bristol] Rename streetlight asset layer.Matthew Somerville2019-07-10-1/+1
| |
* | [Hounslow] Use ‘Hounslow Highways’ in report confirmation emailsDave Arter2019-07-10-0/+62
| | | | | | | | Fixes mysociety/fixmystreet-freshdesk#71
* | Clarify wording on non_public report confirmation emailsDave Arter2019-07-10-3/+3
| |
* | Allow password hash setting in user import.Matthew Somerville2019-07-10-12/+12
|/
* [Oxfordshire] Stop ‘relevant department’ being removed by JSDave Arter2019-07-09-1/+3
|
* Update UI text when selecting a private categoryDave Arter2019-07-09-23/+100
| | | | | | | This makes it clearer that all details for a report made in a private category will not be shown publicly. Fixes mysociety/fixmystreet-commercial#1405
* 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
| | | | | | | | The server renames asset_no to feature_id, so that can be used instead.
* | 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
| |/ | | | | | | | | | | | | | | | | | | | | You can now set link colours in your `_colours.scss` file, rather than having to override the base colours. The variables are: $link-color $link-hover-color $link-visited-color $link-text-decoration $link-hover-text-decoration
* / 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
| | | | | | | | Fixes #2546
* | [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
| | | | | | | | This adds better keyboard support.
* | [FixaMinGata] Multi-para formatting in email listsMatthew Somerville2019-07-05-2/+2
| | | | | | | | Same as a291045d.
* | 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
| | | | | | | | This is much quicker, at not much cost.
| * 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
|/ | | | Lots of false positives from other bodies too.
* 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
|/ | | | This reverts commit 5670637715d6c45cd53e52ab16830cfaa24e4495.
*-. 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
| | | | | | | | | | | | | | | | | | It is possible that the category of a report no longer exists and in that case the Open311 send process was falling over. This checks that we've found a contact and if not sets the error and skips the report.
| * | [Open311] Allow description in email template.Matthew Somerville2019-06-20-9/+53
| |/ | | | | | | | | By specifying a placeholder in an email template, it can be replaced by the description returned from the Open311 server.
* / [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
| | | | | | | | | | | | | | Only parses as multiple groups if cobrand is configured to handle them to stop issues with existing groups with commas in them. Groups are parsed as CSV so as to allow commas in group names.
| * display category under multiple groupsStruan Donald2019-06-17-3/+6
| | | | | | | | | | | | | | The group metadata of a contact can now be a comma separated list of groups under which to display the category For #2475
| * configure category_groups via COBRAND_FEATURESStruan Donald2019-06-17-41/+32
| | | | | | | | | | Rather than have a method in the Cobrand module use the COBRAND_FEATURES section of the config file.
* | Merge branch 'issues/commercial/1375-bristol-redirects'Matthew Somerville2019-06-17-0/+17
|\ \
| * | [Bristol] redirect national site categoriesStruan Donald2019-06-17-0/+17
| |/ | | | | | | | | Add a message to various categories on the national site asking people to use a separate Bristol site to make reports.