[zanata/zanata-server] 49166d: fix(activation): display activation message

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: 49166d05f402defd17a431058b6cc4a7ef15966e
      https://github.com/zanata/zanata-server/commit/49166d05f402defd17a431058b6cc4a7ef15966e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(activation): display activation message

https://zanata.atlassian.net/browse/ZNTA-720


  Commit: fe6af4beda6a8e5ccbc2a7d27d3793837f371a59
      https://github.com/zanata/zanata-server/commit/fe6af4beda6a8e5ccbc2a7d27d3793837f371a59
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  Merge pull request #1045 from zanata/activation-message

fix(activation): display activation message


Compare: https://github.com/zanata/zanata-server/compare/2f29203189bf...fe6af4beda6a