[zanata/zanata-server] dd637d: Implement TM merge with new TU new stats

[GitHub]

  Branch: refs/heads/review-rhbz953734
  Home:   https://github.com/zanata/zanata-server
  Commit: dd637dbd0065dfedcf3834a1757d7fdb2aa07a79
      https://github.com/zanata/zanata-server/commit/dd637dbd0065dfedcf3834a1757d7fdb2aa07a79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

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

  Log Message:
  -----------
  Implement TM merge with new TU new stats


  Commit: 684741410d0797e0804d4d32e984af5c3d8032f4
      https://github.com/zanata/zanata-server/commit/684741410d0797e0804d4d32e984af5c3d8032f4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Include state in TU details


  Commit: 27d1b4756c5eef358a82c94a8b2931813cb14e4a
      https://github.com/zanata/zanata-server/commit/27d1b4756c5eef358a82c94a8b2931813cb14e4a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/exception/ModifyReviewAcceptedTranslationException.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  Merge branch 'review-rhbz953734' of github.com:zanata/zanata into review-rhbz953734


Compare: https://github.com/zanata/zanata-server/compare/a692922fe5fc...27d1b4756c5e