aboutsummaryrefslogtreecommitdiffstats
path: root/perllib
Commit message (Collapse)AuthorAgeLines
* Merge branch '700-auto-emails'Matthew Somerville2014-05-16-14/+37
|\
| * Update all email templates with new text.Myfanwy Nixon2014-05-16-0/+2
| | | | | | | | And FixMyStreet.com specific open questionnaire page.
| * Only return html from problem->body if we have contextStruan Donald2014-05-16-1/+1
| | | | | | | | | | this means we can use this in email templates and get the correct non html text back even if AREA_LINKS_FROM_PROBLEM is true
| * Set site_name and signature email variables for alertsStruan Donald2014-05-16-13/+34
| | | | | | | | so we can include the name of the site non TT templated emails
* | Add MAPIT_GENERATION variable, to pin whitelist.Matthew Somerville2014-05-16-2/+9
| | | | | | | | | | | | Otherwise, when MapIt Global is updated, the 'point' lookup, as it only returns the current generation by default, might no longer return the areas present in the whitelist.
* | Revert "Remove Barnet check for external_id display"Dave Arter2014-05-16-2/+3
| | | | | | | | | | | | | | This reverts commit 87451200e32a57947bb7b9facc4efb4f6644973b. Reports that were sent when the Barnet integration was in place still have an external_id which should be displayed.
* | [Bromley] Add secure-proxy line.Matthew Somerville2014-05-12-0/+1
| |
* | Merge branch 'issues/commercial-503-centro-email'Steven Day2014-05-01-0/+2
|\ \
| * | Fix missing subcategory_line that was breaking email sendingSteven Day2014-05-01-0/+2
| | | | | | | | | | | | | | | | | | subcategory_line is optional in seesomethingsaysomething, so we need to set it to something (a blank line is what I've chosen) otherwise email sending breaks when it tries to template up the email message
* | | Allow '\n' and other binary chars in dashboard CSVDave Arter2014-04-29-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, Text::CSV doesn't allow binary characters such as newline, carriage return etc., in cells. This causes issues when exporting data that contains these characters, such as problem reports with more than one line. This commit also explicitly tells Text::CSV to append a newline to each row instead of joining the rows together with this char at the end. Fixes #494.
* | | Add note for removal of Barnet-specific categoriesDave Arter2014-04-25-1/+3
| | |
* | | Remove Barnet check for external_id displayDave Arter2014-04-25-3/+2
| | |
* | | Remove Barnet-specific category lookup & checksDave Arter2014-04-25-14/+7
| | |
* | | Also remove cached file when photo removed.Matthew Somerville2014-04-17-5/+6
| | |
* | | replace WTT cross sell with app advertStruan Donald2014-04-17-1/+25
| |/ |/|
* | Merge branch 'improve-contact-form'Struan Donald2014-04-17-0/+31
|\ \
| * | Add a who are you trying to contact option to contact formStruan Donald2014-04-15-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to try and cut down on people mistakingly using this form to try and contact their council all some 'who are you trying to contact' options to the form that display appropriate messaged unless the 'FMS team option is selected. Add the validation code for this in the cobrand module. Fixes #41
* | | alter pave url sent to analytics on report completionStruan Donald2014-04-16-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to allow us to do funnel analysis in google analytics we need to send a differnt page url when a user completes a report. To do this we add a report_created=1 to the query string on either the report page or the report confirmation page for logged in and confirm by email users respectively. There's a bit of complication as we don't want to set a session cookie everywhere as that will break caching so we set a stash variable, although if the user is logged in this is controlled by a variable in the flash as there is already a session cookie at this point. also, removes the code that sends an event upon report completion as this was no use for funnel analysis.
* | | Merge branch 'zerotb'Struan Donald2014-04-11-1/+106
|\ \ \
| * | | Use flags to indicate type of location errorStruan Donald2014-04-08-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it a bit easier to override the message in templates which makes it a bit easier for cobrands. Leaves the default error message in location_error stash key which should prevent any existing logic breaking.
| * | | replace default pins with clinic logoStruan Donald2014-04-08-0/+8
| | | | | | | | | | | | | | | | add files and change config in cobrand
| * | | Changes to alert-update formatting for ZeroTBStruan Donald2014-04-08-0/+13
| | | | | | | | | | | | | | | | | | | | Include date in alerts Remove everything apart from the update text as we don't need it
| * | | Add Cobrand config to include update date in email alertsStruan Donald2014-04-08-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for sites where the updates aren't published on the site so you need a bit more context in the email alerts. Add inlude_time_in_update_alerts to default cobrand, off as default If this is set then the date is added after the name string in the email, passing in 'alert' as the type to dt_prettify in order to allow the cobrand to format it accordingly. This does require pulling out the alert confirmed time from the database in the send_alerts code where it wasn't before.
| * | | Add a searchable dropdown of clinic names to postcode formStruan Donald2014-04-08-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses select2 for the dropdown and a cobrand call to fetch the list of report titles as the clinic names. Relies on a redirect in httpd.conf to make the non JS version work. Still leaves the postcode search in place as select2 won't accept custom terms if you base it on a select box, which we want to do so it works if JavaScript is disabled Fixes #723
| * | | turn on never_confirm_updates for ZeroTBStruan Donald2014-04-08-0/+1
| | | | | | | | | | | | | | | | | | | | and display a message on the report page to indicate the update has been sent as it's never displayed
| * | | Allow comments to be confirmed with no confirmationStruan Donald2014-04-08-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add never_confirm_updates setting to cobrand that, when set to 0 means that comments are confirmed with no confirmation step. Essentially behaves as it would if the user was logged in. Also add a flag to the flash that indicates the comment was accepted to you can display a message on the report page if required
| * | | change text of location search instructionsStruan Donald2014-04-08-0/+2
| | | |
| * | | cobrand file with geocoder etc configStruan Donald2014-04-08-0/+31
| |/ / | | | | | | | | | | | | | | | | | | also, make readonly, disable photos, questionnaires, never hide old pins Fixes #701
* | | Merge branch 'analytics-report-events'Struan Donald2014-04-11-0/+2
|\ \ \
| * | | Fire a google analytics event on report completionStruan Donald2014-04-09-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | At the moment it's hard to use google analytics to track when someone has completed a report due to the various redirects which can occur too quickly for the analytics javascript to fire. So now we fire an event if we've set a flash value. This also allows us to track how they created the report.
* / / bin/geocode script for testing geocodingHakim Cassimally2014-04-10-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run bin/geocode -h for options. Has: * configurable cobrand / config-file / geocoder * some diagnostics for missing cobrand Minor fixes rebased into this commit: * bin/geocode error if no --cobrand passed * bin/geocode docs and accept GEOCODER as string Notable TODOs remaining: * reverse geocoding, to double check that latitude actually maps somewhere useful (and is within Cobrand's boundaries) * diagnosis of relevant CONFIG settings * flag to disable caching
* | Update old-style open311 script to use bodies.Matthew Somerville2014-04-07-22/+20
| | | | | | | | Add some comments to the top of the open311 bin scripts.
* | Use local DateTimes in dashboard and its tests.Matthew Somerville2014-04-07-8/+9
| | | | | | | | | | Otherwise oddities arise due to summer time differences putting a BST now-6d23h time behind a UTC now+1s-1w.
* | remove survey linksStruan Donald2014-03-31-2/+12
| |
* | Allow cobrands to set their own path to pin filesHakim Cassimally2014-03-25-2/+14
| | | | | | | | | | | | | | | | | | New cobrand function of pin_path that sets the path to where the image files for pins are located. Defaults to /i This still means they need to use the same file names but they can at least put those in a cobrand directory rather than having to overwrite the files in /i or fudge it with pin_colour
* | Add no-op sending method.Matthew Somerville2014-03-22-0/+12
| | | | | | | | | | This simply always skips reports for this body, in case you need to suspend reports there. Fixes #507.
* | Ipswich/St Edmundsbury roads handled by Suffolk.Matthew Somerville2014-03-21-6/+0
| |
* | Change default email indentation to none.Matthew Somerville2014-03-17-14/+2
| | | | | | | | | | This is very old, no-one seems to want/need it any more, and more than one reuser does not want it. Fixes #715.
* | Add extra Open311 strings for FixaMinGataJon Kristensen2014-03-14-0/+4
| |
* | Fix slight regression in cf20c709, to still match all UK cobrands.Matthew Somerville2014-03-13-1/+1
| |
* | Set report->send_questionnaire on report creationAndy Lulham2014-03-12-0/+1
| | | | | | | | | | Include a one-off script that sets send_questionnaire to 0 for all available cobrands that have send_questionnaires set to 0.
* | [Zurich] basic commandline tool for geocoderHakim Cassimally2014-03-12-0/+1
| | | | | | | | | | Also add warning to Geocoder to pass on server error if you are running in development.
* | Use config's EMAIL_DOMAIN in cron email Message-ID.Matthew Somerville2014-03-12-2/+2
| | | | | | | | Rather than hardcoded mysociety.org.
* | Add test for de47a7f.Matthew Somerville2014-03-12-1/+1
| | | | | | | | | | | | This tests that the default string used by the old-style Open311 update code if there is no incoming string and the report is marked fixed, is translated.
* | Merge remote branch 'origin/sweden-rebase'Matthew Somerville2014-03-11-13/+583
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: bin/update-schema locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po perllib/FixMyStreet/DB/Result/Body.pm
| * | Make sure language is set before updating report.Matthew Somerville2014-03-11-0/+2
| | | | | | | | | | | | So that e.g. 'Closed by council' is translated.
| * | Add `external_url' column to `body' table.Jon Kristensen2014-03-11-0/+3
| | |
| * | Alter Open311 description to only include English on FixMyStreet.Jon Kristensen2014-03-11-13/+12
| | | | | | | | | | | | This could be made cobrand-customisable in future.
| * | Bring back open311-update-reports, GetUpdates.pm and getupdates.tJon Kristensen2014-03-11-0/+82
| | | | | | | | | | | | | | | | | | This commit reverses the "Remove unused Open311 GetUpdates code." commit. FixaMinGata, the Swedish FixMyStreet cobrand, is still using open311-update-reports.
| * | Remove hardcoded Swedish translationsJon Kristensen2014-03-11-3/+3
| | |