aboutsummaryrefslogtreecommitdiffstats
path: root/templates/email
Commit message (Collapse)AuthorAgeLines
* Update links to point to new /council page.Matthew Somerville2014-10-09-5/+5
|
* [EmptyHomes] survey template tweaksHakim Cassimally2014-09-09-8/+23
|
* Report moderationHakim Cassimally2014-08-13-0/+38
| | | | | | | | | | | - redaction marked with [...] - of report and comments - stores original data - uses a single form, on the report/_main view - requires additional permissions (user_body_permissions) - Hide report functionality - Moderation notification/contact form - Moderation writes to admin_log
* Removal old Southampton/Reading/Lichfield cobrands.Matthew Somerville2014-07-29-3/+0
|
* Update Zurich email templatesDave Arter2014-07-15-17/+17
|
* Bromley. signature and FAQ tweaksHakim Cassimally2014-07-14-1/+1
| | | | | | | | | | | As per mysociety/FixMyStreet-Commercial#524 to stem the flow of people responding to verification emails by clicking the support email at the bottom of Bromley's signature, we are instead redirecting to the FAQ -- which is also updated to contain the support email address, so the people can still find a contact if they need to. Also tweaking moderation FAQ line, in preparation for moderation trial.
* Make external links HTTPS where possible.Matthew Somerville2014-07-03-5/+5
| | | | And fix a couple that have redirected.
* Use https for UK site where appropriateStruan Donald2014-07-03-5/+5
| | | | | | | Council redirects, BASE_URL comparisons, hard coded links, email signatures For #488
* Merge branch 'master' of https://github.com/jonkri/fixmystreet into ↵Struan Donald2014-06-03-25/+27
|\ | | | | | | | | | | | | jonkri-master Conflicts: locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
| * Put "no-reply" message in the FixaMinGata questionnaire updateJon Kristensen2014-05-28-4/+6
| |
| * Put "no-reply" message in the top of the FixaMinGata alert updateJon Kristensen2014-05-19-5/+5
| |
| * Replace "Fixa Min Gata" with "FixaMinGata" in Swedish cobrandJon Kristensen2014-04-14-16/+16
| |
* | Update all email templates with new text.Myfanwy Nixon2014-05-16-168/+234
|/ | | | And FixMyStreet.com specific open questionnaire page.
* Changes to alert-update formatting for ZeroTBStruan Donald2014-04-08-0/+9
| | | | | Include date in alerts Remove everything apart from the update text as we don't need it
* remove survey linksStruan Donald2014-03-31-54/+0
|
* Minor template fixes for FixaMinGataJon Kristensen2014-03-14-2/+2
| | | | | * Use correct body name value in submit templates * Update FAQ to link to MySociety's repository instead of our own
* Merge remote branch 'origin/sweden-rebase'Matthew Somerville2014-03-11-0/+374
|\ | | | | | | | | | | | | Conflicts: bin/update-schema locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po perllib/FixMyStreet/DB/Result/Body.pm
| * Update "introductory" e-mail to municipalitiesJon Kristensen2014-03-11-13/+14
| | | | | | | | Fixes #10.
| * problem-confirm.txt: Change casingJon Kristensen2014-03-11-1/+1
| | | | | | | | Fixes #7.
| * Updated submit form text.Jonas Oberg2014-03-11-3/+8
| |
| * Updated the languageJonas Oberg2014-03-11-10/+16
| |
| * Changed hardcoded URL in templates/email/fixamingata/submit.txt to be correct.Rikard2014-03-11-1/+1
| |
| * Updated translations manuallyJonas Oberg2014-03-11-2/+2
| |
| * Updated translationJonas Oberg2014-03-11-3/+3
| |
| * Updated translationJonas Oberg2014-03-11-6/+9
| |
| * Updated translationsJonas Oberg2014-03-11-116/+116
| |
| * New cobranded email directory, initially copied from "default".A user for the site fixmystreet2014-03-11-0/+359
| |
* | move survey advert beneath alert text to reduce user confusionStruan Donald2014-03-07-35/+47
| |
* | [Zurich] revert "email templates point to surveys"Hakim Cassimally2014-03-04-4/+0
| | | | | | | | | | | | This reverts commit 5cd2ed3be27629842d7ae072c2b4c9a86c020d52. as per Tobias's instructions today.
* | Add links to user survey to emails, front page and confirmation pagesStruan Donald2014-02-18-0/+126
| | | | | | | | | | | | | | | | Use the cross sell function to put an 'advert' for the survey on the various confirmation pages Create new alert email templates for fixmystreet co-brand so we can include the survey link on those alone All as one commit for ease of reverting when the survey is done.
* | [Zurich] email templates point to surveysHakim Cassimally2014-01-13-0/+4
|/ | | | | | Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/464 Also requires mysociety-servers.git@45e3a5d3 for the /umfrage redirect.
* Fix failing test for problem confirmationStruan Donald2013-08-01-1/+1
| | | | | Update for change to bodies_str, make sure sent_fail_count 0 and update standard template variables
* Updates to Zurich emails and translation file.Matthew Somerville2013-06-04-6/+60
|
* New email text from Zurich.Matthew Somerville2013-04-17-1/+2
|
* Zurich email text update.Matthew Somerville2013-03-21-2/+9
|
* Email supplied was in ISO-8859-1, not UTF-8.Matthew Somerville2013-03-12-2/+2
|
* Zurich email typo.Matthew Somerville2013-03-12-1/+1
|
* Updated emails, FAQ, .po from Zurich.Matthew Somerville2013-03-08-7/+16
|
* FAQ/email/.po Zurich update.Matthew Somerville2013-02-28-1/+2
|
* Updated .po file and email templates text for Zurich.Matthew Somerville2013-02-22-17/+22
|
* Merge remote branch 'origin/zurich'Matthew Somerville2013-02-21-17/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | (locale ignored, will rerun .po extraction after to get all changes.) Conflicts: locale/FixMyStreet.po locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po templates/web/fixmystreet/report/banner.html templates/web/zurich/faq/faq-de-ch.html
| * Translate user details in Zurich external email.Matthew Somerville2013-02-20-3/+3
| |
| * Fix body name in external assignment email, missing %s in translation, ↵Matthew Somerville2013-02-07-1/+1
| | | | | | | | associated tests (fix a28).
| * Update name of Zurich site.Matthew Somerville2013-02-05-14/+14
| |
* | Update EHA emails.Matthew Somerville2013-02-13-23/+4
| |
* | Include extra address in council email.Matthew Somerville2013-02-13-0/+4
|/
* Merge remote branch 'origin/zurich'Matthew Somerville2013-02-04-47/+135
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/open311-populate-service-list bin/send-comments bin/update-all-reports conf/crontab.ugly db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/App/Controller/Reports.pm perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/LichfieldDC.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/ResultSet/Problem.pm perllib/FixMyStreet/SendReport.pm perllib/FixMyStreet/SendReport/Email.pm perllib/FixMyStreet/SendReport/Open311.pm perllib/Open311/GetServiceRequestUpdates.pm perllib/Open311/PopulateServiceList.pm t/app/controller/report_new.t t/app/controller/rss.t templates/web/bromley/report/display.html templates/web/default/admin/council_contacts.html templates/web/default/common_header_tags.html templates/web/default/dashboard/index.html templates/web/default/front/stats.html templates/web/default/report/_main.html templates/web/default/report/update-form.html templates/web/emptyhomes/index.html templates/web/emptyhomes/report/display.html templates/web/emptyhomes/report/new/councils_text_all.html templates/web/emptyhomes/reports/body.html templates/web/emptyhomes/reports/index.html templates/web/fixmystreet/report/new/fill_in_details_form.html templates/web/fixmystreet/report/update-form.html web/cobrands/fixmystreet/fixmystreet.js web/js/fixmystreet.js
| * Updated .po and emails for Zurich.Matthew Somerville2013-01-24-7/+7
| |
| * Script to email Zurich managers when reports are overdue.Matthew Somerville2013-01-22-0/+1
| |
| * If personal details tickbox ticked, use template that includes them.Matthew Somerville2013-01-18-0/+13
| |