[zanata/zanata-server] c2587a: Fix text escape in dashboard

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: c2587af62169e5238ce4afe3364c2e9ff472b215
      https://github.com/zanata/zanata-server/commit/c2587af62169e5238ce4afe3364c2e9ff472b215
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  Fix text escape in dashboard


  Commit: b1924ab8ddbf2e8fed42dd9b0fcd70856a20abc5
      https://github.com/zanata/zanata-server/commit/b1924ab8ddbf2e8fed42dd9b0fcd70856a20abc5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  Merge pull request #458 from zanata/text-escape-fix

Text escape fix


  Commit: 589356178f6b94c4eed5afa2107ba0444b06d6c0
      https://github.com/zanata/zanata-server/commit/589356178f6b94c4eed5afa2107ba0444b06d6c0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  fix nullpointer exception when loading version page


  Commit: 91a62366eb398e289ec96fcfbeaebfb950adf623
      https://github.com/zanata/zanata-server/commit/91a62366eb398e289ec96fcfbeaebfb950adf623
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  Merge pull request #459 from zanata/fix-null-pointer

fix nullpointer exception when loading version page


  Commit: 4525e82cf43bc2562861058f7aa442b3359b9457
      https://github.com/zanata/zanata-server/commit/4525e82cf43bc2562861058f7aa442b3359b9457
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

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


Compare: https://github.com/zanata/zanata-server/compare/9c4135543cc9...4525e82cf43b