[zanata/zanata-server] 2ff421: Fix null exception in more activity load: https://...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 2ff4212f0b01812bc034937e8a6094fd4d3a446e
      https://github.com/zanata/zanata-server/commit/2ff4212f0b01812bc034937e8a6094fd4d3a446e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Fix null exception in more activity load: https://bugzilla.redhat.com/show_bug.cgi?id=1231054


  Commit: ca3e470ac9ae14627aea22870c3bcd7d87da9db0
      https://github.com/zanata/zanata-server/commit/ca3e470ac9ae14627aea22870c3bcd7d87da9db0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Allow admin to access inactive language page


  Commit: fd5613ff73465a51bb42420d62dfbce648f362de
      https://github.com/zanata/zanata-server/commit/fd5613ff73465a51bb42420d62dfbce648f362de
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

  Log Message:
  -----------
  Merge pull request #880 from zanata/rhbz1231054-more-activity-exception

Fix null exception in more activity load


  Commit: 5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
      https://github.com/zanata/zanata-server/commit/5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java

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


  Commit: 472925f55bd2bb0b48dedcee5faacaac2c9968e4
      https://github.com/zanata/zanata-server/commit/472925f55bd2bb0b48dedcee5faacaac2c9968e4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #884 from zanata/fix-disabled-lang-for-admin

Allow admin to access inactive language page


  Commit: 32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
      https://github.com/zanata/zanata-server/commit/32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  rhbz1234687,ZANATA-8 fix error uploading pot file from web UI


  Commit: f1deb2f062bddcaf793a8b1d79e1aba8fa4ecde5
      https://github.com/zanata/zanata-server/commit/f1deb2f062bddcaf793a8b1d79e1aba8fa4ecde5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  add to release note


  Commit: 360e1ada78a9a708371748795a2c3712ec17f001
      https://github.com/zanata/zanata-server/commit/360e1ada78a9a708371748795a2c3712ec17f001
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

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


  Commit: 1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
      https://github.com/zanata/zanata-server/commit/1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  Merge pull request #881 from zanata/zanata8-ui-upload-pot

ZANATA-8 fix error uploading pot file from web UI


Compare: https://github.com/zanata/zanata-server/compare/4941fe281b33...1758936e4f6c