[zanata/zanata-platform] 716af8: ZNTA-1865 - can merge translation from TM

GitHub noreply at github.com
Fri Jul 28 03:46:06 UTC 2017


  Branch: refs/heads/ZNTA-1771-tmx
  Home:   https://github.com/zanata/zanata-platform
  Commit: 716af8eb6a51ae6df74350c70256fb3932aec770
      https://github.com/zanata/zanata-platform/commit/716af8eb6a51ae6df74350c70256fb3932aec770
  Author: Patrick Huang <pahuang at 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/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.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


  Commit: 4a5fb71ea3ec152fdac0097c8f2e83d8bca31b7b
      https://github.com/zanata/zanata-platform/commit/4a5fb71ea3ec152fdac0097c8f2e83d8bca31b7b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    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
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

  Log Message:
  -----------
  ZNTA-1865 add test and refactor


  Commit: 2e09a2976b26a74bec82478bc8aa01296c7a5555
      https://github.com/zanata/zanata-platform/commit/2e09a2976b26a74bec82478bc8aa01296c7a5555
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  add comment to differentiate two similar APIs


  Commit: 98ca6c73f2d76f61b97bcd4228775f937dbc7afe
      https://github.com/zanata/zanata-platform/commit/98ca6c73f2d76f61b97bcd4228775f937dbc7afe
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java

  Log Message:
  -----------
  ZNTA-1865 add versions to project search result


  Commit: c1d5b612002b57e15de6c95fad6e82bf4b10196e
      https://github.com/zanata/zanata-platform/commit/c1d5b612002b57e15de6c95fad6e82bf4b10196e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java

  Log Message:
  -----------
  ZNTA-1865 fix dto marshalling


  Commit: dbc9848b7df779b1a840d7b01c749ee81ad0673a
      https://github.com/zanata/zanata-platform/commit/dbc9848b7df779b1a840d7b01c749ee81ad0673a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  ZNTA-1865 - fix bug and refactor


  Commit: 978639f34fd9892bf85929f8f78394fbb826671c
      https://github.com/zanata/zanata-platform/commit/978639f34fd9892bf85929f8f78394fbb826671c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-2057 refactor async task key


  Commit: a50d69c095556a80219c5aa6315923e21f6a1919
      https://github.com/zanata/zanata-platform/commit/a50d69c095556a80219c5aa6315923e21f6a1919
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/GetDownloadAllFilesProgressResult.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  ZNTA-2057 change int to long for progress fields


  Commit: bd74bdfc6808611e9fc2f08ee1de81dfeb32db4f
      https://github.com/zanata/zanata-platform/commit/bd74bdfc6808611e9fc2f08ee1de81dfeb32db4f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java

  Log Message:
  -----------
  ZNTA-2057 refactor TransMemoryMergeTaskHandle


  Commit: a0f87515cea08f21a45667b0ef25e4dde17114ef
      https://github.com/zanata/zanata-platform/commit/a0f87515cea08f21a45667b0ef25e4dde17114ef
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  ZNTA-2057 - add new REST api for async task


  Commit: 949f3d6cce3aef8c1bb8808c66f068b75825f824
      https://github.com/zanata/zanata-platform/commit/949f3d6cce3aef8c1bb8808c66f068b75825f824
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java

  Log Message:
  -----------
  ZNTA-2057 - fix issues and use object as key


  Commit: 635fd270b901ff54b0b8b1c4ff2700dbc3b498fa
      https://github.com/zanata/zanata-platform/commit/635fd270b901ff54b0b8b1c4ff2700dbc3b498fa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  ZNTA-2057 add new status case in client


  Commit: 227c5c144aee6647595d59c511e7ab998d82ccb0
      https://github.com/zanata/zanata-platform/commit/227c5c144aee6647595d59c511e7ab998d82ccb0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  -----------
  ZNTA-2057 - suppress findbugs warning


  Commit: 717758c4a7abba626a7a9a53f0a693ae50eea6b9
      https://github.com/zanata/zanata-platform/commit/717758c4a7abba626a7a9a53f0a693ae50eea6b9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-2057 remove unused generic


  Commit: 8b4a68d7d755f8e78d49abd752b92b2dfaafa2d4
      https://github.com/zanata/zanata-platform/commit/8b4a68d7d755f8e78d49abd752b92b2dfaafa2d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/async/UserTriggerableTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java

  Log Message:
  -----------
  ZNTA-2057 add interface to task handle to identify triggerer


  Commit: 82fe345ae6382062a0439d8b4adf189196de57ca
      https://github.com/zanata/zanata-platform/commit/82fe345ae6382062a0439d8b4adf189196de57ca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java

  Log Message:
  -----------
  ZNTA-2057 add cancel to async REST api


  Commit: d2f42d2c9059524b6ddc8f696dffdd87fa1298c2
      https://github.com/zanata/zanata-platform/commit/d2f42d2c9059524b6ddc8f696dffdd87fa1298c2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/async/UserTriggerableTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java

  Log Message:
  -----------
  ZNTA-2057 change according to review


  Commit: ddc82d3fc6a6c5c60144faa09e7fc5243bdbf23e
      https://github.com/zanata/zanata-platform/commit/ddc82d3fc6a6c5c60144faa09e7fc5243bdbf23e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java

  Log Message:
  -----------
  ZNTA-2057 add unit test to new async API


  Commit: b1234809731f2e02663499a7945f811183e6414f
      https://github.com/zanata/zanata-platform/commit/b1234809731f2e02663499a7945f811183e6414f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java

  Log Message:
  -----------
  ZNTA-2057 fix warnings


  Commit: f2ad622f28e8faed268ed48eaf0cb5db5979bb86
      https://github.com/zanata/zanata-platform/commit/f2ad622f28e8faed268ed48eaf0cb5db5979bb86
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java

  Log Message:
  -----------
  ZNTA-2057 use string as key in async handles map


  Commit: 7ccff5e7de1e7cb06585bfbdb374410e954e57d5
      https://github.com/zanata/zanata-platform/commit/7ccff5e7de1e7cb06585bfbdb374410e954e57d5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    R server/zanata-war/src/main/java/org/zanata/async/UserTriggerableTaskHandle.java
    A server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java

  Log Message:
  -----------
  ZNTA-2057 refactor


  Commit: 5989300c1af12b2f2cc8bcdeb651cfe1f0e22e91
      https://github.com/zanata/zanata-platform/commit/5989300c1af12b2f2cc8bcdeb651cfe1f0e22e91
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java

  Log Message:
  -----------
  ZNTA-2057 restrict only owner or admin can view the process status


  Commit: e753e86ce8476996501daa1587731bee69e8a585
      https://github.com/zanata/zanata-platform/commit/e753e86ce8476996501daa1587731bee69e8a585
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java

  Log Message:
  -----------
  ZNTA-2057 add arquillian test for async process API


  Commit: c3621f115222c0a25bd8162aceebbd86b386d8d6
      https://github.com/zanata/zanata-platform/commit/c3621f115222c0a25bd8162aceebbd86b386d8d6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-2057 fix tests


  Commit: e741ebe807f8e72ccc97084b0954b0021ca492f9
      https://github.com/zanata/zanata-platform/commit/e741ebe807f8e72ccc97084b0954b0021ca492f9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java

  Log Message:
  -----------
  ZNTA-2057 refactor


  Commit: c6c53e301b49eb8356a128d43cd3aead9257ed7d
      https://github.com/zanata/zanata-platform/commit/c6c53e301b49eb8356a128d43cd3aead9257ed7d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java

  Log Message:
  -----------
  fix findbugs warnings


  Commit: 2537239173e383dd052feda49fec7dd7fa1bbabd
      https://github.com/zanata/zanata-platform/commit/2537239173e383dd052feda49fec7dd7fa1bbabd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/GenericAsyncTaskKey.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  move inner classes out


  Commit: aaffc27dbe85fb69b9253bd7e4f05c87e72ff53e
      https://github.com/zanata/zanata-platform/commit/aaffc27dbe85fb69b9253bd7e4f05c87e72ff53e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java

  Log Message:
  -----------
  add comment to class


  Commit: 6b5982d06bef2343c63b91f46740c0341e680306
      https://github.com/zanata/zanata-platform/commit/6b5982d06bef2343c63b91f46740c0341e680306
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

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

  Log Message:
  -----------
  ZNTA-1865 - add javadoc to TM merge for version api


  Commit: 731826dcd0ac418115f0b3410f249545406ac6bf
      https://github.com/zanata/zanata-platform/commit/731826dcd0ac418115f0b3410f249545406ac6bf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/DocumentType.java
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M client/stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    M client/zanata-cli/src/test/java/org/zanata/client/ParameterRule.java
    M client/zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/UpdateCheckerTest.java
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPushPullMojo.java
    M parent/pom.xml
    M server/functional-test/pom.xml
    R server/functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M server/functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/functional-test/src/main/java/org/zanata/page/explore/ExplorePage.java
    M server/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M server/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M server/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/ProjectPeoplePage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    R server/functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A server/functional-test/src/main/java/org/zanata/util/FluentWaitExt.kt
    M server/functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M server/functional-test/src/main/java/org/zanata/util/WebDriverLogWait.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/feature/Feature.java
    A server/functional-test/src/test/java/org/zanata/feature/Trace.java
    M server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M server/functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M server/functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M server/functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    A server/functional-test/src/test/java/org/zanata/feature/testharness/ComprehensiveTestSuite.java
    M server/functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A server/functional-test/src/test/java/org/zanata/util/TestTracing.java
    A server/functional-test/src/test/java/org/zanata/util/TraceEntry.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/pom.xml
    M server/security-common/pom.xml
    M server/zanata-frontend/src/frontend/README.md
    M server/zanata-frontend/src/frontend/app/actions/explore-actions.js
    M server/zanata-frontend/src/frontend/app/actions/glossary-actions.js
    M server/zanata-frontend/src/frontend/app/actions/languages-actions.js
    M server/zanata-frontend/src/frontend/app/components/EditableText/index.js
    M server/zanata-frontend/src/frontend/app/components/Icon/index.jsx
    M server/zanata-frontend/src/frontend/app/components/Link/Link.story.js
    M server/zanata-frontend/src/frontend/app/components/Link/index.js
    M server/zanata-frontend/src/frontend/app/components/Loader/index.js
    M server/zanata-frontend/src/frontend/app/components/LoaderText/index.js
    M server/zanata-frontend/src/frontend/app/components/LogoLoader/index.js
    M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/frontend/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/frontend/app/components/Modal/ModalFooter.jsx
    M server/zanata-frontend/src/frontend/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/frontend/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
    M server/zanata-frontend/src/frontend/app/components/Nav/NavIcon.jsx
    M server/zanata-frontend/src/frontend/app/components/Nav/NavItem.jsx
    M server/zanata-frontend/src/frontend/app/components/Nav/index.jsx
    M server/zanata-frontend/src/frontend/app/components/Notification/component.js
    M server/zanata-frontend/src/frontend/app/components/TextInput/index.js
    M server/zanata-frontend/src/frontend/app/containers/App.js
    M server/zanata-frontend/src/frontend/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/frontend/app/containers/Explore/index.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/frontend/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/frontend/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/index.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/index.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryItemMatrix.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/ContributionChart.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/frontend/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/Button/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/Dropdown/Dropdown.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/frontend/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionSearchInput/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslations.js
    M server/zanata-frontend/src/frontend/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/frontend/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/ToggleSwitch.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter/TransUnitFilter.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitStatus.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutDispatcher.js
    M server/zanata-frontend/src/frontend/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/frontend/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/frontend/app/editor/containers/ParamPropDispatcher.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SidebarContent.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SidebarSettings.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsBody.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/ZanataLogoLoader.js
    M server/zanata-frontend/src/frontend/app/editor/index.js
    M server/zanata-frontend/src/frontend/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/index.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/frontend/app/index.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json
    A server/zanata-frontend/src/frontend/scripts/codemods/create-component.js
    A server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js
    A server/zanata-frontend/src/frontend/scripts/codemods/stateless.template.js
    A server/zanata-frontend/src/frontend/scripts/codemods/story.template.js
    A server/zanata-frontend/src/frontend/scripts/codemods/test.template.js
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/tmx/TMXUtil.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.kt
    M server/zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M server/zanata-war/src/main/java/org/zanata/jpa/EntityManagerFactoryProducer.java
    M server/zanata-war/src/main/java/org/zanata/rest/JaxRSApplication.java
    M server/zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java
    M server/zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M server/zanata-war/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-1865-version-tm-merge


  Commit: eb346f12d45a5d49b9336588236b2e43dabefe19
      https://github.com/zanata/zanata-platform/commit/eb346f12d45a5d49b9336588236b2e43dabefe19
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java

  Log Message:
  -----------
  ZNTA-1865 fix test


  Commit: 29c8a09ed92803662387e15503d6871aac8b5696
      https://github.com/zanata/zanata-platform/commit/29c8a09ed92803662387e15503d6871aac8b5696
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.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/impl/MergeTranslationsServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1865 - refactor move methods and class


  Commit: 75642f6f3d6e37a661741e683c41cc84429211e1
      https://github.com/zanata/zanata-platform/commit/75642f6f3d6e37a661741e683c41cc84429211e1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    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/MergeTranslationsServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1865 refactor: reduce code dep


  Commit: 494e5ea04efec894849422864f3b8a9d396ca905
      https://github.com/zanata/zanata-platform/commit/494e5ea04efec894849422864f3b8a9d396ca905
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    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

  Log Message:
  -----------
  ZNTA-1865 move method and remove from versions list check


  Commit: 3219cb68518cf3a615550351dde86e40cf62c233
      https://github.com/zanata/zanata-platform/commit/3219cb68518cf3a615550351dde86e40cf62c233
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  ZNTA-1865 refactor: reduce code dup


  Commit: a92a22aa219002895d444c24af047ee36259bc3f
      https://github.com/zanata/zanata-platform/commit/a92a22aa219002895d444c24af047ee36259bc3f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/GetDownloadAllFilesProgressResult.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/GenericAsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.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/TransMemoryMergeManager.java
    A server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.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/DownloadAllFilesHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java

  Log Message:
  -----------
  Merge branch 'ZNTA-2057-async-refactor' into ZNTA-1865-version-tm-merge


  Commit: b8f8807cc351090c4bf169e4fea0ae3a760a3001
      https://github.com/zanata/zanata-platform/commit/b8f8807cc351090c4bf169e4fea0ae3a760a3001
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java

  Log Message:
  -----------
  ZNTA-1865 fix up after merge


  Commit: 8326d7edfbcab622c067165974c4c599640dd5e3
      https://github.com/zanata/zanata-platform/commit/8326d7edfbcab622c067165974c4c599640dd5e3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java

  Log Message:
  -----------
  minor


  Commit: be4ba05c2a4a703883418b040724f80c4adb0ba1
      https://github.com/zanata/zanata-platform/commit/be4ba05c2a4a703883418b040724f80c4adb0ba1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1865 REST api returns process status


  Commit: cd71b534cfd4f7b3b5ad7fe5a1193c6ea6212c29
      https://github.com/zanata/zanata-platform/commit/cd71b534cfd4f7b3b5ad7fe5a1193c6ea6212c29
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  ZNTA-1865 add react mount point to project version jsf page


  Commit: 15c8694e3e030ca5ec0c9a2e2a63217f000d2e40
      https://github.com/zanata/zanata-platform/commit/15c8694e3e030ca5ec0c9a2e2a63217f000d2e40
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java

  Log Message:
  -----------
  ZNTA-2057 fix: copyTrans didn't set triggerer


  Commit: 5266b970e89842f2f1e85e435763a698484b02f7
      https://github.com/zanata/zanata-platform/commit/5266b970e89842f2f1e85e435763a698484b02f7
  Author: Sachin Pathare <spathare at redhat.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A server/functional-test/src/main/java/org/zanata/page/languages/RequestToJoinPopup.java
    M server/functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java

  Log Message:
  -----------
  Added comprehensive test for language (#402)


  Commit: ff15e343014da7559161b46ec3671aefbca9bfd3
      https://github.com/zanata/zanata-platform/commit/ff15e343014da7559161b46ec3671aefbca9bfd3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/GetDownloadAllFilesProgressResult.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/GenericAsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.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/TransMemoryMergeManager.java
    A server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.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/DownloadAllFilesHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java

  Log Message:
  -----------
  Merge pull request #398 from zanata/ZNTA-2057-async-refactor

ZNTA-2057 async refactor


  Commit: 5c8e59cf861efd36f052152cb3df1ca17e6264d9
      https://github.com/zanata/zanata-platform/commit/5c8e59cf861efd36f052152cb3df1ca17e6264d9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M Jenkinsfile
    A server/functional-test/etc/trace-tests.groovy
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A server/functional-test/src/main/java/org/zanata/page/languages/RequestToJoinPopup.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/util/TestTracing.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-1865-version-tm-merge


  Commit: 4f1022dba8522a4b07f283b4ef785273435728af
      https://github.com/zanata/zanata-platform/commit/4f1022dba8522a4b07f283b4ef785273435728af
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) create storybook for editor settings options


  Commit: 37705c9335af3d448008245590a24ebbca947bef
      https://github.com/zanata/zanata-platform/commit/37705c9335af3d448008245590a24ebbca947bef
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  feat(ZNTA-2070) styling of editor settings


  Commit: e4462108ca2db395d254ebc4c30d81a68f590403
      https://github.com/zanata/zanata-platform/commit/e4462108ca2db395d254ebc4c30d81a68f590403
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java

  Log Message:
  -----------
  fix(ZNTA-2061) corrected colour of translation history rejected text


  Commit: 5af2c3cc2757ad3601f14adf8aa2007e45d0151c
      https://github.com/zanata/zanata-platform/commit/5af2c3cc2757ad3601f14adf8aa2007e45d0151c
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP SettingsOptions component


  Commit: 12eda4093e0718bd8bc6be42e4288439778d7bab
      https://github.com/zanata/zanata-platform/commit/12eda4093e0718bd8bc6be42e4288439778d7bab
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP SettingsOptions component


  Commit: 61b95dc19f473c4c1eabc1b271e4b8c335f8f1dd
      https://github.com/zanata/zanata-platform/commit/61b95dc19f473c4c1eabc1b271e4b8c335f8f1dd
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP add SettingsOptions and SettingOption stories to editor


  Commit: bd7acd8c15e9a24a1dbde726506e2ca9f14e22a6
      https://github.com/zanata/zanata-platform/commit/bd7acd8c15e9a24a1dbde726506e2ca9f14e22a6
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP add SettingsOptions and SettingOption stories to editor


  Commit: 1b809401b5e9064705a8fa5c31bc1c936f85e73f
      https://github.com/zanata/zanata-platform/commit/1b809401b5e9064705a8fa5c31bc1c936f85e73f
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP add SettingsOptions and SettingOption stories to editor


  Commit: da9717f910b8073fb3d1c228558c11c90db5677b
      https://github.com/zanata/zanata-platform/commit/da9717f910b8073fb3d1c228558c11c90db5677b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/docker/README.md
    M server/docker/rundb.sh

  Log Message:
  -----------
  add new option to use an ephemeral database container


  Commit: a8cb0296ee1653af3722632a84b4d4a4b064d5cb
      https://github.com/zanata/zanata-platform/commit/a8cb0296ee1653af3722632a84b4d4a4b064d5cb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/docker/README.md
    M server/docker/rundb.sh

  Log Message:
  -----------
  Merge pull request #410 from zanata/rundb-script

