[zanata/zanata-server] ce51f9: fix(glossary): Fix glossary permission

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: ce51f92f454c1b2865166cea9aa39b3ff0a4508d
      https://github.com/zanata/zanata-server/commit/ce51f92f454c1b2865166cea9aa39b3ff0a4508d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  fix(glossary): Fix glossary permission

https://zanata.atlassian.net/browse/ZNTA-615


  Commit: aba3f2e57b31971723066748294e4fcd739100ac
      https://github.com/zanata/zanata-server/commit/aba3f2e57b31971723066748294e4fcd739100ac
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

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

  Log Message:
  -----------
  fix(version language): Fix concurrent map modification

https://zanata.atlassian.net/browse/ZNTA-643


  Commit: 0f93756304fdfdabe5b5473ccaab870777315bee
      https://github.com/zanata/zanata-server/commit/0f93756304fdfdabe5b5473ccaab870777315bee
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into fix-concurrent-map


  Commit: 1cf92473034ffbe238a6ce6c707f218c2fbb9293
      https://github.com/zanata/zanata-server/commit/1cf92473034ffbe238a6ce6c707f218c2fbb9293
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

  Log Message:
  -----------
  fix checkstyle


  Commit: cf0a3e196b7da474013eaaa405b8b5dcf5f4cc8f
      https://github.com/zanata/zanata-server/commit/cf0a3e196b7da474013eaaa405b8b5dcf5f4cc8f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-615-glossary-permission


  Commit: d287c2d5fcc5c2fa40a5339b78d5db03a5991370
      https://github.com/zanata/zanata-server/commit/d287c2d5fcc5c2fa40a5339b78d5db03a5991370
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  Merge pull request #929 from zanata/ZNTA-615-glossary-permission

fix(glossary): Fix glossary permission


  Commit: 15de1d5b53f266b71b87c9d810df4f7a37e580d7
      https://github.com/zanata/zanata-server/commit/15de1d5b53f266b71b87c9d810df4f7a37e580d7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #942 from zanata/fix-concurrent-map

fix(version language): Fix concurrent map modification


  Commit: 298436f45959f0502b157b8eac40fb6b1652171f
      https://github.com/zanata/zanata-server/commit/298436f45959f0502b157b8eac40fb6b1652171f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  docs(release notes): update release notes for ZNTA-615 and ZNTA-643


Compare: https://github.com/zanata/zanata-server/compare/82cdb572aa36...298436f45959