[zanata/zanata] 21af1f: Fix internal authentication resend email error: ht...

[GitHub]

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

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Fix internal authentication resend email error: https://bugzilla.redhat.com/show_bug.cgi?id=915130


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: 63a3e92dae6b5ef900d0227925bd9c8ab8d90599
      https://github.com/zanata/zanata/commit/63a3e92dae6b5ef900d0227925bd9c8ab8d90599
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java

  Log Message:
  -----------
  Fix broken rest test.


Compare: https://github.com/zanata/zanata/compare/2bc9b4cc87d4...63a3e92dae6b