[zanata-commits] [zanata/zanata] 03d947: show names properly in activation, validation and ...

[noreply at github.com]

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

  Commit: 03d947d18eb098129771e4375ba0f1b8b9282c3e
      https://github.com/zanata/zanata/commit/03d947d18eb098129771e4375ba0f1b8b9282c3e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 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

  Log Message:
  -----------
  show names properly in activation, validation and password reset emails


  Commit: 241289a7e16b7dd5c6a81e0b60fed6f4904e1137
      https://github.com/zanata/zanata/commit/241289a7e16b7dd5c6a81e0b60fed6f4904e1137
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java

  Log Message:
  -----------
  fix password reset for internal authentication


  Commit: d9ed020a670939af3f120ba06c35991ea223f313
      https://github.com/zanata/zanata/commit/d9ed020a670939af3f120ba06c35991ea223f313
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
  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

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


Compare: https://github.com/zanata/zanata/compare/015062a...d9ed020