[zanata/zanata-server] b319ce: Fix global messages in password reset page

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: b319ce824c4fd49ce86b2814f17977b2bb16eae8
      https://github.com/zanata/zanata-server/commit/b319ce824c4fd49ce86b2814f17977b2bb16eae8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  Fix global messages in password reset page
https://bugzilla.redhat.com/show_bug.cgi?id=1191779

Squashed commit of the following:

commit 5aa8e22358bb84498dc566faeb43635d5bdf3212
Merge: 9be6611 a828049
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 17 14:54:32 2015 +1000

    Merge branch 'integration/master' into rhbz1191779

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java

commit 9be6611801a09407879af1b8bf8eed2b466814d4
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 13:59:17 2015 +1000

    Fix global messages in password reset page: https://bugzilla.redhat.com/show_bug.cgi?id=1191779