aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge remote-tracking branch 'mysociety/refactor-email'Matthew Somerville2016-03-31-190/+276
|\
| * Fix/skip locale tests that don't pass on Mac OS X.Matthew Somerville2016-03-30-3/+13
| |
| * Refactor email handling to use Email::MIME alone.Matthew Somerville2016-03-30-187/+263
| |
* | [fixmystreet.com] Move country lookup client side.Matthew Somerville2016-03-31-58/+26
| | | | | | | | | | There's no need for the IP->country lookup, only used in JavaScript to display a banner, to require a call to the FixMyStreet server.
* | [UK] Tweak list pin padding and CSS comments.Matthew Somerville2016-03-31-5/+5
| |
* | [Angus] Link to Angus on FMS for councils pagesDave Arter2016-03-31-2/+5
| |
* | [Angus] Load web fonts over HTTPSDave Arter2016-03-31-6/+6
| |
* | [Zurich] Fix some translations mistakingly removedMatthew Somerville2016-03-30-28/+28
| |
* | [Zurich] Use protocol relative map tiles.Matthew Somerville2016-03-30-3/+3
| |
* | Merge branch '1348-header-nesting-issue'Matthew Somerville2016-03-30-30/+34
|\ \
| * | [Angus] Remove unused CSS.Matthew Somerville2016-03-30-2/+1
| | |
| * | [fixmystreet.com] Merge different list templates.Matthew Somerville2016-03-30-8/+8
| | |
| * | Switch list item heading from h4 to h3.Matthew Somerville2016-03-30-20/+25
| | | | | | | | | | | | This stops the front page header nesting skipping a level.
* | | [Angus, Greenwich] Add base_url to resolve mixed content issueDave Arter2016-03-30-0/+10
| | | | | | | | | | | | | | | | | | Some img tags were using http://[cobrand].fixmystreet.com/ URLs when their including page was served over HTTPS, causing mixed content warnings on IE.
* | | [Oxfordshire] Add emergencies-only templated response message for street ↵Dave Arter2016-03-30-2/+9
| | | | | | | | | | | | | | | | | | lighting reports Fixes mysociety/FixMyStreet-Commercial#767
* | | [Angus] Remove two unnecessary lines that caused Encode warningsDave Arter2016-03-29-2/+0
|/ /
* | Merge branch 'issues/commercial/754-angus-cobrand'Dave Arter2016-03-29-12/+3378
|\ \
| * | [Angus] Add clickable street light layer to report mapDave Arter2016-03-29-3/+1179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Angus provide a WFS endpoint for their existing streetlight assets and known faults. This commit: - Displays clickable markers when the 'street lighting' category is selected on the report a problem page. - Displays known faults on the map - Includes a custom OpenLayers build for the Angus cobrand that includes WFS support The custom code for adding the layers to the map is within position_map.js, as this seemed to be currently the best place for cobrand-specific map logic.
| * | [Angus] SOAP interface/send method for Angus CRMDave Arter2016-03-29-5/+479
| | |
| * | [Angus] Cobrand module, templates & designDave Arter2016-03-29-0/+1709
| | | | | | | | | | | | | | | This adds a cobrand for Angus Council that fits in with their existing styling on angus.gov.uk
| * | Preserve category when clicking elsewhere on mapDave Arter2016-03-29-0/+4
| | | | | | | | | | | | | | | | | | | | | Because the list of categories is reloaded when changing the location of an in-progress report, it was possible for the category the user had selected to be un-selected. This improves the situation by re-selecting that category if it appears in the new list.
| * | Allow cobrands to control front page number colourDave Arter2016-03-29-7/+10
| | | | | | | | | | | | | | | | | | Several cobrands override the colour of the 'how to report a problem' numbers on the front page, so this commit allows that to be a one-line change in the cobrand's _colours.scss.
* | | Allow override of front page statistics' colour.Matthew Somerville2016-03-29-3/+6
|/ /
* | [fixmystreet.com] Fix for two-tier unresponsive.Matthew Somerville2016-03-29-1/+3
| | | | | | | | | | | | Make sure the unresponsive message shows, if you're in a two-tier area and one of the areas is marked as unresponsive, for all the categories of that area.
* | Default new category creation to confirmed.Matthew Somerville2016-03-29-1/+2
| | | | | | | | Fixes #1266.
* | Optimize store logo PNGs.Matthew Somerville2016-03-29-0/+0
|/
* [fixmystreet.com] Update tips text.Matthew Somerville2016-03-23-8/+12
| | | | Fixes #1362.
* Version 1.8.1.v1.8.1Matthew Somerville2016-03-23-10/+24
|
* Merge branch 'perl5.22-snapshot-update'Matthew Somerville2016-03-23-148/+301
|\
| * [Travis] Test multiple perl versions.Matthew Somerville2016-03-23-12/+31
| |
| * Allow zurich tests to run without network.Matthew Somerville2016-03-23-11/+58
| |
| * Updates to cpanfile and code for perl 5.20/5.22.Matthew Somerville2016-03-23-125/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following modules had bugs that have been fixed for working in recent perls: * List::MoreUtils * Guard * PadWalker * aliased * URI * Convert::NLS_DATE_FORMAT The CGI module was removed from core in 5.20, so include it in the snapshot (I don't think it's actually used, but is a dependency). "{" needs to be escaped in regular expressions, and ~~ should not be used. Fix some tests that expect e.g. a certain hash ordering, to use sorted output or better comparisons.
* | [fixmystreet.com] Some fixes to A/B edge cases.Matthew Somerville2016-03-18-6/+18
| | | | | | | | Better contrast; don't show on /about/council.
* | [fixmystreet.com] Add conversion tracking code.Matthew Somerville2016-03-18-0/+19
| | | | | | | | Fixes #1345.
* | Make sure preview image doesn't hide error.Matthew Somerville2016-03-18-0/+6
|/
* Don't double-decode geocoded addresses.Matthew Somerville2016-03-15-3/+6
| | | | | | | | | Perl 5.20 introduced a version of Encode that errors on decoding already decoded content (rather than returning the same string). Whilst this can be taken as a bug in our code (although the decoding exists because some versions of FastCGI silently UTF-8 encode the content), in the changelog for Perl the only reference to this change is the line: "Encode has been upgraded from version 2.49 to 2.60.".
* Fix ReferenceErrors breaking map on cobrands.Dave Arter2016-03-15-2/+2
|
* Add labels for subsequent photo form inputs.Matthew Somerville2016-03-11-0/+14
|
* Merge branch '1341-friendly-ab-test'Matthew Somerville2016-03-11-3/+280
|\
| * [fixmystreet.com] Friendly A/B test setup.Zarino Zappia2016-03-11-0/+277
| | | | | | | | | | | | | | | | Includes a smiley, bright yellow homepage, and updated nav bar and footer across the entire site; a few content changes; request for gender information from users. Fixes #1341.
| * Set page stash variable even if map unused.Matthew Somerville2016-03-11-1/+1
| | | | | | | | | | This variable can then be used by e.g. extra_name.html to know what form it is on.
| * Remove unnecessary duplicate line of code.Matthew Somerville2016-03-11-1/+0
| |
| * Improve accessibility of pretty radio buttons.Matthew Somerville2016-03-11-1/+2
| | | | | | | | | | The radio icons are e.g. unselectable in VoiceOver if they are display:none. This also helps with client-side validation.
* | Fix test that fetched page removed in last commit.Matthew Somerville2016-03-11-2/+2
| |
* | Remove empty page.Matthew Somerville2016-03-11-9/+0
|/
* Merge remote-tracking branch 'origin/1291-extra_fields'Matthew Somerville2016-03-09-23/+114
|\
| * Add cobrand-specific custom reporting fields.Matthew Somerville2016-03-09-16/+107
| | | | | | | | | | | | This adds a new cobrand variable, report_form_extras, which contains a list of extra fields that will be saved in the 'extra' metadata of the report. Fields may optionally be marked as required.
| * Rename process_extras to process_open311_extras.Matthew Somerville2016-03-08-9/+9
| | | | | | | | | | It is currently only used for processing extra fields (the list, not the metadata hash) which is really only of relevance to Open311.
* | Make sure top of reporting form is shown.Matthew Somerville2016-03-09-0/+1
| | | | | | | | | | | | If the list of reports was scrolled and then the map was clicked, the form would be pre-scrolled down. It now makes sure to scroll the form to the top. Fixes #787.
* | Remove auto-scrolling of sidebar on pin hover.Matthew Somerville2016-03-09-20/+0
|/ | | | | This was added along with pin/sidebar highlighting in b71d042e, but has proved distracting/confusing.