add new option to use an ephemeral database container


  Commit: 31dacfb892fa01ed6625f070131a8ab5195f7702
      https://github.com/zanata/zanata-platform/commit/31dacfb892fa01ed6625f070131a8ab5195f7702
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070): WIP storybook for SettingOption and SettingsOptions components


  Commit: 75d9b3c5ccb4b8976b1f549b9ed84f1f4fdee093
      https://github.com/zanata/zanata-platform/commit/75d9b3c5ccb4b8976b1f549b9ed84f1f4fdee093
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) SettingOption component created


  Commit: f57c8c86fb581e7bf5fa6b23727cf1cba8732a0b
      https://github.com/zanata/zanata-platform/commit/f57c8c86fb581e7bf5fa6b23727cf1cba8732a0b
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) added working checkboxes to SettingOptoin and SettingsOptions stories - still WIP


  Commit: ed49ece1e9e397d66f56a51e619ca25cdda93704
      https://github.com/zanata/zanata-platform/commit/ed49ece1e9e397d66f56a51e619ca25cdda93704
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) fixed prop names in SettingsOptions


  Commit: 7dfc159c604d4cce5b506587fe1c1fc938e94b02
      https://github.com/zanata/zanata-platform/commit/7dfc159c604d4cce5b506587fe1c1fc938e94b02
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) storybook now includes checkbox labels for SettingOption and SettingsOptions


  Commit: 9c62880a09221fff5d0e86b686d14b419307d8f3
      https://github.com/zanata/zanata-platform/commit/9c62880a09221fff5d0e86b686d14b419307d8f3
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP: default props for SettingsOptions component


  Commit: 5dbc59d1518213c750b7c38497d0b86fc54682ba
      https://github.com/zanata/zanata-platform/commit/5dbc59d1518213c750b7c38497d0b86fc54682ba
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP proptypes


  Commit: 033c8577177a1f6086cbca4b7b92567c6078cdac
      https://github.com/zanata/zanata-platform/commit/033c8577177a1f6086cbca4b7b92567c6078cdac
  Author: kgough <kgough at redhat.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js

  Log Message:
  -----------
  feat(ZNTA-2070) components refactored and fixed - SettingOption,SettingsOptions


  Commit: 3d98570cd8c800d3d344b56a311dfe283879ce7c
      https://github.com/zanata/zanata-platform/commit/3d98570cd8c800d3d344b56a311dfe283879ce7c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java

  Log Message:
  -----------
  ZNTA-2056 use same analyzer to parse search query


  Commit: 4f686ecd35bea65077a06747a224d6ef5e3c3957
      https://github.com/zanata/zanata-platform/commit/4f686ecd35bea65077a06747a224d6ef5e3c3957
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-07-02 (Sun, 02 Jul 2017)

  Changed paths:
    M server/functional-test/etc/trace-tests.groovy
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    A server/functional-test/src/main/java/org/zanata/page/account/EnterNewPasswordPage.java
    M server/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/util/EmailQuery.java
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml

  Log Message:
  -----------
  fix(test): Add Polarion ids to and improve account tests (#411)

* Improve map in trace-tests
* fix(test): Add Polarion ids to and improve account tests


  Commit: 47de7b5e0352f84121afc645afa3c99cc25189ca
      https://github.com/zanata/zanata-platform/commit/47de7b5e0352f84121afc645afa3c99cc25189ca
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java

  Log Message:
  -----------
  feat(ZNTA-2061) fixed test


  Commit: ae1a2009f1e184ee00ccfa9e9d047f816f75707b
      https://github.com/zanata/zanata-platform/commit/ae1a2009f1e184ee00ccfa9e9d047f816f75707b
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java

  Log Message:
  -----------
  Merge pull request #409 from zanata/ZNTA-2061

fix(ZNTA-2061) corrected colour of translation history rejected text


  Commit: bad810ba73cd93b9c4fbdc52faee1a09d0535fca
      https://github.com/zanata/zanata-platform/commit/bad810ba73cd93b9c4fbdc52faee1a09d0535fca
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) added default SettingsOptions and ValidationOptions stories


  Commit: 30e3243ac3a9d9c4db0af151dffde639972440e6
      https://github.com/zanata/zanata-platform/commit/30e3243ac3a9d9c4db0af151dffde639972440e6
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) modified default SettingsOptions and ValidationOptions stories


  Commit: fe2d165fa81a5783e818b274efb74597f9c8bef3
      https://github.com/zanata/zanata-platform/commit/fe2d165fa81a5783e818b274efb74597f9c8bef3
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) added the rest of the SettingsOptions stories (Editor options)


  Commit: ea955d671c2af8caff62f2c1ebe702027a184d17
      https://github.com/zanata/zanata-platform/commit/ea955d671c2af8caff62f2c1ebe702027a184d17
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) removed wrapper class from SettingOption and SettingsOptions stories


  Commit: 6f004d44de9fac9517f43e34e10c748dc8bf569d
      https://github.com/zanata/zanata-platform/commit/6f004d44de9fac9517f43e34e10c748dc8bf569d
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  feat(ZNTA-2070) css styling for Editor Options and Validation Settings


  Commit: 004a9aa2b5b30eeeb027e94872324081dda2b60a
      https://github.com/zanata/zanata-platform/commit/004a9aa2b5b30eeeb027e94872324081dda2b60a
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) added whitespace to storybook storyname


  Commit: 0f0d8737c2bae4466e8d19aac585d30ceb95f7fc
      https://github.com/zanata/zanata-platform/commit/0f0d8737c2bae4466e8d19aac585d30ceb95f7fc
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) removed redundant ValidationOptions component from editor/components


  Commit: e3d56ea72d8e96830bdf516cd013b4dd329d27c7
      https://github.com/zanata/zanata-platform/commit/e3d56ea72d8e96830bdf516cd013b4dd329d27c7
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  feat(ZNTA-2070) WIP storybook wrapper


  Commit: a6c82ecc3da6ae19de8287d84f635e7b0f63140a
      https://github.com/zanata/zanata-platform/commit/a6c82ecc3da6ae19de8287d84f635e7b0f63140a
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  feat(ZNTA-2070) fixed wrapper and styling of SettingOption and SettingsOptions stories


  Commit: 2bf5532255d58ac2b491e615963d27d0372717d4
      https://github.com/zanata/zanata-platform/commit/2bf5532255d58ac2b491e615963d27d0372717d4
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js

  Log Message:
  -----------
  Update SettingOption.story.js


  Commit: 7e86827e6e07c4c2ed4d2f29226ab9465dae2454
      https://github.com/zanata/zanata-platform/commit/7e86827e6e07c4c2ed4d2f29226ab9465dae2454
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Log Message:
  -----------
  Update SettingOption.story.js


  Commit: 748730d30c1941215227e9f23c119be5e01167cc
      https://github.com/zanata/zanata-platform/commit/748730d30c1941215227e9f23c119be5e01167cc
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js

  Log Message:
  -----------
  Update SettingsOptions.story.js


  Commit: 22cb8c576d15b36b19af324225335c1ee5e3d33f
      https://github.com/zanata/zanata-platform/commit/22cb8c576d15b36b19af324225335c1ee5e3d33f
  Author: David Mason <drdmason at gmail.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json

  Log Message:
  -----------
  fix(test-watch): add test-watch script to package.json

