Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 1fdcaec4772cac16426df5f6337d6580ad916036
      
https://github.com/zanata/zanata-platform/commit/1fdcaec4772cac16426df5f6337d6580ad916036
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    A server/gwt-editor/codeserver.sh
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  ZNTA-1705 - remove ignore option from TM merge dialog


  Commit: d4b390a276aaa2b14616e08ce675fe262f0d7b61
      
https://github.com/zanata/zanata-platform/commit/d4b390a276aaa2b14616e08ce675fe262f0d7b61
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStarted.java
    M server/pom.xml
    M server/zanata-war/pom.xml
    A 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeResourceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  WIP ZNTA-1705 - convert tm merge RPC to REST


  Commit: f9d1a3c1e86626f249a5138770d3d3b5ae1e4910
      
https://github.com/zanata/zanata-platform/commit/f9d1a3c1e86626f249a5138770d3d3b5ae1e4910
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  ZNTA-1705 - refactor method


  Commit: f24835079c171fe2ff649f4ab1370baead19f4d3
      
https://github.com/zanata/zanata-platform/commit/f24835079c171fe2ff649f4ab1370baead19f4d3
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    R 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeResourceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java

  Log Message:
  -----------
  ZNTA-1705 - refactor REST api


  Commit: 904a0bc450bbde312df12e90a071cee6061b1691
      
https://github.com/zanata/zanata-platform/commit/904a0bc450bbde312df12e90a071cee6061b1691
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  ZNTA-1705 - synchronize tm merge


  Commit: 5f83857443c5b0d08255da9aa55d7e0612ddf37f
      
https://github.com/zanata/zanata-platform/commit/5f83857443c5b0d08255da9aa55d7e0612ddf37f
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    A 
server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A 
server/zanata-war/src/main/java/org/zanata/rest/UnsupportedOperationExceptionMapper.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    A 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.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/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1705 - tm merge done asynchronizely


  Commit: a898e4f772f4a42bac352c20cde940e411e32042
      
https://github.com/zanata/zanata-platform/commit/a898e4f772f4a42bac352c20cde940e411e32042
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressEvent.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressHandler.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TMMergeInProgress.java
    R 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStarted.java
    M 
server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    R 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  ZNTA-1705 - display progress


  Commit: 5e6259b00a41ed27bd8d370ab887ca0ae05b4356
      
https://github.com/zanata/zanata-platform/commit/5e6259b00a41ed27bd8d370ab887ca0ae05b4356
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressEvent.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TMMergeInProgress.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStarted.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/search/FilterConstraints.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M 
server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1705 - load text flow in batch


  Commit: 6400647899ec326fa8821ecb10fff35c87083cb3
      
https://github.com/zanata/zanata-platform/commit/6400647899ec326fa8821ecb10fff35c87083cb3
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressEvent.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndEvent.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndHandler.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.ui.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TMMergeInProgress.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStartOrEnd.java
    R 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStarted.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  ZNTA-1705 - handle TM merge progress event for different users


  Commit: d4369367249dd716d3bbc095ef46339e1b1174ad
      
https://github.com/zanata/zanata-platform/commit/d4369367249dd716d3bbc095ef46339e1b1174ad
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeCancelRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  ZNTA-1705 - able to cancel TM merge


  Commit: 18fd525e761739f61fd7d007b39833f1ab4ee2f3
      
https://github.com/zanata/zanata-platform/commit/18fd525e761739f61fd7d007b39833f1ab4ee2f3
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    R 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java

  Log Message:
  -----------
  ZNTA-1705 - update UI


  Commit: 24019b340a9472693693f2a15591749c19343c00
      
https://github.com/zanata/zanata-platform/commit/24019b340a9472693693f2a15591749c19343c00
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  ZNTA-1705 - fix unit test


  Commit: 4e4c60542ff942e5de1850a3e2f5090e9764d6fd
      
https://github.com/zanata/zanata-platform/commit/4e4c60542ff942e5de1850a3e2f5090e9764d6fd
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M server/functional-test/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  fix enforcer error


  Commit: 91f056315edc0fdc5d99678a5dc61580fefc7c9b
      
