aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Update tests for cobrand/template changes.Matthew Somerville2016-04-20-111/+60
|
* Remove final web/fixmystreet templates.Matthew Somerville2016-04-20-338/+168
| | | | And associated, e.g. nothing references fixmystreet-old-box.js any more.
* Remove some unused cobrands.Matthew Somerville2016-04-20-8394/+91
|
* Merge remote-tracking branch 'origin/1302-support-pngs'Matthew Somerville2016-04-20-115/+147
|\
| * Add PNG image support.Matthew Somerville2016-04-08-79/+114
| | | | | | | | | | | | | | Store image type along with hash in photo column, and use that when outputting images / generating URLs. Make sure all public photo URL generation goes through appropriate functions, and change temp URLs so the filename can be output directly from the list.
| * Use correct URL for partial report photo.Matthew Somerville2016-04-08-1/+1
| | | | | | | | | | Since multiple photo support, partial photos can only be looked at via their temporary URL, not their confirmed one.
| * Update remaining cobrand multiple photo templates.Matthew Somerville2016-04-08-26/+27
| |
| * Prevent dev sites auto-creating session.Matthew Somerville2016-04-06-11/+7
| | | | | | | | | | We check for a session's existence before looking in it, as looking in it first would auto create a session.
* | Merge branch '574-spot-slash-in-body-slug'Matthew Somerville2016-04-20-21/+9
|\ \
| * | Use better link to reports on admin body page.Matthew Somerville2016-04-20-19/+1
| | | | | | | | | | | | Remove unused body/area ID URL code.
| * | Cope with a '/' in body name in body slug.Matthew Somerville2016-04-20-2/+8
| | | | | | | | | | | | Fixes #574.
* | | Display used send method in debug line.Matthew Somerville2016-04-19-1/+1
|/ / | | | | | | | | This may be a contact send method if devolved, or the default if none set on the body.
* / [Zurich] SQL script to bulk-update reports from CSVDave Arter2016-04-07-0/+23
|/
* Fix test issue running on PostgreSQL>=9.2 on Mac.Matthew Somerville2016-03-31-1/+2
| | | | | | | | | | Test::PostgreSQL sets up a new database with initdb and empties the generated postgresql.conf; PostgreSQL 9.2+ sets its locale/timezone information at the initdb stage, not when it is run. It is possible therefore for the tests to be in one timezone but the test database to be in another (GMT) – causing a test failure when e.g. an update is created manually. Make sure the first comment is well before the others being tested, so there is no chance the order gets confused.
* Show right body user form value for fixed reports.Matthew Somerville2016-03-31-6/+19
| | | | | The form element contains 'fixed', so we need to strip the user/council part of the actual state. Fixes #1369.
* 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
|/