aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Version 1.4.1.v1.4.1Matthew Somerville2014-05-23-2/+5
|
* Don't run some crons by default, rejig timings.Matthew Somerville2014-05-23-5/+7
|
* Add *.swp to .gitignoreHakim Cassimally2014-05-22-0/+1
|
* Add change password link to Your reports page.Matthew Somerville2014-05-20-0/+4
|
* Version 1.4.v1.4Matthew Somerville2014-05-16-8521/+4940
|
* Latest pulled translations from Transifex.Matthew Somerville2014-05-16-622/+19030
|
* Merge branch '700-auto-emails'Matthew Somerville2014-05-16-201/+425
|\
| * Update all email templates with new text.Myfanwy Nixon2014-05-16-187/+390
| | | | | | | | 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-4/+17
| | | | | | | | | | | | 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
| |
* | Point Southampton's contact link to council siteDave Arter2014-05-02-1/+1
| | | | | | | | Fixes mysociety/FixMyStreet-Commercial#501
* | 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
* | | Test dashboard CSV export more thoroughlyDave Arter2014-04-30-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of counting the number of lines output by dashboard CSV export, the content is parsed as CSV and the number of rows present is checked. Also includes a problem report that's split across multiple lines, testing the fix for mysociety/FixMyStreet-Commercial#494 introduced in d75e161c151c4f1e6dced24eae3170e01f9b7ba6. Closes #780.
* | | 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.
* | | SOAP::WSDL can perhaps be removed; add note to this effectDave Arter2014-04-25-0/+1
| | |
* | | 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
| | |
* | | tweak footer links to appsStruan Donald2014-04-17-8/+10
| | | | | | | | | | | | | | | | | | include logos and change the header text closes #751
* | | replace WTT cross sell with app advertStruan Donald2014-04-17-1/+25
| |/ |/|
* | Merge branch 'improve-contact-form'Struan Donald2014-04-17-1/+246
|\ \
| * | Add a who are you trying to contact option to contact formStruan Donald2014-04-15-1/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-13/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | create westminster council so report_new test can run standaloneStruan Donald2014-04-16-0/+1
| | | | | | | | | | | | | | | | | | | | | The test relies on a body for westminster council existing which is crated in an earlier test if you run the whole test suite. However it's not present if you run only this test against an empty database so add it to the list of created bodies.
* | | remove FMS UK content from trinidad and tobago footerStruan Donald2014-04-11-0/+38
| | |
* | | Merge branch 'zerotb'Struan Donald2014-04-11-34/+6218
|\ \ \
| * | | Improve location out of area error for ZeroTBStruan Donald2014-04-08-0/+8
| | | |
| * | | Use flags to indicate type of location errorStruan Donald2014-04-08-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Remove unwanted detail from around pagesStruan Donald2014-04-08-0/+21
| | | | | | | | | | | | | | | | | | | | Remove problem confirmed times as well as states Also problem -> clinic
| * | | replace default pins with clinic logoStruan Donald2014-04-08-0/+8
| | | | | | | | | | | | | | | | add files and change config in cobrand
| * | | script to import zerotb clinic dataStruan Donald2014-04-08-0/+115
| | | | | | | | | | | | | | | | Closes #703
| * | | remove links to english and hindi translationsStruan Donald2014-04-08-5/+0
| | | | | | | | | | | | | | | | awaiting the hindi translation so don't have a link to it
| * | | fix banner height and menu placement on map pagesStruan Donald2014-04-08-0/+17
| | | | | | | | | | | | | | | | | | | | make links same height as on other pages increase height of banner to be the same as other pages
| * | | text updatesStruan Donald2014-04-08-3/+127
| | | | | | | | | | | | | | | | front page and faq
| * | | Changes to alert-update formatting for ZeroTBStruan Donald2014-04-08-0/+22
| | | | | | | | | | | | | | | | | | | | 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/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5085
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | change ZeroTB button colour to orangeStruan Donald2014-04-08-0/+18
| | | |
| * | | Problem -> Clinic on around page for ZeroTBStruan Donald2014-04-08-0/+14
| | | |
| * | | update report page text for ZeroTBStruan Donald2014-04-08-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change to use sites terminology update notes on what happens to information remove some unused template tags
| * | | remove most of the detail from zerotb report pagesStruan Donald2014-04-08-0/+6
| | | | | | | | | | | | | | | | | | | | only really want the title and the details as all the rest is not relevant
| * | | turn on never_confirm_updates for ZeroTBStruan Donald2014-04-08-0/+7
| | | | | | | | | | | | | | | | | | | | 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/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | enable generation of cobrand specific po filesStruan Donald2014-04-08-18/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to stop the main FixMyStreet .po file being filled up with strings that only apply to a single Cobrand that are not relevant to people running their own fairly vanilla version. Restrict the list of templates that we pull strings out of by generating a list of all the ones in currently translated cobrands for minimal impact. Use that to create the FixMyStreet.po file in gettext-extract. I've left the existing cobrands in but at some point we should split these out. Add a specific script for generating Cobrand .po files which extracts strings from the Cobrand's templates. This is then translated and the translated file place in the locale/$lang/LC_MESSAGES. The the merge_cobrand_po script is run which will create an autoCobrand.po file which has the Cobrand strings and the FixMyStreet strings. This is then the domain used by the Cobrand. Any cobrand specific strings from the Perl code are still in the main FixMyStreet .po file but there should be relatively few of them so it's less of an issue.
| * | | update content and style for front page instructionsStruan Donald2014-04-08-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | remove photos etc update step text change background colour and remove crop shadow