aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'version-2.3'v2.3Matthew Somerville2017-12-18-22164/+30182
|\
| * Version 2.3.Matthew Somerville2017-12-18-27/+29
| * Update translations with new strings.Matthew Somerville2017-12-15-21509/+29899
| * Split up alert multiple results to match front.Matthew Somerville2017-12-15-2/+3
| * Fix spelling of administrator.Matthew Somerville2017-12-15-3/+3
| * Updates pulled from Transifex.Matthew Somerville2017-12-15-732/+357
* | Make sure bar chart is given enough colours.Matthew Somerville2017-12-18-0/+4
* | Generate state_map later on, for use by bar chart.Matthew Somerville2017-12-15-10/+3
|/
* Merge branch 'issues/forcouncils/939-new-chart-marketing-dashboard'Matthew Somerville2017-12-15-457/+851
|\
| * [Oxfordshire] Use input type=date on Exor RDI pageMatthew Somerville2017-12-15-55/+14
| * Add bar chart functionality, for area summary pageZarino Zappia2017-12-15-144/+179
| * [fixmystreet.com] CSV download from marketing pageStruan Donald2017-12-15-105/+222
| * [fixmystreet.com] Council average response time.Struan Donald2017-12-15-24/+41
| * [fixmystreet.com] Marketing page, filterable statsStruan Donald2017-12-15-74/+260
| * Improve data filter/"Group by" UI on /dashboard.Zarino Zappia2017-12-14-60/+140
* | Merge branch 'yodenuncio'Matthew Somerville2017-12-13-13/+105
|\ \ | |/ |/|
| * Include JSON of extra fields in category_extras.Dave Arter2017-12-13-0/+22
| * Bypass /around from postcode form if required.Dave Arter2017-12-13-13/+78
| * [YoDenuncio] Add cobrand files to .gitignoreDave Arter2017-12-13-0/+1
| * Add template hook for content before .wrapper.Zarino Zappia2017-12-13-0/+4
* | Merge branch 'issues/forcouncils/261-rdi-check'Matthew Somerville2017-12-13-12/+22
|\ \
| * | Fix issues with send method category change.Matthew Somerville2017-12-13-8/+6
| * | Store all successful send methods.Matthew Somerville2017-12-13-4/+16
* | | Merge branch 'jquery-needed-some-places-it-is-not'Matthew Somerville2017-12-13-29/+27
|\ \ \
| * | | [UK] Make sure jQuery is loaded where it is neededMatthew Somerville2017-12-12-12/+18
| * | | Only output JavaScript files once.Matthew Somerville2017-12-12-17/+9
| | |/ | |/|
* | | [Borsetshire] Add Pro box to bottom of homepage.Matthew Somerville2017-12-07-0/+49
* | | [fixmystreet.com] Improve fixture descriptions.Matthew Somerville2017-12-07-15/+147
* | | [Borsetshire] Amend sign in instruction text.Matthew Somerville2017-12-07-29/+82
|/ /
* | Upgrade commonlib to get stable RABX outputDave Arter2017-12-06-0/+0
* | Add opt-in cobrand hook for category groupsDave Arter2017-12-06-9/+11
|/
* Ensure Mock::Nominatim JSON is encoded in en-gb localeDave Arter2017-12-05-1/+3
* Merge branch 'issues/commercial/925-fms-pro-in-council-notification-email'Matthew Somerville2017-12-05-20/+74
|\
| * [fixmystreet.com] Prominent FMS Pro promo in email to councilZarino Zappia2017-12-01-20/+74
* | Merge branch 'issues/forcouncils/264-stop-csv-human-dates'Matthew Somerville2017-12-05-11/+19
|\ \
| * | Stop using 'readable' dates in CSV export.Matthew Somerville2017-12-01-9/+10
| * | Fix potential update issues with CSV export.Matthew Somerville2017-11-30-1/+2
| * | Fix issues with Problem->as_hashref.Matthew Somerville2017-11-30-2/+8
| |/
* | Merge branch 'issues/forcouncils/40-open311-groups'Dave Arter2017-12-05-11/+134
|\ \
| * | Use JS to split category UI into category/subcategoryDave Arter2017-12-05-1/+76
| * | Group categories on new report formDave Arter2017-12-05-9/+36
| * | Store group on Contacts in Open311 PopulateServiceListDave Arter2017-12-05-1/+22
|/ /
* | Merge branch 'issues/forcouncils/263-auto-response-templates'Dave Arter2017-12-04-34/+277
|\ \
| * | Only allow one auto-response template per category/state.Dave Arter2017-12-04-11/+162
| * | Improve ordering and docs of template editing pageDave Arter2017-12-04-16/+67
| * | Use response template for Open311 updates without ‘description’ textDave Arter2017-12-04-7/+48
|/ /
* / [fixmystreet.com] Add job banner.Matthew Somerville2017-11-30-0/+43
|/
* Merge branch '1919-consolidate-statistics'Matthew Somerville2017-11-29-2010/+568
|\
| * Consolidate summary statistics pages.Matthew Somerville2017-11-29-1930/+476
| * Refactor stats pages to their own controller.Matthew Somerville2017-11-29-154/+167