Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Handle reports/updates by logged in abuse entries. | Matthew Somerville | 2016-05-27 | -0/+10 |
| | ||||
* | Merge branch '1410-email-template' | Matthew Somerville | 2016-05-25 | -103/+79 |
|\ | ||||
| * | Use only one templating system for emails. | Matthew Somerville | 2016-05-25 | -103/+79 |
| | | | | | | | | | | | | | | Historically, emails sent offline (alerts, questionnaires, etc) used a different templating system from those sent by the website (e.g. login emails), though the newer system was also being used for the site name and signature of offline emails. | |||
* | | Merge branch '694-summary-string-template-tidy' | Matthew Somerville | 2016-05-25 | -30/+0 |
|\ \ | |/ |/| | ||||
| * | Move processed_summary_string function to template | Matthew Somerville | 2016-05-24 | -30/+0 |
| | | | | | | | | Fixes #694. | |||
* | | Warnfix if belongs_to_body called with no string. | Matthew Somerville | 2016-05-24 | -2/+3 |
|/ | ||||
* | Add search boxes to admin index page, move stats. | Matthew Somerville | 2016-05-20 | -28/+41 |
| | | | | Move most index page statistics to their own pages. | |||
* | Merge branch '1286-catching-gaze' | Matthew Somerville | 2016-05-18 | -25/+40 |
|\ | ||||
| * | Fallback if request to Gaze fails. | Matthew Somerville | 2016-05-18 | -25/+40 |
| | | | | | | | | Fixes #1286. | |||
* | | Improve in-place moderation UI | Zarino Zappia | 2016-05-18 | -0/+11 |
|/ | | | | | | | | | | | This rearranges the moderation UI into logical chunks, and improves the 'revert to original' checkboxes by: - hiding them unless there's some original text to revert to - displaying the text that will be reverted to in the appropriate input fields when checked. Part of mysociety/FixMyStreet-Commercial#731 | |||
* | Remove specific files rather than glob. | Matthew Somerville | 2016-05-18 | -4/+15 |
| | | | | This should improve performance when there are a lot of cached photos. | |||
* | Don't allow photo IDs to be prepended with 0s. | Matthew Somerville | 2016-05-18 | -1/+1 |
| | ||||
* | Fix removal of cached update photos. | Matthew Somerville | 2016-05-18 | -4/+6 |
| | | | | | It was possible that rotating an update photo did not remove its cached copy. | |||
* | Merge remote-tracking branch 'mysociety/1207-update-email-to-existing' | Matthew Somerville | 2016-05-06 | -3/+15 |
|\ | ||||
| * | Allow change of email in admin to existing entry. | Matthew Somerville | 2016-04-27 | -3/+15 |
| | | ||||
* | | Switch external jhead call to use IPC::Open3. | Matthew Somerville | 2016-05-03 | -1/+8 |
| | | ||||
* | | Merge remote-tracking branch 'origin/open311-quieten-issues' | Matthew Somerville | 2016-05-03 | -7/+2 |
|\ \ | ||||
| * | | Store Open311 error in report on failure. | Matthew Somerville | 2016-04-27 | -3/+2 |
| | | | | | | | | | | | | | | | | | | It will still output via cron on the first failure. However, reduce the verbosity of a couple of SendReport modules which are reporting failure every time. | |||
| * | | [UK] Remove West Berkshire temporary fix. | Matthew Somerville | 2016-04-27 | -4/+0 |
| |/ | ||||
* / | Skip fetched updates if they're out of date range. | Matthew Somerville | 2016-04-26 | -2/+7 |
|/ | | | | | Even when we ask for a specific range of dates, we sometimes get given more in the response. | |||
* | Merge branch '1383-remove-dead-projects' | Matthew Somerville | 2016-04-22 | -948/+83 |
|\ | ||||
| * | Remove final web/fixmystreet templates. | Matthew Somerville | 2016-04-20 | -5/+2 |
| | | | | | | | | And associated, e.g. nothing references fixmystreet-old-box.js any more. | |||
| * | Remove some unused cobrands. | Matthew Somerville | 2016-04-20 | -943/+81 |
| | | ||||
* | | Don't warn on bad photo hashes. | Matthew Somerville | 2016-04-22 | -2/+2 |
| | | ||||
* | | Send unresponsive body data per category to app. | Matthew Somerville | 2016-04-22 | -2/+11 |
| | | | | | | | | | | | | The app doesn't currently use the unresponsive body data returned via /report/new/ajax, so make sure it's returned via the category look up it does make. | |||
* | | Merge remote-tracking branch 'origin/twitter-login' | Matthew Somerville | 2016-04-22 | -16/+99 |
|\ \ | ||||
| * | | Add Twitter social login. | Matthew Somerville | 2016-04-08 | -16/+99 |
| | | | ||||
* | | | Ignore empty entries in the image upload IDs. | Matthew Somerville | 2016-04-20 | -1/+1 |
| | | | ||||
* | | | If admin removes all images, set db field to null. | Matthew Somerville | 2016-04-20 | -2/+4 |
| |/ |/| | ||||
* | | Merge remote-tracking branch 'origin/1302-support-pngs' | Matthew Somerville | 2016-04-20 | -66/+82 |
|\ \ | ||||
| * | | Add PNG image support. | Matthew Somerville | 2016-04-08 | -55/+78 |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||
| * | | Prevent dev sites auto-creating session. | Matthew Somerville | 2016-04-06 | -11/+4 |
| |/ | | | | | | | | | 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 Somerville | 2016-04-20 | -20/+3 |
|\ \ | ||||
| * | | Use better link to reports on admin body page. | Matthew Somerville | 2016-04-20 | -18/+0 |
| | | | | | | | | | | | | Remove unused body/area ID URL code. | |||
| * | | Cope with a '/' in body name in body slug. | Matthew Somerville | 2016-04-20 | -2/+3 |
| |/ | | | | | | | Fixes #574. | |||
* / | Display used send method in debug line. | Matthew Somerville | 2016-04-19 | -1/+1 |
|/ | | | | | This may be a contact send method if devolved, or the default if none set on the body. | |||
* | Show right body user form value for fixed reports. | Matthew Somerville | 2016-03-31 | -2/+15 |
| | | | | | 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 Somerville | 2016-03-31 | -69/+161 |
|\ | ||||
| * | Refactor email handling to use Email::MIME alone. | Matthew Somerville | 2016-03-30 | -69/+161 |
| | | ||||
* | | [fixmystreet.com] Move country lookup client side. | Matthew Somerville | 2016-03-31 | -28/+0 |
| | | | | | | | | | | 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. | |||
* | | [Zurich] Use protocol relative map tiles. | Matthew Somerville | 2016-03-30 | -1/+1 |
| | | ||||
* | | Merge branch '1348-header-nesting-issue' | Matthew Somerville | 2016-03-30 | -1/+1 |
|\ \ | ||||
| * | | Switch list item heading from h4 to h3. | Matthew Somerville | 2016-03-30 | -1/+1 |
| | | | | | | | | | | | | This stops the front page header nesting skipping a level. | |||
* | | | [Angus, Greenwich] Add base_url to resolve mixed content issue | Dave Arter | 2016-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 Arter | 2016-03-30 | -1/+3 |
| | | | | | | | | | | | | | | | | | | lighting reports Fixes mysociety/FixMyStreet-Commercial#767 | |||
* | | | [Angus] Remove two unnecessary lines that caused Encode warnings | Dave Arter | 2016-03-29 | -2/+0 |
|/ / | ||||
* | | [Angus] Add clickable street light layer to report map | Dave Arter | 2016-03-29 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 CRM | Dave Arter | 2016-03-29 | -4/+417 |
| | | ||||
* | | [Angus] Cobrand module, templates & design | Dave Arter | 2016-03-29 | -0/+49 |
| | | | | | | | | | | This adds a cobrand for Angus Council that fits in with their existing styling on angus.gov.uk | |||
* | | [fixmystreet.com] Fix for two-tier unresponsive. | Matthew Somerville | 2016-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. |