[zanata/zanata] 5552db: Work in progress, expire activation link after 1 d...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 5552db5edb9b54b64f6f084cd6d0b01f43010a62
      https://github.com/zanata/zanata/commit/5552db5edb9b54b64f6f084cd6d0b01f43010a62
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    A zanata-war/src/main/java/org/zanata/exception/LinkExpiredException.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    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
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml

  Log Message:
  -----------
  Work in progress, expire activation link after 1 day: https://bugzilla.redhat.com/show_bug.cgi?id=893811


  Commit: fbdb176852a4caad5d0bf4152ebb6a543dd44679
      https://github.com/zanata/zanata/commit/fbdb176852a4caad5d0bf4152ebb6a543dd44679
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz893811


  Commit: 7c6e1e8803f8dca88bbea7a0c86b1c721f244c62
      https://github.com/zanata/zanata/commit/7c6e1e8803f8dca88bbea7a0c86b1c721f244c62
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Implement expiry check on registration link: https://bugzilla.redhat.com/show_bug.cgi?id=893811


Compare: https://github.com/zanata/zanata/compare/c83fc72171b5...7c6e1e8803f8