[zanata/zanata-platform] 8b9e9f: fix(ZNTA-481): Log in with username or email addre...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 8b9e9f280ff3578555af4f10b1e11f4601369576
      https://github.com/zanata/zanata-platform/commit/8b9e9f280ff3578555af4f10b1e11f4601369576
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M server/zanata-war/src/main/webapp/account/login.xhtml
    A server/zanata-war/src/test/java/org/zanata/action/LoginActionTest.java

  Log Message:
  -----------
  fix(ZNTA-481): Log in with username or email address (#315)

* fix(ZNTA-481): Log in with username or email address
* fix(ZNTA-481): Add test for login by email


  Commit: 9fcf04ecd8acd2ebbd701e0d3f60b76be8116116
      https://github.com/zanata/zanata-platform/commit/9fcf04ecd8acd2ebbd701e0d3f60b76be8116116
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M server/zanata-war/src/main/webapp/account/login.xhtml
    A server/zanata-war/src/test/java/org/zanata/action/LoginActionTest.java

  Log Message:
  -----------
  Merge commit '8b9e9f280ff3578555af4f10b1e11f4601369576' into HEAD


Compare: https://github.com/zanata/zanata-platform/compare/18d2f5f08710...9fcf04ecd8ac