aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'issues/forcouncils/140-hide-show-name-for-csas'pezholio2017-01-10-1/+1
|\ \
| * | [UK Councils] Disable show name checkbox when reporting as someone elsepezholio2017-01-10-1/+1
| |/
* | Merge branch 'issues/forcouncils/75-stateful-response-templates'Dave Arter2017-01-10-26/+63
|\ \ | |/ |/|
| * Prefill update field based on problem stateDave Arter2017-01-10-3/+22
| | | | | | | | | | | | | | If there’s a response template matching the problem’s new state, it’s selected and the update field prefilled accordingly. The exception to this is if the user has manually entered text into the update field already.
| * Allow editing of ResponseTemplate state in adminDave Arter2017-01-10-21/+30
| | | | | | | | This includes a refactor of the state dropdown field into its own template for easy reuse.
| * Add ‘state’ field to ResponseTemplate modelDave Arter2017-01-10-2/+11
|/
* [fixmystreet.com] Update text on council page.Matthew Somerville2017-01-04-3/+3
|
* Fix bad cross-year test.Matthew Somerville2017-01-03-1/+5
| | | | Make sure the tested date is in the same year as current.
* Revert "[fixmystreet.com] Add donate banner."Matthew Somerville2017-01-03-45/+0
| | | | This reverts commit 03b715f6134e40fcce592e9c33b8a8f119dc814c.
* Merge branch 'issues/forcouncils/21-print-reports'Matthew Somerville2016-12-16-12/+177
|\
| * Only load user body permissions once per request.Matthew Somerville2016-12-16-8/+16
| | | | | | | | This should help if a template uses has_permission_to a lot.
| * Improve print layout for report list pages.Zarino Zappia2016-12-16-4/+156
| | | | | | | | | | | | | | | | | | The main map page elements are given `position:static` to ensure they flow onto as many pages as required. The map image is floated to the right, rather than wasting space at the top of the file. We also, if the user has the inspect permission, include hidden rrint-only metadata in the report lists.
| * [fixmystreet.com] Hide footer in print view.Zarino Zappia2016-12-16-0/+5
| |
* | [Angus,Bristol] Don't try and add assets if no mapMatthew Somerville2016-12-16-0/+12
| |
* | [fixmystreet.com] Add donate banner.Matthew Somerville2016-12-16-0/+45
| |
* | Fix use of .auto.min.js files.Matthew Somerville2016-12-16-1/+1
| | | | | | | | | | fddf7f95 broke the use of minimized JS files, because it always used an unchanged $url in the output. Make sure it is updated if $file is.
* | Try and not show offline banner unnecessarily.Matthew Somerville2016-12-16-2/+1
| |
* | Merge branch 'issues/forcouncils/20-offline-inspecting'Matthew Somerville2016-12-16-236/+819
|\ \ | |/ |/|
| * Add a clear offline data button.Matthew Somerville2016-12-16-0/+14
| |
| * Add offline storing of inspect forms.Matthew Somerville2016-12-16-5/+133
| | | | | | | | | | | | | | | | | | | | This allows the inspect form to be submitted when offline, with the data saved in localStorage, the number of saved forms shown in the banner, and the forms to be uploaded when back online. It copes if you go back to a report after having submitted the form, and if the back-online submission fails due to CSRF failure, retrying once with a new token.
| * Store/show shortlisted reports offline.Matthew Somerville2016-12-16-37/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This: * On an online visit to /my/planned, caches all shortlisted reports, their images and static maps in localStorage, with progress banner; * When a report is added/removed from the shortlist, caches/de-caches that report; * When viewing a report page offline, shows that page from the cache if present (replacing the dynamic map with the cached static map, and replacing report images with their cached equivalents – it is a shame to duplicate, but we cannot rely on the browser cache having these images); * When viewing another page offline, shows an error message but also the list of shortlisted reports that are cached (again, replacing their thumbnail images with the cached versions).
| * Add offline support of static files/fallback page.Matthew Somerville2016-12-16-169/+296
| | | | | | | | | | Use a list to store JavaScript files, so it can be shared between the HTML footer and the appcache manifest.
| * Drop unneeded Cancel button on inspect form.Matthew Somerville2016-12-16-1/+0
| |
| * Default inspect form to save with public update.Matthew Somerville2016-12-16-3/+3
| |
| * Return 400/500 for some client/server errors.Matthew Somerville2016-12-16-25/+43
| |
* | Version 2.0.1.v2.0.1Matthew Somerville2016-12-16-1/+17
| |
* | Don't fix height of admin multiple selects.Matthew Somerville2016-12-16-3/+3
| | | | | | | | | | | | The styling applied to the nice front end multi-select dropdowns should not be applied to the admin multi-select ones, until such time as they are using the nice select interface too.
* | Fix flagging wording template link.Matthew Somerville2016-12-16-8/+16
| | | | | | | | | | | | f58ce6c4 changed the base contact template to include a link to a fixmystreet.com specific page. Revert this back and make the change in the correct cobrand only.
* | Merge branch 'issues/forcouncils/108-pick-up-a-priority'Matthew Somerville2016-12-15-21/+70
|\ \ | |/ |/|
| * Update priorities in inspect form on cat. change.Matthew Somerville2016-12-15-20/+69
| | | | | | | | | | Different categories may have a different list of priorities, so store them all and update as the category changes.
| * Fail in has_permission_to if given an empty arrayref.Matthew Somerville2016-12-13-1/+1
| |
* | Merge branch 'issues/forcouncils/18-merge-duplicate-reports'Dave Arter2016-12-13-225/+519
|\ \
| * | Make it clearer that report is closed when marked as duplicateDave Arter2016-12-13-11/+63
| | | | | | | | | | | | | | | | | | - Record state change when leaving update and marking as duplicate - Change save button wording to match problem state when inspecting - Make it clearer that updates marking a report as duplicate actually close the report
| * | Display nearby candidate reports when marking as duplicateDave Arter2016-12-13-46/+94
| | | | | | | | | | | | | | | | | | | | | | | | - Use Problem->pin_data for single report page - Promote markers_highlight to fixmystreet.maps API We want to highlight map pins on the duplicate report selection UI, so let's use what's already there instead of writing something new. - Make sure duplicate report pins aren’t draggable
| * | Signpost users to original version of duplicate reportsDave Arter2016-12-13-165/+190
| | | | | | | | | | | | This stops updates being left on duplicates.
| * | Refactor JS to work with ajax-loaded reportsDave Arter2016-12-13-49/+50
| | |
| * | Better preserve chosen duplicate report if state is changedDave Arter2016-12-13-5/+13
| | |
| * | If a problem has duplicates, display them on its detail pageDave Arter2016-12-13-23/+58
| | |
| * | Use nearby problems for duplicate suggestions instead of bounding box of mapDave Arter2016-12-13-2/+28
| | |
| * | Add test for correct display of duplicate reportDave Arter2016-12-13-2/+25
| | |
| * | Store and display selected duplicate reportDave Arter2016-12-13-9/+46
| | |
| * | Display nearby duplicate reports when setting report category to ‘duplicate’Dave Arter2016-12-13-0/+39
|/ /
* | Load OpenLayers stylesheet directly, not via JS.Matthew Somerville2016-12-09-0/+3
| | | | | | | | | | This lets us version and cache-bust it as necessary, plus let browser decide how to load it, we're always going to need it.
* | Manual OpenLayers patch for pointer event draggingMatthew Somerville2016-12-09-3/+4
|/ | | | | | Thanks to Dave Tapuska and Chrome team: https://bugs.chromium.org/p/chromium/issues/detail?id=670942 https://github.com/openlayers/ol2/issues/1510
* Filter category should always carry through to formDave Arter2016-12-08-1/+1
| | | | | | | | When filtering the map by a category containing spaces, this category wasn't being carried through to the dropdown on the new report form. Ensuring it's wrapped in quotes in the jQuery selector fixes the problem. Fixes mysociety/fixmystreetforcouncils#134
* [Oxfordshire] Update phone number on FAQ pageDave Arter2016-12-08-2/+2
| | | | Fixes mysociety/fixmystreetforcouncils#133
* [Zurich] Fix 500 error when editing superusersDave Arter2016-12-06-2/+21
| | | | | | | | | | | | The Zurich::admin_type function was setting $c->stash->{body}, meaning that when trying to edit a superuser the 'fetch_contacts' function wasn't being called, causing an "Can't call method "all" on an undefined value" error as $c->stash->{live_contacts} wasn't ever being set. Fixed by changing the conditional to simply determine whether fetch_contacts needs to be called. Included a regression test that meant a small addition to the MapItZurich mock.
* [fixmystreet.com] Fix typo on /about/council.Matthew Somerville2016-12-06-1/+1
|
* Better path for showing config git version.Matthew Somerville2016-12-02-1/+1
| | | | | | The default cobrand does not have a template directory, so the directory change to it was not working. Use the root directory of the repository instead.
* Update problem lastupdate column on inspect save.Matthew Somerville2016-12-02-0/+1
|