aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* [FiksGataMi] Fix /reports/<fylke>fiksgatami-dev-v2Marius Halden2016-12-20-1/+1
|
* Merge tag 'v2.0.1' into fiksgatami-dev-v2Marius Halden2016-12-16-433/+774
|\
| * 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
| |
| * Always return arrayref from bodies_str_ids.Matthew Somerville2016-11-29-1/+1
| | | | | | | | Prevents potential odd-element hash in e.g. response_priorities.
| * Scroll to report inspect form if present.Matthew Somerville2016-11-28-0/+3
| |
| * [UK] Include specific domain in user search.Matthew Somerville2016-11-25-4/+13
| | | | | | | | | | This deals with a bootstrapping issue of adding new admin users that haven't yet interacted with the system.
| * Open inspect Navigate link in new tab.Matthew Somerville2016-11-25-1/+1
| |
| * Update wording on flagging unsuitable reports.Matthew Somerville2016-11-25-3/+5
| |
| * Pass test if NXDOMAINs are intercepted.Matthew Somerville2016-11-24-0/+8
| | | | | | | | | | Mock out the DNS lookup to fail, in case the test is being run somewhere where the ISP hijacks NXDOMAIN results and redirects them elsewhere.
| * [Zurich] Fix accidentally hidden category extra fieldsDave Arter2016-11-24-0/+1
| |
| * Add latest Zürich translationsDave Arter2016-11-24-111/+57
| |
| * Don't double-decode strftime output.Matthew Somerville2016-11-22-5/+6
| | | | | | | | | | As with d3d0ab6d, we need to only decode_utf8 strftime output that has not already been decoded, to prevent errors in Perl 5.20+.
| * [Bromley] Fix map tiles.Matthew Somerville2016-11-18-46/+26
| | | | | | | | | | The change to remove inline JavaScript stopped the Bromley-specific tiles from working. Put them back with an extra JavaScript file.
* | Fix subject in e-mail confirmation e-mail for FiksGataMiMarius Halden2016-12-15-2/+3
| |
* | Fix faq footer for FikGataMiMarius Halden2016-12-15-2/+2
| |
* | Fix faq width and contact link for FiksGataMiMarius Halden2016-12-15-2/+21
| |
* | Fiks "/reports/Oslo" og "/reports/By,Fylke"Marius Halden2016-12-15-16/+23
| |
* | Remove marketing for obsolete mobile appMarius Halden2016-12-15-3/+0
| |
* | Add colours to map markersMarius Halden2016-12-15-0/+7
|/
* Merge branch 'version-2.0'v2.0Matthew Somerville2016-11-15-23506/+39599
|\
| * Version 2.0.Matthew Somerville2016-11-15-2/+4
| |
| * Updates from Transifex.Matthew Somerville2016-11-08-717/+374
| |
| * Update translation files from source.Matthew Somerville2016-11-08-22450/+39863
| |
| * Updates from Transifex.Matthew Somerville2016-11-08-1255/+276
| |
| * Update script directory changing so works on Macs.Matthew Somerville2016-11-08-3/+3
| |
* | Merge branch 'issues/commercial/787-bristol-assets'Matthew Somerville2016-11-11-373/+1393
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 07:20:17 +0000