Branch: refs/heads/ZNTA-1865-version-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: 3660689c972d4343de9b16ef08afc4389bc2aee0
      
https://github.com/zanata/zanata-platform/commit/3660689c972d4343de9b16ef08afc4389bc2aee0
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-06-12 (Mon, 12 Jun 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M 
server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  ZNTA-1865 - can merge translation from TM


_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to