[zanata/zanata-platform] a7cbc3: fix(ZNTA-2114): Broken help icons and links (#423)

Fri Aug 4 03:18:54 UTC 2017

  Branch: refs/heads/server-split
  Home:   https://github.com/zanata/zanata-platform
  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: 021ff16338a0da415eb289dc1fb820172988eb99
      https://github.com/zanata/zanata-platform/commit/021ff16338a0da415eb289dc1fb820172988eb99
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

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

  Log Message:
  -----------
  ZNTA-1865 update test

  Commit: 5d18628d8023b9e0dc028e2d17ee1d7ec6ab38d1
      https://github.com/zanata/zanata-platform/commit/5d18628d8023b9e0dc028e2d17ee1d7ec6ab38d1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 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/rest/dto/HasTMMergeCriteria.java
    A server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.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/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/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
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1865 - change backend to support select none from internal TM

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

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/version-actions.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js

  Log Message:
  -----------
  ZNTA-1865 update UI to support select TM from any project

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

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

  Log Message:
  -----------
  ZNTA-1865 remove TM merge modal design from storybook

  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: 1a612fdd532efe01f2c3b36aa782979cae91c025
      https://github.com/zanata/zanata-platform/commit/1a612fdd532efe01f2c3b36aa782979cae91c025
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    A server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java

  Log Message:
  -----------
  ZNTA-1865 refactor and add jpa test for TMMergeService

  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: a2941b7ad26fd4a12a9b0b34609744b2e23a70e0
      https://github.com/zanata/zanata-platform/commit/a2941b7ad26fd4a12a9b0b34609744b2e23a70e0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java

  Log Message:
  -----------
  update tests

  Commit: 4673bb01e7d6729cbc60805d4910c935689a84ad
      https://github.com/zanata/zanata-platform/commit/4673bb01e7d6729cbc60805d4910c935689a84ad
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.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

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

  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: 8364a6334a41142a390ebd2ad987bc31e4c96e6a
      https://github.com/zanata/zanata-platform/commit/8364a6334a41142a390ebd2ad987bc31e4c96e6a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.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/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java

  Log Message:
  -----------
  ZNTA-1865 update comment and refactor

  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: f4c8f0900768b445fc958c236039df03bc96032c
      https://github.com/zanata/zanata-platform/commit/f4c8f0900768b445fc958c236039df03bc96032c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

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

  Log Message:
  -----------
  ZNTA-2128 - prevent transaction reaper abort tx

  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: 40bdfa8bfcc988972d0488a9ca73e0aa785b1c87
      https://github.com/zanata/zanata-platform/commit/40bdfa8bfcc988972d0488a9ca73e0aa785b1c87
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js

  Log Message:
  -----------
  fix(ZNTA-2133): Close modal on ESC keydown or on click outside

  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: 77a82a612e338ed549f5859b20d9d524e6151656
      https://github.com/zanata/zanata-platform/commit/77a82a612e338ed549f5859b20d9d524e6151656
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-26 (Wed, 26 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
    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:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into ZNTA-2133-esc-modal

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

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js

  Log Message:
  -----------
  ui change

  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: 80c99b52a1c4d3724fbb6f2ef744562ca61ecd8c
      https://github.com/zanata/zanata-platform/commit/80c99b52a1c4d3724fbb6f2ef744562ca61ecd8c
  Author: Sachin Pathare <spathare at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    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/RecentContributions.jsx

  Log Message:
  -----------
  fix ZNTA-1899 (#451)

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

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

  Log Message:
  -----------
  fix(ZNTA-2144) removed padding from profile calendar matrix buttons

  Commit: aa086141ea7a21d3cdba0f1aa4c33645af3dd0ce
      https://github.com/zanata/zanata-platform/commit/aa086141ea7a21d3cdba0f1aa4c33645af3dd0ce
  Author: efloden <earl.mark.27 at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  refactor(ZNTA-2133): function/prop rename and library use

Renaming the openTMMergeModal function/prop to toggleTMMergeModal
Using specialkeys library to determine 'esc' keypress in modal

  Commit: e3034f4ae2367ac1a8d7cff4cbc4d08f3cd6ba1d
      https://github.com/zanata/zanata-platform/commit/e3034f4ae2367ac1a8d7cff4cbc4d08f3cd6ba1d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 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/rest/dto/HasTMMergeCriteria.java
    A server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M server/zanata-frontend/src/frontend/app/actions/version-actions.js
    M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M 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/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/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.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
    A server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.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/transaction/TransactionUtilForUnitTest.java

  Log Message:
  -----------
  Merge pull request #441 from zanata/ZNTA-1865-select-all-option

ZNTA-1865 select all option for internal TM source

  Commit: bdf527d9f0f76fcd7dfd6f0e2195122cbf8212e6
      https://github.com/zanata/zanata-platform/commit/bdf527d9f0f76fcd7dfd6f0e2195122cbf8212e6
  Author: efloden <earl.mark.27 at gmail.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js

  Log Message:
  -----------
  feat(ZNTA-2133): Move esc and click close functionaly to Modal component

Implmented the 'esc' key closing and clicking outside the modal closing in the Modal component with keydown and backdrop props, default to false to maintain current functionality of the Modal component in other places

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

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

  Log Message:
  -----------
  Merge pull request #453 from zanata/ZNTA-2144

fix(ZNTA-2144) removed padding from profile calendar matrix buttons

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

  Changed paths:
    M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #448 from zanata/ZNTA-2133-esc-modal

fix(ZNTA-2133): Close TM merge modal on ESC keydown or on click outside

  Commit: 991f3bdc32fd74e8cd2eca88b2b680ec26f58622
      https://github.com/zanata/zanata-platform/commit/991f3bdc32fd74e8cd2eca88b2b680ec26f58622
  Author: efloden <earl.mark.27 at gmail.com>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js

  Log Message:
  -----------
  fix(ZNTA-2146): Remove Helmet from ProjectVersion page

  Commit: 9338c7c25573d1217b5f2f532c129b1cf74d1d47
      https://github.com/zanata/zanata-platform/commit/9338c7c25573d1217b5f2f532c129b1cf74d1d47
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js

  Log Message:
  -----------
  Merge pull request #454 from zanata/ZNTA-2146

fix(ZNTA-2146): Remove Helmet from ProjectVersion page

When opening the TM Merge Modal

  Commit: 34e6bf4ef6e57ad2c381ce876993ca475e7cea0b
      https://github.com/zanata/zanata-platform/commit/34e6bf4ef6e57ad2c381ce876993ca475e7cea0b
  Author: efloden <earl.mark.27 at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

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

  Log Message:
  -----------
  fix(ZNTA-2133): Remove onBlur logic for modal close

  Commit: cb7e5b7f891f2daa7d969ed243e8c831e9a800b8
      https://github.com/zanata/zanata-platform/commit/cb7e5b7f891f2daa7d969ed243e8c831e9a800b8
  Author: efloden <earl.mark.27 at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

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

  Log Message:
  -----------
  fix(ZNTA-2133): Also handle clicks outside of modal backdrop

  Commit: b080174fa814e0db6b7d0cc269253a27fde78e7b
      https://github.com/zanata/zanata-platform/commit/b080174fa814e0db6b7d0cc269253a27fde78e7b
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

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

  Log Message:
  -----------
  Merge pull request #457 from zanata/efloden/fix-modal-close/ZNTA-2133

fix(ZNTA-2133): stop modal closing unexpectedly

  Commit: 00ab9a3632555f66c83ddb823bfa6e32450f1856
      https://github.com/zanata/zanata-platform/commit/00ab9a3632555f66c83ddb823bfa6e32450f1856
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.test.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckboxGroup.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.less
    M server/zanata-frontend/src/frontend/app/components/components.story.js
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Tristate checkbox frontend component (ZNTA-2116) (#445)

ZNTA-2116 squash merge of PR #445

* feat(ZNTA-2116): Create TriCheckbox component and stories

Including truth table to display each state of the component

* feat(ZNTA-2116): Pass classNames through to component for styling

* test(ZNTA-1865): Test markup of TriCheckbox

Test against all checked && indeterminate combination states

* test(ZNTA-2116)

* feat(ZNTA-2116): Create storybook for tri-checkbox group example

* feat(ZNTA-2216): Complete working tri-checkbox group storybook

* style(ZNTA-2116): Create storybook demonstrating custom styled checkbox

* style(ZNTA-2116): Only apply style to fancy storybook

* fix(ZNTA-2116): extract arrow function from bind

* refactor(ZNTA-2116): Refactor storybook classes, tests, style

* refactor(ZNTA-2116): Moved TriCheckboxGroup to own file

* fix(ZNTA-2116): Passing down onChange actions to wrapper classes

* test(ZNTA-2116): Test click event and rendered element state

* style(ZNTA-2116): Create custom checkbox styles and display in storybook

* style(ZNTA-2116): Import and use variables.less color styles for component

* fix(ZNTA-2116): Pass event to storybook action logger

Enabled default style on checkbox group storybook

* feat(ZNTA-2116): Create checkbox group dropdown component and storybook

* Revert "feat(ZNTA-2116): Create checkbox group dropdown component and storybook"

This reverts commit 642a6ca8267d18e846507760e30a561fdf1872cf.

  Commit: 6c45f453e1317cb078a7f3ad652d5b69b3aae7fa
      https://github.com/zanata/zanata-platform/commit/6c45f453e1317cb078a7f3ad652d5b69b3aae7fa
  Author: kgough <kgough at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

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

  Log Message:
  -----------
  removed messy css

  Commit: e0c463b083bc2ed429b08eada67e81e2ecb539d4
      https://github.com/zanata/zanata-platform/commit/e0c463b083bc2ed429b08eada67e81e2ecb539d4
  Author: kgough <kgough at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

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

  Log Message:
  -----------
  fix(ZNTA-2152) fixed css colour override

  Commit: bb6bcce42e435fb28f1fd3b76abcac9fc5a3cb8e
      https://github.com/zanata/zanata-platform/commit/bb6bcce42e435fb28f1fd3b76abcac9fc5a3cb8e
  Author: kgough <kgough at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

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

  Log Message:
  -----------
  fix(ZNTA-2152): removed redundant css

  Commit: d375ed5402a1d9fa4487a0a276d8f9d84da747dc
      https://github.com/zanata/zanata-platform/commit/d375ed5402a1d9fa4487a0a276d8f9d84da747dc
  Author: kathryngo <kgough at redhat.com>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

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

  Log Message:
  -----------
  Merge pull request #461 from zanata/ZNTA-2152

fix(ZNTA-2152): removed css overrides that affected 'add' icon in dropdowns throughout frontend

  Commit: 4f9bc0541560ff205d138b337958687740d64472
      https://github.com/zanata/zanata-platform/commit/4f9bc0541560ff205d138b337958687740d64472
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/DocumentType.java
    M api/zanata-common-api/src/main/java/org/zanata/common/LocaleId.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.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/GlossaryResults.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/resource/AbstractResourceMeta.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ResourceMeta.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/service/ProjectVersionResource.java
    M api/zanata-common-api/src/test/java/org/zanata/common/DocumentTypeTest.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/DTOSampleMarshallingTest.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/JsonSchemaTest.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    M client/stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-cli/src/test/java/org/zanata/client/ParameterRule.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/AbstractPushPullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/BooleanValueHandler.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.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/AbstractGettextPushStrategy.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/PushOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.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/TempTransFileRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyPullTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XmlStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullGettextITCase.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/RedirectFilter.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/ResponseStatusFilter.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/InvalidContentTypeFilterTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    M common/zanata-adapter-glossary/src/main/java/org/zanata/adapter/glossary/GlossaryCSVWriter.java
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/VersionUtility.java
    M common/zanata-common-util/src/test/java/org/zanata/util/HashUtilTest.java

  Log Message:
  -----------
  fix: remove java warnings, client, common and api (#464)

  Commit: 5d361ed30e43568b9a94a4c69f99acf5027f0530
      https://github.com/zanata/zanata-platform/commit/5d361ed30e43568b9a94a4c69f99acf5027f0530
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-08-03 (Thu, 03 Aug 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LanguageTeamSearchResult.java
    M server/zanata-frontend/src/frontend/app/containers/Languages/Entry.js
    M server/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/RequestService.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/LocalesServiceTest.java

  Log Message:
  -----------
  fix(ZNTA-1762): Add request count to languages list (#455)

* fix(ZNTA-1762): Add request count to languages list
* fix(ZNTA-1762) visibility of icons in languages entry
* fix(ZNTA-1762): Map requests to prevent multiple Rest calls
* fix(ZNTA-1762): Add test and fix array initialiser

  Commit: 23f407c97e0f5bbe9dfc990d54febde68349ffe5
      https://github.com/zanata/zanata-platform/commit/23f407c97e0f5bbe9dfc990d54febde68349ffe5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/SourceLocaleDetails.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.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/ProjectLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java
    A api/zanata-common-api/src/test/java/org/zanata/rest/dto/SourceLocaleDetailsTest.java
    A server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
    A server/zanata-frontend/src/frontend/app/components/TMX/TMXExportModal.js
    A server/zanata-frontend/src/frontend/app/components/TMX/index.css
    A server/zanata-frontend/src/frontend/app/containers/Admin/index.js
    A server/zanata-frontend/src/frontend/app/containers/Project/index.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    M server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.kt
    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/TextFlowStreamingDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.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/ExportTranslationsTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M server/zanata-war/src/test/resources/org/zanata/test/model/TMXTestData.dbunit.xml

  Log Message:
  -----------
  feat: allow src locale selection in tmx export  (#459)

* feat: allow source lang selection for TMX export

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

* refactor: use immuntability-helper

* ZNTA-1771 refactor modal code

* refactor: use transformer to process result

  Commit: 29396eef647d11ca8859abf4df84177f5466d6f4
      https://github.com/zanata/zanata-platform/commit/29396eef647d11ca8859abf4df84177f5466d6f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-08-04 (Fri, 04 Aug 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/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
    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/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/gwt-editor/src/main/webapp/webtrans/Application.xhtml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/OptionsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfoTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/DistinctColorListImplTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/SaveEventQueueTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/SinglePageDataModelImplTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
    A server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicateTest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/PrintfXSIExtensionValidationTest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/TabValidationTest.java
    M server/gwt-shared/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M server/pom.xml
    R server/services/src/main/java/org/zanata/WebAssetsConfiguration.java
    M server/services/src/main/java/org/zanata/action/LanguageAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    R server/services/src/main/java/org/zanata/rest/service/URIHelper.java
    M server/services/src/main/java/org/zanata/rest/service/ZPathService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/services/src/main/java/org/zanata/util/ComparatorUtil.java
    M server/services/src/main/java/org/zanata/util/UrlUtil.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.2.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M server/services/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M server/services/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M server/services/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/services/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/services/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/services/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M server/services/src/test/java/org/zanata/rest/service/TranslatorCreditTest.java
    M server/services/src/test/java/org/zanata/search/ContentCriterionTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M server/services/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/services/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    M server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    R server/services/src/test/java/org/zanata/test/LambdaMatcher.java
    M server/services/src/test/java/org/zanata/tmx/TMXParserTest.java
    M server/services/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java
    M server/services/src/test/java/org/zanata/util/FileUtilTest.java
    M server/services/src/test/java/org/zanata/util/QueryBuilderTest.java
    M server/services/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M server/services/src/test/java/org/zanata/xml/StreamSerializerTest.java
    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/Modal/Modal.story.js
    M server/zanata-frontend/src/frontend/app/components/Modal/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/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.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
    A server/zanata-frontend/src/frontend/jest.config.json
    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/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
    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/dao/LocaleMemberDAOITCase.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/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/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/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into server-split

  Commit: e1777be6963327b8c1770a983a093086ac0850c4
      https://github.com/zanata/zanata-platform/commit/e1777be6963327b8c1770a983a093086ac0850c4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/DocumentType.java
    M api/zanata-common-api/src/main/java/org/zanata/common/LocaleId.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.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/GlossaryResults.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LanguageTeamSearchResult.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleDetails.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/SourceLocaleDetails.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/AbstractResourceMeta.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ResourceMeta.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/service/LocalesResource.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/ProjectLocalesResource.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/TranslationMemoryResource.java
    M api/zanata-common-api/src/test/java/org/zanata/common/DocumentTypeTest.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/DTOSampleMarshallingTest.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/JsonSchemaTest.java
    A api/zanata-common-api/src/test/java/org/zanata/rest/dto/SourceLocaleDetailsTest.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    M client/stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-cli/src/test/java/org/zanata/client/ParameterRule.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/AbstractPushPullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/BooleanValueHandler.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/TransFileResolver.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.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/AbstractGettextPushStrategy.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/PushOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.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/TempTransFileRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/GettextDirStrategyPullTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/RawPushCommandTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/XmlStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/integration/PushPullGettextITCase.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/RedirectFilter.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/ResponseStatusFilter.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/InvalidContentTypeFilterTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    M common/zanata-adapter-glossary/src/main/java/org/zanata/adapter/glossary/GlossaryCSVWriter.java
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/VersionUtility.java
    M common/zanata-common-util/src/test/java/org/zanata/util/HashUtilTest.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M server/services/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/service/LocalesService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/service/LocaleService.java
    M server/services/src/main/java/org/zanata/service/RequestService.java
    M server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    M server/services/src/test/java/org/zanata/rest/service/LocalesServiceTest.java
    M server/services/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    A server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
    M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
    A server/zanata-frontend/src/frontend/app/components/TMX/TMXExportModal.js
    A server/zanata-frontend/src/frontend/app/components/TMX/index.css
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.test.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckboxGroup.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.js
    A server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.less
    M server/zanata-frontend/src/frontend/app/components/components.story.js
    A server/zanata-frontend/src/frontend/app/containers/Admin/index.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/Entry.js
    A server/zanata-frontend/src/frontend/app/containers/Project/index.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    M server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/TMXTestData.dbunit.xml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into server-split

Compare: https://github.com/zanata/zanata-platform/compare/516720a21b3b...e1777be69633