Branch: refs/heads/Jenkinsfile
  Home:   https://github.com/zanata/zanata-platform
  Commit: 07df06788bb09d999588659d9fc3203b75b27c2e
      
https://github.com/zanata/zanata-platform/commit/07df06788bb09d999588659d9fc3203b75b27c2e
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M client/zanata-cli/pom.xml
    M client/zanata-cli/src/main/assembly/bin.xml

  Log Message:
  -----------
  ZNTA-1141 - enable windows bat script to be included


  Commit: 3cfe48b58ecec869d451ac960e3e901229162c7c
      
https://github.com/zanata/zanata-platform/commit/3cfe48b58ecec869d451ac960e3e901229162c7c
  Author: Simon Pedersen <nit...@gmail.com>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M docs/client/installation/windows-installation.md

  Log Message:
  -----------
  [PATCH] Update windows-installation.md


  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: edbb6d1ba3d236581d7346151e88ffc6fa6f46a1
      
https://github.com/zanata/zanata-platform/commit/edbb6d1ba3d236581d7346151e88ffc6fa6f46a1
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M build

  Log Message:
  -----------
  fix: updated build help script


  Commit: 739efd3b397c46be1c9094ce62d7812fed0a3c5b
      
https://github.com/zanata/zanata-platform/commit/739efd3b397c46be1c9094ce62d7812fed0a3c5b
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M build

  Log Message:
  -----------
  Update build script help

Reverted part of previous commit based on feedback


  Commit: bcd6337c3dbd3d42154aa65d01a0c245ad45c9be
      
https://github.com/zanata/zanata-platform/commit/bcd6337c3dbd3d42154aa65d01a0c245ad45c9be
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M build

  Log Message:
  -----------
  Show passthrough options at end


  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: 2e08f3bf3072876bfa6d16c9f87bead586193ab9
      
https://github.com/zanata/zanata-platform/commit/2e08f3bf3072876bfa6d16c9f87bead586193ab9
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M build

  Log Message:
  -----------
  Merge pull request #218 from zanata/ZNTA-serverbuildhelp-update

fix: updated build help script


  Commit: 89ef6779fb2c73f9a37b4980e2e538a480efcd69
      