https://github.com/zanata/zanata-platform/commit/91f056315edc0fdc5d99678a5dc61580fefc7c9b
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressEvent.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndEvent.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  changes after first review


  Commit: 3458f151c17fced8b9f400a92798a2475ac20d5a
      
https://github.com/zanata/zanata-platform/commit/3458f151c17fced8b9f400a92798a2475ac20d5a
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  ZNTA-1705 - fix arquillian test


  Commit: 4c8ca73f20a6950300e3039a131086fe38913ec2
      
https://github.com/zanata/zanata-platform/commit/4c8ca73f20a6950300e3039a131086fe38913ec2
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M server/gwt-editor/codeserver.sh

  Log Message:
  -----------
  add comment to gwt code server script


  Commit: 892a28aef369ba0526ddcb4337a97a0e4d60ac34
      
https://github.com/zanata/zanata-platform/commit/892a28aef369ba0526ddcb4337a97a0e4d60ac34
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndEvent.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  ZNTA-1705 - fix issue with editorClientId


  Commit: ab7d3c9df066f81e66b710c7acb3e21f6222c0bc
      
https://github.com/zanata/zanata-platform/commit/ab7d3c9df066f81e66b710c7acb3e21f6222c0bc
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    A 
server/zanata-war/src/main/java/org/zanata/events/TransMemoryMergeEvent.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    A 
server/zanata-war/src/main/java/org/zanata/webtrans/server/TransMemoryMergeEventPublisher.java
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  ZNTA-1705 - try to fix arquillian test


  Commit: 4dfda54572458cfa5424c8142d5c3f2be7f45ad6
      
https://github.com/zanata/zanata-platform/commit/4dfda54572458cfa5424c8142d5c3f2be7f45ad6
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    A 
server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    R 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    A 
server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    R 
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  ZNTA-1705 - move class so that it's not under webtrans.server package


  Commit: e3e4f9195aa78729005ea55dc1a261820b9d1157
      
https://github.com/zanata/zanata-platform/commit/e3e4f9195aa78729005ea55dc1a261820b9d1157
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M 
server/zanata-war/src/main/java/org/zanata/events/TransMemoryMergeEvent.java
    A 
server/zanata-war/src/main/java/org/zanata/events/TransMemoryMergeProgressEvent.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/webtrans/server/TransMemoryMergeEventPublisher.java

  Log Message:
  -----------
  ZNTA-1705 - use CDI event so that service not depend on gwt code


  Commit: 00892f3bddff1c2acdf3f7b1eb54ed148bcb5382
      
https://github.com/zanata/zanata-platform/commit/00892f3bddff1c2acdf3f7b1eb54ed148bcb5382
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeCancelRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-1705 - add more test


  Commit: 0f41f9693b8fd97bacec0563dd94081babc6a622
      
https://github.com/zanata/zanata-platform/commit/0f41f9693b8fd97bacec0563dd94081babc6a622
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M server/functional-test/pom.xml
    A server/gwt-editor/codeserver.sh
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressEvent.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeProgressHandler.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndEvent.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/TMMergeStartOrEndHandler.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    R 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.ui.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/TransMemoryMergeResource.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeCancelRequest.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TMMergeInProgress.java
    R 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMergeStartOrEnd.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/search/FilterConstraints.java
    M server/pom.xml
    M server/zanata-war/pom.xml
    A 
server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A 
server/zanata-war/src/main/java/org/zanata/events/TransMemoryMergeEvent.java
    A 
server/zanata-war/src/main/java/org/zanata/events/TransMemoryMergeProgressEvent.java
    A 
server/zanata-war/src/main/java/org/zanata/rest/UnsupportedOperationExceptionMapper.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    A 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.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
    A 
server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    A 
server/zanata-war/src/main/java/org/zanata/webtrans/server/TransMemoryMergeEventPublisher.java
    R 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    R 
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    A 
server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    R 
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Merge pull request #228 from zanata/ZNTA-1705-tm-merge

Trans Memory Merge for a single document


Compare: 
https://github.com/zanata/zanata-platform/compare/126a119afa0a...0f41f9693b8f
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to