aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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
|/ | | | | | The summary page calls generate_grouped_data, which requires state_map in order to sort the states appropriately, so generate it there rather than earlier.
* 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
| | | | | | | | | | No need for any jQuery UI any longer (only base use was already gone when admin stats was moved to dashboard).
| * 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
| | | | | | | | | | | | Limited to most recent 100 rows and not full data. Factor the two CSV generations together.
| * [fixmystreet.com] Council average response time.Struan Donald2017-12-15-24/+41
| |
| * [fixmystreet.com] Marketing page, filterable statsStruan Donald2017-12-15-74/+260
| | | | | | | | | | Uses the dashboard stats code to display a rough table of stats which can be used as the basis for a chart later
| * Improve data filter/"Group by" UI on /dashboard.Zarino Zappia2017-12-14-60/+140
| | | | | | | | This will also be used by /reports/[body]/summary in a bit.
* | 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
| | | | | | | | | | | | | | | | | | | | Cobrands can provide a `skip_around_page` method which means the user will be taken from the front page form directly to /report/new with a pin in the map at the location entered. This also preserves the category parameter, if specified on the front page form. Fixes #1730.
| * [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
| | | | | | | | | | | | | | | | | | Use the send method recorded at the time of sending, not the current one (it may have changed since), and only resend if the new send methods are not a subset of the old.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bromley uses jQuery for its A-Z on all pages; only load Bristol map JavaScript on map pages (same as Angus); drop Oxfordshire JS use of jQuery; fix Zurich load order; and improve jQuery checking in other JavaScript.
| * | | Only output JavaScript files once.Matthew Somerville2017-12-12-17/+9
| | |/ | |/| | | | | | | | | | This allows us to e.g. more easily make sure jQuery is loaded where needed, even if it has already been loaded previously.
* | | [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
| | | | | | | | | | This solves the issue with duplicate ContactsHistory entries being created when extra has no substantive changes.
* | 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
| | | | | This was causing an error in "Test ajax decimal points" in fixamingata.t due to "importance" being encoded with a comma decimal separator.
* 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
| | | | | | | | Fixes mysociety/fixmystreet-commercial#925.
* | 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
| | | | | | | | | | | | We want machine-readable dates in a data export.
| * | Fix potential update issues with CSV export.Matthew Somerville2017-11-30-1/+2
| | | | | | | | | | | | | | | Only look at confirmed updates, and spot updates using mark_fixed and not problem_state (e.g. questionnaire responses).
| * | Fix issues with Problem->as_hashref.Matthew Somerville2017-11-30-2/+8
| |/ | | | | | | | | Include actual times, not just human-readable ones, and make sure state is translated correctly.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit splits the category dropdown into two fields: a top-level "category" field populated with the category groups, and a "subcategory" field for the options in each <optgroup> in the original HTML. It does some short-circuiting, e.g. for optgroups that only have a single option the subcategory field won't be shown.
| * | Group categories on new report formDave Arter2017-12-05-9/+36
| | | | | | | | | | | | Ensures ‘Other’ group is last in the list, if it exists.
| * | 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
|/ / | | | | | | | | | | | | If an Open311 service request update with an empty description field is received and there is a matching ResponseTemplate for the problem's category & state (and it's marked as auto-response) then the text from that ResponseTemplate will be used for the created update.
* / [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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 16:54:03 +0000