[zanata/zanata] a74586: Fix expiry activation email: https://bugzilla.redh...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: a745867498a008215e24c2dc2997650199192292
      https://github.com/zanata/zanata/commit/a745867498a008215e24c2dc2997650199192292
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java

  Log Message:
  -----------
  Fix expiry activation email: https://bugzilla.redhat.com/show_bug.cgi?id=916812


  Commit: 25b8907e51f564ea597cd359a84649c1e54cc4ef
      https://github.com/zanata/zanata/commit/25b8907e51f564ea597cd359a84649c1e54cc4ef
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml

  Log Message:
  -----------
  Fix on email template


Compare: https://github.com/zanata/zanata/compare/20297a17ead6...25b8907e51f5