aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge branch 'bugfix/1957'Matthew Somerville2019-02-25-8/+20
|\
| * Filters out hidden reports from top 5 list.Joe Siltberg2019-02-25-0/+1
| |
| * [FixaMinGata] Adds a cobrand hook (threshold for responsiveness top 5 list)Joe Siltberg2019-02-25-8/+19
| | | | | | | | Fixes #1957
* | Refactor admin body/user functions to own files.Matthew Somerville2019-02-22-1143/+1226
| |
* | Merge branch 'logged-in-user-report-alert-signup'Matthew Somerville2019-02-22-181/+31
|\ \
| * | Don't ask for email on alert signup if logged in.Matthew Somerville2019-02-21-181/+31
| | | | | | | | | | | | | | | | | | | | | The “Get updates” flow on a report page, if logged in, was showing an input label but no input field (because one is not needed), but then on submission asking for your email address. Add missing name on submit button to fix this.
* | | Merge branch 'FixaMinGata-cobrand-delivery-feb-2019' of ↵Matthew Somerville2019-02-21-11/+177
|\ \ \ | | | | | | | | | | | | git://github.com/Sambruk/fixmystreet
| * | | Swedish translations (minor corrections)Joe Siltberg2019-02-21-7/+9
| | | |
| * | | [FixaMinGata] Changes to a site logo in svg.Joe Siltberg2019-02-21-4/+125
| | | | | | | | | | | | | | | | Makes sure the logo looks nice on devices with high resolution.
| * | | [FixaMinGata] Adds email templates for inactive accounts.Joe Siltberg2019-02-21-0/+43
| | |/ | |/|
* / | Reword maximum number of images error message.Matthew Somerville2019-02-21-1/+1
|/ /
* | Fix server-side WFS property filteringDave Arter2019-02-19-5/+9
| | | | | | | | | | | | | | | | The previous approach of filtering features that match one of many values worked client side for e.g. GeoJSON format WFS layers, but crashed when attemping to build the XML request for server-side feature filtering (e.g. Bristol). This code instead builds a proper Logical filter which OpenLayers can use in both situations.
* | [Bristol] Use new WFS server for street lights.Dave Arter2019-02-19-13/+77
|/
* Merge branch 'issues/commercial/1271-bromley-subcategory'Matthew Somerville2019-02-18-1/+101
|\
| * [Bromley] Allow subcategory attachment to users.Matthew Somerville2019-02-18-1/+92
| |
| * [Bromley] Store service_sub_code as subcategory.Matthew Somerville2019-02-15-0/+9
| |
* | Merge branch '2397-show-old-url-fix'Matthew Somerville2019-02-18-2/+2
|\ \ | |/ |/|
| * Add parameter to URL when “Show older” clicked.Matthew Somerville2019-02-14-2/+2
| | | | | | | | | | The behaviour should be the same whether “Show older” or “Show older reports” is clicked, but only the latter was updating the URL.
* | Merge branch 'issues/commercial/1270-user-areas'Matthew Somerville2019-02-15-46/+89
|\ \
| * | Allow user to be associated with multiple areas.Matthew Somerville2019-02-14-46/+89
| | | | | | | | | | | | | | | | | | Update database to store an array of IDs rather than only one; consequential changes to the admin and the dashboard to allow selection.
* | | [Buckinghamshire] Ignore updates in extra process.Matthew Somerville2019-02-15-0/+2
| | |
* | | [UK Councils] Include unresponsive template.Matthew Somerville2019-02-15-0/+20
| |/ |/| | | | | It is needed in e.g. South Kesteven; link to .com help page.
* | Fix typo in d4c2211cf.Matthew Somerville2019-02-13-1/+1
|/
* Better working of /fakemapit/ under https.Matthew Somerville2019-02-11-3/+4
| | | | | | If no MAPIT_URL is provided, MapIt lookups default to /fakemapit/ at the same host. But that host might already be set up for HTTPS, so port might be 443.
* [fixmystreet.com] Improve two-tier unresponsive.Matthew Somerville2019-02-11-27/+30
| | | | | | | Similarly to 1f69e28c, we were previously only checking the first matching entry, which led to confusing behaviour in places. Include consequential amendments for e.g. one body being unresponsive, the other not.
* [Oxfordshire] Limit appears to be lower than 70.Matthew Somerville2019-02-08-4/+4
|
* Merge branch '2242-automatic-permalink'Matthew Somerville2019-02-05-119/+109
|\
| * Smoke test of FixMyStreet::Map::Google.Matthew Somerville2019-02-05-0/+21
| |
| * Improve use of OL ArgParser/missing zoom in URL.Matthew Somerville2019-02-04-99/+29
| | | | | | | | | | | | Remove the server-side zoom-in-url fix, instead use an ArgParser subclass to default to the provided data if nothing in URL. Then we can switch to using short lat/lon in geocoder URLs.
| * Update URL whenever map moves, using replaceState.Dave Arter2019-02-04-20/+59
| | | | | | | | | | | | Fixes #2242. Co-authored-by: Matthew Somerville <matthew@mysociety.org>
* | Merge branch 'fix-code-starting-underscore-display'Matthew Somerville2019-02-05-8/+10
|\ \
| * | Allow Open311 codes starting with ‘_’ to function.Matthew Somerville2019-02-04-8/+10
| | | | | | | | | | | | | | | | | | Template Toolkit treats keys starting with ‘_’ as private and does not expose them. It is possible for an Open311 server to return fields starting with an underscore, and we want to use those in the template.
* | | Make front page cache time configurable.Matthew Somerville2019-02-04-6/+30
| |/ |/| | | | | | | Add a configuration variable to use for the front page stats/ recent list, plus the max-age of `/reports`.
* | Merge branch '2369-admin-list-field-bug'Matthew Somerville2019-02-04-5/+7
|\ \
| * | Make sure dropdown index numbers are updated too.Matthew Somerville2019-02-04-1/+2
| | |
| * | Metadata automated select is not a type select.Matthew Somerville2019-02-01-1/+1
| | |
| * | No need to pass c to cobrand function.Matthew Somerville2019-02-01-3/+4
| |/
* / [UK Councils] Only load map JavaScript on map pages.Matthew Somerville2019-02-01-4/+15
|/ | | | And load main assets script so highways script does not error.
* Merge branch 'bucks-topic-question-all'Matthew Somerville2019-02-01-20/+20
|\
| * [UK Councils] Get topic when reporting abuse.Matthew Somerville2019-01-31-20/+20
| |
* | Add CSRF and time to contact form.Matthew Somerville2019-02-01-14/+41
|/
* Make staff JavaScript more self-contained.Matthew Somerville2019-01-29-18/+27
| | | | So it can run even when fixmystreet.js is not loaded.
* Add new out-of-office string.Matthew Somerville2019-01-29-1/+1
|
* Allow searching for <email> in admin.Matthew Somerville2019-01-29-0/+10
|
* [fixmystreet.com] Remove donate banner.Matthew Somerville2019-01-29-5/+0
|
* [fixmystreet.com] Update unresponsive page for Northamptonshire.Matthew Somerville2019-01-29-3/+36
|
* Guard against a possible null history.state.Matthew Somerville2019-01-29-1/+1
| | | | | Sometimes IE11 appears to have one, some interaction with appcache iframe? Not sure, but not worth tracking it down.
* Reduce JavaScript on appcache page.Matthew Somerville2019-01-29-1/+3
|
* Set inline JavaScript variables directly.Matthew Somerville2019-01-29-13/+6
|
* Fix saving of inspect form data offline.Matthew Somerville2019-01-29-2/+4
|