https://github.com/zanata/zanata-platform/commit/89ef6779fb2c73f9a37b4980e2e538a480efcd69
  Author: David Mason <drdma...@gmail.com>
  Date:   2017-03-12 (Sun, 12 Mar 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/__tests__/utils/UtilTest.js
    A server/zanata-frontend/src/frontend/__tests__/utils/phraseTest.js
    M server/zanata-frontend/src/frontend/app/editor/actions/phrases.js
    M server/zanata-frontend/src/frontend/app/editor/utils/Util.js
    M server/zanata-frontend/src/frontend/app/editor/utils/phrase.js

  Log Message:
  -----------
  fix(ZNTA-1767): allow adding new translations in React editor (#215)

* fix(ZNTA-1767): allow adding new translations in React editor

Conflicts:
    server/zanata-frontend/src/frontend/app/editor/actions/phrases.js
      Refactored in master, had some added phrase detail in the branch,
      so had to adjust the cherry-picked code to fit the refactored code.

* test(editor utils): increase to 100% unit test coverage of util module

* test(editor utils): increase to 100% coverage for phrase utils module


  Commit: 818b14ff481988715918dd1f3c1257bcdcff9a06
      
https://github.com/zanata/zanata-platform/commit/818b14ff481988715918dd1f3c1257bcdcff9a06
  Author: David Mason <drdma...@gmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M server/zanata-frontend/src/editor/app/utils/RoutingHelpers.js

  Log Message:
  -----------
  fix(ZNTA-1744): use browserHistory consistently

Paging was not working properly because there was a usage of hashHistory
that was not updated when the app switched to browserHistory.


  Commit: 896b9644db7bff18ca633e310f831fff675f70b5
      
https://github.com/zanata/zanata-platform/commit/896b9644db7bff18ca633e310f831fff675f70b5
  Author: David Mason <drdma...@gmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M server/zanata-frontend/src/editor/app/utils/RoutingHelpers.js

  Log Message:
  -----------
  fix(ZNTA-1774): fix paging in React editor

Fix paging in React editor (ZNTA-1774)


  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: c39d812f7158bbed0b98aa8b6e269697f9974486
      
https://github.com/zanata/zanata-platform/commit/c39d812f7158bbed0b98aa8b6e269697f9974486
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/utils/RoutingHelpers.js

  Log Message:
  -----------
  Merge commit '896b9644db7bff18ca633e310f831fff675f70b5' into HEAD


  Commit: c52b93dafd05761e2745a2a19441b7f5bee21f42
      
https://github.com/zanata/zanata-platform/commit/c52b93dafd05761e2745a2a19441b7f5bee21f42
  Author: kgough <kgo...@redhat.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  fix: removed scrollbar from search and replace header (ZNTA-1778)


  Commit: 2ef55066aecf325a651b42734310a5c4b6047805
      
https://github.com/zanata/zanata-platform/commit/2ef55066aecf325a651b42734310a5c4b6047805
  Author: Damian Jansen <djan...@redhat.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    A 
server/zanata-war/src/test/java/org/zanata/webhook/events/DocumentMilestoneEventTest.java

  Log Message:
  -----------
  test(coverage): DocumentMilestoneEvent test (#232)


  Commit: eb6b04ab368b266b30efe2c7c5d29723e8f4be8f
      
https://github.com/zanata/zanata-platform/commit/eb6b04ab368b266b30efe2c7c5d29723e8f4be8f
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  Merge pull request #233 from zanata/search-replace-header-fix

fix: removed scrollbar from search and replace header (ZNTA-1778)


  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: 126a119afa0a7676a04e2c85592d516f3d2419a7
      
https://github.com/zanata/zanata-platform/commit/126a119afa0a7676a04e2c85592d516f3d2419a7
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M client/zanata-cli/pom.xml
    M client/zanata-cli/src/main/assembly/bin.xml
    M docs/client/installation/windows-installation.md

  Log Message:
  -----------
  Merge pull request #172 from zanata/ZNTA-1141-cli-windows

ZNTA-1141 - enable windows bat script to be included


  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


  Commit: 455bcde6b2b2df0aeac5fbb58b4ee3f4e5040574
      
https://github.com/zanata/zanata-platform/commit/455bcde6b2b2df0aeac5fbb58b4ee3f4e5040574
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  Merge commit 'eb6b04ab368b266b30efe2c7c5d29723e8f4be8f' into HEAD


  Commit: 77efc26065b18b57baaa5fad0077c8c5c97d0a84
      
https://github.com/zanata/zanata-platform/commit/77efc26065b18b57baaa5fad0077c8c5c97d0a84
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-03-17 (Fri, 17 Mar 2017)

  Changed paths:
    M server/pom.xml

  Log Message:
  -----------
  refactor: update to Kotlin 1.0.7 (#236)


  Commit: 37d9c490fb082f19d1d88ed8c9539ef4bd35fb63
      
https://github.com/zanata/zanata-platform/commit/37d9c490fb082f19d1d88ed8c9539ef4bd35fb63
  Author: Damian Jansen <djan...@redhat.com>
  Date:   2017-03-17 (Fri, 17 Mar 2017)

  Changed paths:
    M server/pom.xml
    M server/zanata-test-war/pom.xml

  Log Message:
  -----------
  fix(ZNTA-1783): Upgrade entityunit (#235)


  Commit: 2c47f6822a6ade01ea84614799d4fc2293b08fea
      
https://github.com/zanata/zanata-platform/commit/2c47f6822a6ade01ea84614799d4fc2293b08fea
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M build
    M client/zanata-cli/pom.xml
    M client/zanata-cli/src/main/assembly/bin.xml
    M docs/client/installation/windows-installation.md
    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/client/view/SearchResultsView.ui.xml
    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
    A server/zanata-frontend/src/frontend/__tests__/utils/UtilTest.js
    A server/zanata-frontend/src/frontend/__tests__/utils/phraseTest.js
    M server/zanata-frontend/src/frontend/app/editor/actions/phrases.js
    M server/zanata-frontend/src/frontend/app/editor/utils/RoutingHelpers.js
    M server/zanata-frontend/src/frontend/app/editor/utils/Util.js
    M server/zanata-frontend/src/frontend/app/editor/utils/phrase.js
    M server/zanata-test-war/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
    A 
server/zanata-war/src/test/java/org/zanata/webhook/events/DocumentMilestoneEventTest.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 branch 'master' into Jenkinsfile


Compare: 
https://github.com/zanata/zanata-platform/compare/742ed8bea0e0...2c47f6822a6a
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to