This allows command `make test-watch` and `make test-watch coverage=[glob pattern]`
to be run. When coverage is not specified, the default coverage pattern
for all files is used.


  Commit: 5a49374fa08048125acc9167fb6b983e765d6e7d
      https://github.com/zanata/zanata-platform/commit/5a49374fa08048125acc9167fb6b983e765d6e7d
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  Merge pull request #408 from zanata/ZNTA-2070

feat(ZNTA-2070) editor settings options


  Commit: 6a70d83ae75b5b24eb9453dd99c8619f04917ef3
      https://github.com/zanata/zanata-platform/commit/6a70d83ae75b5b24eb9453dd99c8619f04917ef3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

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

  Log Message:
  -----------
  fix: handle nullable version id list


  Commit: b72ea4a86942ed55b67fc2a00723b6673458962d
      https://github.com/zanata/zanata-platform/commit/b72ea4a86942ed55b67fc2a00723b6673458962d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-06 (Thu, 06 Jul 2017)

  Changed paths:
    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/resources/WebTransMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml

  Log Message:
  -----------
  fix: switch yellow and white for tm diff (#414)

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


  Commit: 5bec377bb9a85043a6412b6fdb0df267f0805122
      https://github.com/zanata/zanata-platform/commit/5bec377bb9a85043a6412b6fdb0df267f0805122
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  fix(ZNTA-2062) fixed wrapping of long document names in editor suggestions panel


  Commit: 6b6eff0cf2e10b2fa90bb64450bd482cf6884934
      https://github.com/zanata/zanata-platform/commit/6b6eff0cf2e10b2fa90bb64450bd482cf6884934
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-09 (Sun, 09 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  Merge pull request #416 from zanata/ZNTA-2062

fix(ZNTA-2062) fixed wrapping of long document names in editor suggestions panel


  Commit: 529fec9bd6f30bb479153d42c12acbac95a98234
      https://github.com/zanata/zanata-platform/commit/529fec9bd6f30bb479153d42c12acbac95a98234
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    R LICENSE.LESSER.txt
    R LICENSE.txt
    A client/README.md
    R client/README.txt
    A license-gpl.md
    A license.md

  Log Message:
  -----------
  Use Markdown licences, Maven badges for clients (#417)

* Add Maven badges for Zanata clients
* Use Markdown version of licence texts


  Commit: be8512c3d229c5eed71f4697db19b61c9f2ba123
      https://github.com/zanata/zanata-platform/commit/be8512c3d229c5eed71f4697db19b61c9f2ba123
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2107) word breaking and removal of hyphens for editor


  Commit: 617dc43e707542a2ea58138cf3f43c1f8150460a
      https://github.com/zanata/zanata-platform/commit/617dc43e707542a2ea58138cf3f43c1f8150460a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    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/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.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/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.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
    M server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #389 from zanata/ZNTA-1865-version-tm-merge

ZNTA-1865 - can merge translation from TM


  Commit: 543f946750ea61854f2d3e122523075640f7417f
      https://github.com/zanata/zanata-platform/commit/543f946750ea61854f2d3e122523075640f7417f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java

  Log Message:
  -----------
  fix(test): Workaround flake in test suite (#419)


  Commit: fba487a5a886d938f07093b94e745eb9519d6397
      https://github.com/zanata/zanata-platform/commit/fba487a5a886d938f07093b94e745eb9519d6397
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java

  Log Message:
  -----------
  ZNTA-2056 - index slug without analyze and support prefix search


  Commit: 93a4d320f6e92f7ba05872f9e55b7f77f8053866
      https://github.com/zanata/zanata-platform/commit/93a4d320f6e92f7ba05872f9e55b7f77f8053866
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2107) fixed word-breaks in Firefox


  Commit: 411f50c341096bdb230a4d5cc3cc6479434ced56
      https://github.com/zanata/zanata-platform/commit/411f50c341096bdb230a4d5cc3cc6479434ced56
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    A server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOCDIUnitTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java

  Log Message:
  -----------
  ZNTA-2056 split tests into separate classes


  Commit: fbefb1ba058e3af3ac90f18bd0526c6ecda871e3
      https://github.com/zanata/zanata-platform/commit/fbefb1ba058e3af3ac90f18bd0526c6ecda871e3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M .gitattributes
    A server/zanata-frontend/.gitattributes

  Log Message:
  -----------
  Add .gitattributes for scripts and JS files (#422)

* Add .gitattributes for JS files
* Ensure build/mvnw use LF


  Commit: d1728b6154f2934d72cb03785ff5b15d10efffaa
      https://github.com/zanata/zanata-platform/commit/d1728b6154f2934d72cb03785ff5b15d10efffaa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    R server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOCDIUnitTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java

  Log Message:
  -----------
  ZNTA-2056 use same analyzer for index and search


  Commit: f652cb46aea4cdefcab572fb801d308afe1c0fe8
      https://github.com/zanata/zanata-platform/commit/f652cb46aea4cdefcab572fb801d308afe1c0fe8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java

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


  Commit: f5c2cf69e7d96aa827508f1d575bc15dbaf65849
      https://github.com/zanata/zanata-platform/commit/f5c2cf69e7d96aa827508f1d575bc15dbaf65849
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java

  Log Message:
  -----------
  ZNTA-2056 update test


  Commit: 8d532d1151454858c8cc57977c2d6927c86d6119
      https://github.com/zanata/zanata-platform/commit/8d532d1151454858c8cc57977c2d6927c86d6119
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #420 from zanata/ZNTA-2107-bugfix-release

fix(ZNTA-2107) word breaking and removal of hyphens for editor


  Commit: 73c786763d4e1a8505d9bb86db296181bc68d9ab
      https://github.com/zanata/zanata-platform/commit/73c786763d4e1a8505d9bb86db296181bc68d9ab
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'release'


  Commit: df721cd1b107015c07a08a09d876d94a04961ef9
      https://github.com/zanata/zanata-platform/commit/df721cd1b107015c07a08a09d876d94a04961ef9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java

  Log Message:
  -----------
  Merge pull request #421 from zanata/ZNTA-2056-dash-in-search

ZNTA-2056 search term with '-' in it


  Commit: d91ea8835a23aea385e5bbad1f894c2912c87161
      https://github.com/zanata/zanata-platform/commit/d91ea8835a23aea385e5bbad1f894c2912c87161
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/CopyTransStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryLocaleInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryResults.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleDetails.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/QualifiedName.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ResultList.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/VersionInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/ContainerTranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/TranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/BaseContributionStatistic.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/ContributionStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/LocaleStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/CopyTransResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
    R server/zanata-war/src/main/java/org/zanata/rest/service/package-info.java

  Log Message:
  -----------
  Improve REST API docs (#415)

* code review changes

* improve REST documentation for the copy trans resource

* improve REST API docs for project list resource

* improve REST API docs for statistics endpoint

* improve REST API documentation for system version endpoint

* add REST api docs for Glossary endpoint

* improve REST API documentation for Translations endpoint

* code review corrections


  Commit: 11d53875e1feb782190df29a6dbc201eedf7d10c
      https://github.com/zanata/zanata-platform/commit/11d53875e1feb782190df29a6dbc201eedf7d10c
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  enable(build): enable victims (#424)


  Commit: a386b00e033ea7a8612ca657e43f531ebf7fc0a7
      https://github.com/zanata/zanata-platform/commit/a386b00e033ea7a8612ca657e43f531ebf7fc0a7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Merge commit '11d53875e1feb782190df29a6dbc201eedf7d10c' into HEAD


  Commit: 8ea283a2602dc5b4d95bc53bf3aab528cd09bd6f
      https://github.com/zanata/zanata-platform/commit/8ea283a2602dc5b4d95bc53bf3aab528cd09bd6f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Nav/index.jsx

  Log Message:
  -----------
  fix: include dswid for glossary and language page (#426)

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


  Commit: b0bc650fae72df8de6f831aad29f79332a3ea357
      https://github.com/zanata/zanata-platform/commit/b0bc650fae72df8de6f831aad29f79332a3ea357
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/provider/DBUnitProvider.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectVersionRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRawRestITCase.java

  Log Message:
  -----------
  Remove some trailing comments (#427)


  Commit: a7cbc38c7f2c8ddf293a82a892257fb8dee6c99f
      https://github.com/zanata/zanata-platform/commit/a7cbc38c7f2c8ddf293a82a892257fb8dee6c99f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  fix(ZNTA-2114): Broken help icons and links (#423)


  Commit: e049947a4981f9d5c468ec4a1f81378de5a6d6a0
      https://github.com/zanata/zanata-platform/commit/e049947a4981f9d5c468ec4a1f81378de5a6d6a0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

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


  Commit: 6dd8bb7f4fe2560d4954060b39449631a0e6f1b4
      https://github.com/zanata/zanata-platform/commit/6dd8bb7f4fe2560d4954060b39449631a0e6f1b4
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

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

  Log Message:
  -----------
  fix(pom): warning: version is deprecated, use project.version instead


  Commit: d35a4baab81c8e41dcf6194a3d4c2611bda09055
      https://github.com/zanata/zanata-platform/commit/d35a4baab81c8e41dcf6194a3d4c2611bda09055
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Log Message:
  -----------
  Merge commit '6dd8bb7f4fe2560d4954060b39449631a0e6f1b4' into HEAD


  Commit: 92625e0a42ff4c2c3c03028cfc2a310b9b9ee2aa
      https://github.com/zanata/zanata-platform/commit/92625e0a42ff4c2c3c03028cfc2a310b9b9ee2aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml

  Log Message:
  -----------
  fix: limit description length for tmx (#429)

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


  Commit: 8c93791bdd6c5acbd34f9d9e9b6c8af9b90628b0
      https://github.com/zanata/zanata-platform/commit/8c93791bdd6c5acbd34f9d9e9b6c8af9b90628b0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java

  Log Message:
  -----------
  fix: null pointer check when pushing raw file (#430)

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


  Commit: 19568c9903da3cd1db1361ef1056a7681596323e
      https://github.com/zanata/zanata-platform/commit/19568c9903da3cd1db1361ef1056a7681596323e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java

  Log Message:
  -----------
  fix: null pointer check when pushing raw file

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


  Commit: 1c20350ad9e3a6371c63bc55112439de5041f0f9
      https://github.com/zanata/zanata-platform/commit/1c20350ad9e3a6371c63bc55112439de5041f0f9
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Log Message:
  -----------
  Merge commit '19568c9903da3cd1db1361ef1056a7681596323e' into HEAD


  Commit: 6d5e57450acfed2fa379224b5ef61001c3a39245
      https://github.com/zanata/zanata-platform/commit/6d5e57450acfed2fa379224b5ef61001c3a39245
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/common-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/frontend/app/components/index.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.css
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    A server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    A server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/legacy.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M server/zanata-frontend/src/frontend/app/utils/UrlHelper.js
    A server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-1865 TM Merge for Version (#404)

ZNTA-1865 squash merge of PR #404


  Commit: b718b7e62749704c739c13d3dc736af93d46d1b4
      https://github.com/zanata/zanata-platform/commit/b718b7e62749704c739c13d3dc736af93d46d1b4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/jest.config.json
    M server/zanata-frontend/src/frontend/package.json

  Log Message:
  -----------
  externlize jest config so that tests can be run in IDE


  Commit: c3bb614de03980a5d61afee852559e391bac6223
      https://github.com/zanata/zanata-platform/commit/c3bb614de03980a5d61afee852559e391bac6223
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml

  Log Message:
  -----------
  fix: invalid data type


  Commit: 07c22bb6e92f038511f98b162ed6eea929b3fe74
      https://github.com/zanata/zanata-platform/commit/07c22bb6e92f038511f98b162ed6eea929b3fe74
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml

  Log Message:
  -----------
  fix: validate project name to be alphanumeric (#428)

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


  Commit: 43a897293b07ca941d0b03b4aecfde7d605ace1f
      https://github.com/zanata/zanata-platform/commit/43a897293b07ca941d0b03b4aecfde7d605ace1f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/jest.config.json
    M server/zanata-frontend/src/frontend/package.json

  Log Message:
  -----------
  Merge pull request #432 from zanata/jest-ide

externalize jest config so that tests can be run in IDE


  Commit: 36e3196614350e18eeb232f1d222a6ba646c7d74
      https://github.com/zanata/zanata-platform/commit/36e3196614350e18eeb232f1d222a6ba646c7d74
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java

  Log Message:
  -----------
  fix: handle exception when pull with project without content (#431)

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


  Commit: 52558cae9d1af44f117de912c1876f9a9a8bc02d
      https://github.com/zanata/zanata-platform/commit/52558cae9d1af44f117de912c1876f9a9a8bc02d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/RestUtil.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/AsynchronousProcessResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/SourceDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M server/functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    R server/zanata-war/src/main/java/org/zanata/rest/service/URIHelper.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  Query param doc (#412)

* WIP: handle encoded doc id in rest api

* feat: new resource endpoint for docId as query param

* refactor: change api path to /resource
refactor: change query param to docId
test: include old and new endpoint test

* fix: fix unit test


  Commit: 8decf5b154a9087c10ebe1e41bfc931cad3075c0
      https://github.com/zanata/zanata-platform/commit/8decf5b154a9087c10ebe1e41bfc931cad3075c0
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2105) button-off styling for validations in frontend


  Commit: 1e7515ea7873fa499d7eb41c03d468631928a657
      https://github.com/zanata/zanata-platform/commit/1e7515ea7873fa499d7eb41c03d468631928a657
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2105) changed colour of new version icon


  Commit: a77ce22cddad620995a51b68a26b8a8779db8993
      https://github.com/zanata/zanata-platform/commit/a77ce22cddad620995a51b68a26b8a8779db8993
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/CommonUtil.gwt.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  refactor: replace method with common-util (#435)

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


  Commit: 452586308cc9e764e8f64585fcefb33f14c15adc
      https://github.com/zanata/zanata-platform/commit/452586308cc9e764e8f64585fcefb33f14c15adc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M server/functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java

  Log Message:
  -----------
  fix: fix broken functional-test


  Commit: 8466ce8086e78ab4abcd42b24a55decee2653edc
      https://github.com/zanata/zanata-platform/commit/8466ce8086e78ab4abcd42b24a55decee2653edc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    M server/pom.xml
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M server/zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M server/zanata-war/src/main/webapp/a/index.xhtml
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/inactive_account.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    A server/zanata-war/src/main/webapp/resources/assets/css/application.css
    A server/zanata-war/src/main/webapp/resources/assets/css/style.css
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.eot
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.svg
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.ttf
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.woff
    A server/zanata-war/src/main/webapp/resources/assets/img/fedora-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/google-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo-text.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.ico
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.png
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/openid-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/yahoo-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/script.js

  Log Message:
  -----------
  chore: migrate css and js from assets into repo

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


  Commit: 0d2a71cdb51f97609d796f89085c578842bae51c
      https://github.com/zanata/zanata-platform/commit/0d2a71cdb51f97609d796f89085c578842bae51c
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js

  Log Message:
  -----------
  fix(ZNTA-2121): correct usages of this.state in setState


  Commit: 6785e7ddfdd018987804ed8c2a957019f37e5cf6
      https://github.com/zanata/zanata-platform/commit/6785e7ddfdd018987804ed8c2a957019f37e5cf6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  fix: update member page when add/remove mainainers (#437)

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


  Commit: 85073e5f8d8798970197c80395a960d47ee2cb94
      https://github.com/zanata/zanata-platform/commit/85073e5f8d8798970197c80395a960d47ee2cb94
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #436 from zanata/ZNTA-2105

fix(ZNTA-2105) changed colour of new version icon


  Commit: b9a3853ef1adfda4e3933406afcf3c832b755378
      https://github.com/zanata/zanata-platform/commit/b9a3853ef1adfda4e3933406afcf3c832b755378
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java

  Log Message:
  -----------
  fix: update project#description dto size (#440)

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


  Commit: b95e8fabfc8a2d89fd3391a103ec1bb44104a600
      https://github.com/zanata/zanata-platform/commit/b95e8fabfc8a2d89fd3391a103ec1bb44104a600
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M server/zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java

  Log Message:
  -----------
  fix: sort language by display name in project/version page (#438)

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


  Commit: 61c9d432f6f9faa9df132ebe8e8a3de9e5eccc99
      https://github.com/zanata/zanata-platform/commit/61c9d432f6f9faa9df132ebe8e8a3de9e5eccc99
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml

  Log Message:
  -----------
  fix: disable button when no roles is selected (#439)

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


  Commit: e17f7262efe766de990900d8029b878617cf347f
      https://github.com/zanata/zanata-platform/commit/e17f7262efe766de990900d8029b878617cf347f
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/RestUtil.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/AsynchronousProcessResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/SourceDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M common/zanata-common-util/src/main/java/org/zanata/CommonUtil.gwt.xml
    M server/functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/zanata-frontend/src/frontend/app/styles/style.less
    A server/zanata-frontend/src/frontend/jest.config.json
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    R server/zanata-war/src/main/java/org/zanata/rest/service/URIHelper.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    M server/zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2105-icon


  Commit: b0ca278509a23ea8c06c3cfc46c29003262a5855
      https://github.com/zanata/zanata-platform/commit/b0ca278509a23ea8c06c3cfc46c29003262a5855
  Author: kgough <kgough at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2087) used css variable and fixed hover colour for buttonOff element


  Commit: db2f87c915a6fc262a756c032730425c34e2cab6
      https://github.com/zanata/zanata-platform/commit/db2f87c915a6fc262a756c032730425c34e2cab6
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    M server/pom.xml
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M server/zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M server/zanata-war/src/main/webapp/a/index.xhtml
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/inactive_account.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    A server/zanata-war/src/main/webapp/resources/assets/css/application.css
    A server/zanata-war/src/main/webapp/resources/assets/css/style.css
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.eot
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.svg
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.ttf
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.woff
    A server/zanata-war/src/main/webapp/resources/assets/img/fedora-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/google-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo-text.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.ico
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.png
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/openid-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/yahoo-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/script.js

  Log Message:
  -----------
  Merge pull request #442 from zanata/ZNTA-2111-aeng

chore: migrate css and js from assets into repo


  Commit: 3595c16c12e0d2e4bc53c14de66a2f0ba7668b65
      https://github.com/zanata/zanata-platform/commit/3595c16c12e0d2e4bc53c14de66a2f0ba7668b65
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #434 from zanata/ZNTA-2105-icon

fix(ZNTA-2087) button-off styling for validations in frontend


  Commit: 2b9360ceac7396a5322fcad2ac629e02c4b3cd21
      https://github.com/zanata/zanata-platform/commit/2b9360ceac7396a5322fcad2ac629e02c4b3cd21
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  fix: update page when remove group maintainer (#446)

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


  Commit: 10575d631e2ddea3335c7bb7034574ed6d05de65
      https://github.com/zanata/zanata-platform/commit/10575d631e2ddea3335c7bb7034574ed6d05de65
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/webapp/resources/assets/css/style.css
    M server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json

  Log Message:
  -----------
  fix checkstyle


  Commit: bcc4293de9733579caecbc7845079be3d087c31e
      https://github.com/zanata/zanata-platform/commit/bcc4293de9733579caecbc7845079be3d087c31e
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
    M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    M server/pom.xml
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M server/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M server/zanata-war/src/main/webapp/a/index.xhtml
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/inactive_account.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    A server/zanata-war/src/main/webapp/resources/assets/css/application.css
    A server/zanata-war/src/main/webapp/resources/assets/css/style.css
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.eot
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.svg
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.ttf
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.woff
    A server/zanata-war/src/main/webapp/resources/assets/img/fedora-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/google-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo-text.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.ico
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.png
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/openid-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/yahoo-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/script.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into ZNTA-2121


  Commit: 78a61ec914b59c97c790417c2a9868303da7f3b2
      https://github.com/zanata/zanata-platform/commit/78a61ec914b59c97c790417c2a9868303da7f3b2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  fix(ZNTA-2132): Incorrect tooltip for export project/version tmx (#447)

* fix(ZNTA-2132): Incorrect tooltip for export version tmx
* fix(ZNTA-2132): Incorrect tooltip for export project tmx


  Commit: db460eb679aa1f66c1164ef58fa5df49071c9e2b
      https://github.com/zanata/zanata-platform/commit/db460eb679aa1f66c1164ef58fa5df49071c9e2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M server/functional-test/pom.xml
    M server/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/zanata-model/pom.xml
    M server/zanata-model/src/test/java/org/zanata/model/HTextFlowTest.java
    M server/zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M server/zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
    M server/zanata-model/src/test/java/org/zanata/tmx/TMXUtilTest.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/DeploymentsSanityTest.java
    M server/zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M server/zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M server/zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/zanata-war/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslatorCreditTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectVersionRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.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/TranslationFileServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    R server/zanata-war/src/test/java/org/zanata/test/LambdaMatcher.java
    M server/zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M server/zanata-war/src/test/java/org/zanata/util/FileUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/util/QueryBuilderTest.java
    M server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfoTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/DistinctColorListImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SaveEventQueueTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SinglePageDataModelImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicateTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfXSIExtensionValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/TabValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java

  Log Message:
  -----------
  refactor: replace hamcrest with assertJ (#452)

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


  Commit: 213b60aa07f7e0240773f79346ac7fef118ca217
      https://github.com/zanata/zanata-platform/commit/213b60aa07f7e0240773f79346ac7fef118ca217
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js

  Log Message:
  -----------
  Merge pull request #444 from zanata/ZNTA-2121

fix(ZNTA-2121): correct usages of this.state in setState


  Commit: 18aa87b0b584c691f5eb4caa9ba1d50823ae410d
      https://github.com/zanata/zanata-platform/commit/18aa87b0b584c691f5eb4caa9ba1d50823ae410d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M .gitattributes
    M Jenkinsfile
    R LICENSE.LESSER.txt
    R LICENSE.txt
    M api/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/RestUtil.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/CopyTransStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryLocaleInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryResults.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleDetails.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/QualifiedName.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ResultList.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/VersionInfo.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/ContainerTranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/TranslationStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/BaseContributionStatistic.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/ContributionStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/LocaleStatistics.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/AsynchronousProcessResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/CopyTransResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/SourceDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
    A client/README.md
    R client/README.txt
    M client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M common/zanata-common-util/src/main/java/org/zanata/CommonUtil.gwt.xml
    A license-gpl.md
    A license.md
    M server/docker/README.md
    M server/docker/rundb.sh
    M server/functional-test/etc/trace-tests.groovy
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    A server/functional-test/src/main/java/org/zanata/page/account/EnterNewPasswordPage.java
    M server/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A server/functional-test/src/main/java/org/zanata/page/languages/RequestToJoinPopup.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/functional-test/src/test/java/org/zanata/util/EmailQuery.java
    M server/functional-test/src/test/java/org/zanata/util/ZanataRestCaller.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/resources/WebTransMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    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/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/GetDownloadAllFilesProgressResult.java
    M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    M server/pom.xml
    A server/zanata-frontend/.gitattributes
    M server/zanata-frontend/src/frontend/app/actions/common-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
    M server/zanata-frontend/src/frontend/app/components/Nav/index.jsx
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/frontend/app/components/index.js
    M server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.css
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    A server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    A server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/legacy.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M server/zanata-frontend/src/frontend/app/utils/UrlHelper.js
    A server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
    A server/zanata-frontend/src/frontend/jest.config.json
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M server/zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M server/zanata-model/src/test/java/org/zanata/model/HTextFlowTest.java
    M server/zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M server/zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
    M server/zanata-model/src/test/java/org/zanata/tmx/TMXUtilTest.java
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M server/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/GenericAsyncTaskKey.java
    A server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    A server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    R server/zanata-war/src/main/java/org/zanata/rest/service/URIHelper.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    R server/zanata-war/src/main/java/org/zanata/rest/service/package-info.java
    M server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.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/servlet/UrlRewriteConfig.java
    M server/zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M server/zanata-war/src/main/webapp/a/index.xhtml
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/inactive_account.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    A server/zanata-war/src/main/webapp/resources/assets/css/application.css
    A server/zanata-war/src/main/webapp/resources/assets/css/style.css
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.eot
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.svg
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.ttf
    A server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.woff
    A server/zanata-war/src/main/webapp/resources/assets/img/fedora-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/google-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo-text.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.ico
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.png
    A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/openid-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/img/yahoo-logo.svg
    A server/zanata-war/src/main/webapp/resources/assets/script.js
    M server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/DeploymentsSanityTest.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M server/zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    A server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M server/zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M server/zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M server/zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/zanata-war/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/provider/DBUnitProvider.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslatorCreditTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectVersionRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
    M server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.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/TranslationFileServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    R server/zanata-war/src/test/java/org/zanata/test/LambdaMatcher.java
    M server/zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M server/zanata-war/src/test/java/org/zanata/util/FileUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/util/QueryBuilderTest.java
    M server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfoTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/DistinctColorListImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SaveEventQueueTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SinglePageDataModelImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicateTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfXSIExtensionValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/TabValidationTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M server/zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    M server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-1771-tmx


Compare: https://github.com/zanata/zanata-platform/compare/ab92738605ba...18aa87b0b584


More information about the zanata-commits mailing list