[zanata-commits] [zanata/zanata] c4ad5b: use template for generated emails, with link to se...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: c4ad5b9369db8874592a801f661229e7747994d1
      https://github.com/zanata/zanata/commit/c4ad5b9369db8874592a801f661229e7747994d1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

  Log Message:
  -----------
  use template for generated emails, with link to server instance


  Commit: 60cfdf95f236497583fbc9b0a767220ad84b73a1
      https://github.com/zanata/zanata/commit/60cfdf95f236497583fbc9b0a767220ad84b73a1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

  Log Message:
  -----------
  Merge branch '1.4'


Compare: https://github.com/zanata/zanata/compare/9ccb516...60cfdf9