[zanata/zanata-platform] 978639: ZNTA-2057 refactor async task key

Tue Jul 4 03:23:06 UTC 2017

  Branch: refs/heads/ZNTA-1734-activity
  Home:   https://github.com/zanata/zanata-platform
  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: 679430c58145d3be8ff0f06c45fb28685ad76482
      https://github.com/zanata/zanata-platform/commit/679430c58145d3be8ff0f06c45fb28685ad76482
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java

  Log Message:
  -----------
  fix(test): Fix intermittent admin e2e test failure (#405)

  Commit: 36ae97eedf44ec90087e7c533ac8baf4d9507cd9
      https://github.com/zanata/zanata-platform/commit/36ae97eedf44ec90087e7c533ac8baf4d9507cd9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M Jenkinsfile
    A server/functional-test/etc/trace-tests.groovy
    M server/functional-test/src/test/java/org/zanata/util/TestTracing.java

  Log Message:
  -----------
  feat(test): Traceability parsing script (#406)

* feat(test): Traceability parsing script
* Update script and Jenkinsfile for tracing

  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: 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: 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: 7fff6112bdc089a3b9aada3e9ff0a3a566b5b65d
      https://github.com/zanata/zanata-platform/commit/7fff6112bdc089a3b9aada3e9ff0a3a566b5b65d
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M Jenkinsfile
    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/docker/README.md
    M server/docker/rundb.sh
    A 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/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/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/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.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/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/util/EmailQuery.java
    M server/functional-test/src/test/java/org/zanata/util/TestTracing.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/shared/rpc/GetDownloadAllFilesProgressResult.java
    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
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json
    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/main/webapp/account/password_reset.xhtml
    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
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-1734-activity

Compare: https://github.com/zanata/zanata-platform/compare/1f7fa407a768...7fff6112bdc0