[zanata/zanata-server] 48d12c: Fix redirect to login page when using single open ...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 48d12c37ded2ce2d88be01fd3a1281a95f656363
      https://github.com/zanata/zanata-server/commit/48d12c37ded2ce2d88be01fd3a1281a95f656363
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Fix redirect to login page when using single open id provider authentication
Pull request https://github.com/zanata/zanata-server/pull/579

Squashed commit of the following:

commit a9ba559c18b560a12f7884c00c6de0f5d0f53f36
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 16:56:35 2014 +1000

    Rename methods and change comments.

commit 48da2eaefe724702ec28e3a478fbe0f4df8fd03e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 15:03:47 2014 +1000

    Code review updates.

commit 8a3d8999e10fbf7c4a781843bee1db62782fe625
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 12:04:30 2014 +1000

    Fix redirect to login page when using single open id provider authentication.


  Commit: 18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
      https://github.com/zanata/zanata-server/commit/18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

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


Compare: https://github.com/zanata/zanata-server/compare/645fdd25582c...18385b62fb0b