Permalink
Browse files

Merge branch 'zurich'

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
  • Loading branch information...
2 parents 1d2bf7c + e7036ce commit 85ed45239a70f41afc8446cfc0f53acaffdeee3f @dracos dracos committed Mar 14, 2013
Showing with 694 additions and 552 deletions.
  1. +4 −1 conf/crontab.ugly
  2. +56 −48 locale/FixMyStreet.po
  3. +94 −83 locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
  4. +159 −151 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
  5. +96 −83 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
  6. +97 −83 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
  7. +1 −1 perllib/CronFns.pm
  8. +7 −0 perllib/FixMyStreet/App.pm
  9. +6 −8 perllib/FixMyStreet/Cobrand/Zurich.pm
  10. +1 −1 perllib/FixMyStreet/Map/Zurich.pm
  11. +14 −1 perllib/FixMyStreet/SendReport/Zurich.pm
  12. +1 −1 t/app/controller/auth.t
  13. +27 −0 t/cobrand/zurich.t
  14. +1 −1 templates/email/default/login.txt
  15. +1 −1 templates/email/zurich/alert-moderation-overdue.txt
  16. +6 −0 templates/email/zurich/login.txt
  17. +6 −5 templates/email/zurich/problem-closed.txt
  18. +8 −4 templates/email/zurich/problem-confirm.txt
  19. +7 −5 templates/email/zurich/problem-external.txt
  20. +6 −4 templates/email/zurich/problem-rejected.txt
  21. +1 −1 templates/email/zurich/submit-external-personal.txt
  22. +1 −1 templates/email/zurich/submit-external.txt
  23. +1 −1 templates/web/default/admin/user-form.html
  24. +4 −7 templates/web/default/auth/token.html
  25. +7 −2 templates/web/zurich/admin/report_edit-sdm.html
  26. +30 −12 templates/web/zurich/admin/report_edit.html
  27. +0 −5 templates/web/zurich/around/intro.html
  28. +1 −1 templates/web/zurich/auth/general.html
  29. +33 −30 templates/web/zurich/faq/faq-de-ch.html
  30. +0 −1 templates/web/zurich/footer.html
  31. +2 −2 templates/web/zurich/header.html
  32. +5 −5 templates/web/zurich/tracking_code.html
  33. +1 −1 web/cobrands/fixmystreet/fixmystreet.js
  34. +8 −0 web/cobrands/zurich/base.scss
  35. +2 −2 web/js/map-wmts-zurich.js
View
@@ -25,14 +25,17 @@ my @sending = qw(
demo.fixmybarangay.com
www.fixmybarangay.com
zurich.fixmystreet.staging.mysociety.org
+ www.zueriwieneu.ch
seesomething.mysociety.org
);
my @no_alerts = qw(
zurich.fixmystreet.staging.mysociety.org
+ www.zueriwieneu.ch
seesomething.mysociety.org
);
my @no_open311 = qw(
zurich.fixmystreet.staging.mysociety.org
+ www.zueriwieneu.ch
seesomething.mysociety.org
);
my %sending = map { $_ => 1 } @sending;
@@ -75,6 +78,6 @@ my %no_alerts = map { $_ => 1 } @no_alerts;
43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph
00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!!
-!!(* if ($vhost =~ /zurich/) { *)!!
+!!(* if ($vhost =~ /zurich|zueri/) { *)!!
30 0 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper zurich-overdue-alert
!!(* } *)!!
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 85ed452

Please sign in to comment.