[zanata/zanata-server] 4183ca: fix(merge translation):allow admin to merge from a...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 4183cafceb0df7a03dca3c916fb109789ca1970d
      https://github.com/zanata/zanata-server/commit/4183cafceb0df7a03dca3c916fb109789ca1970d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  fix(merge translation):allow admin to merge from all active projects

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


  Commit: adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
      https://github.com/zanata/zanata-server/commit/adb46eb7e77e5b2128000c76ab7bba6d0f01b74c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  Merge pull request #1009 from zanata/ZTA-718

fix(merge translation):allow admin/maintainer to merge from all active projects


  Commit: d7b6e915a41c5d79afb71896a952a228d523acaa
      https://github.com/zanata/zanata-server/commit/d7b6e915a41c5d79afb71896a952a228d523acaa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  exclude jersey dependency from zanata-api


  Commit: 910cb8ae62a3c598b90ea5efad2668472f8929d4
      https://github.com/zanata/zanata-server/commit/910cb8ae62a3c598b90ea5efad2668472f8929d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java

  Log Message:
  -----------
  put back resteasy @Wrapped annotation for jaxb response


  Commit: e47782034f2196fdb8e178122a80ed88d4a2cc9b
      https://github.com/zanata/zanata-server/commit/e47782034f2196fdb8e178122a80ed88d4a2cc9b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java

  Log Message:
  -----------
  Merge pull request #1015 from zanata/fix-jersey-dependency

exclude jersey dependency from zanata-api


Compare: https://github.com/zanata/zanata-server/compare/1f826e497a29...e47782034f21