[zanata/zanata-platform] 2cb1e7: fix(ZNTA-2473) background colour of editor sidebar...

Mon Jul 23 04:44:57 UTC 2018

  Branch: refs/heads/remove-solr
  Home:   https://github.com/zanata/zanata-platform
  Commit: 2cb1e72ef52e1333e342dab6e294ec14e043014b
      https://github.com/zanata/zanata-platform/commit/2cb1e72ef52e1333e342dab6e294ec14e043014b
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2473) background colour of editor sidebar panels

  Commit: d19122064034d4322188cb85cc27a91ca6bc6a5c
      https://github.com/zanata/zanata-platform/commit/d19122064034d4322188cb85cc27a91ca6bc6a5c
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2473) add spacing between editor sidebar headings and icons

  Commit: 03bb37463f3d29310a23c7c5b9f7a2e5d38cda9f
      https://github.com/zanata/zanata-platform/commit/03bb37463f3d29310a23c7c5b9f7a2e5d38cda9f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Disable maven-security-versions (#777)

* Make ossindex audit quiet
* Disable maven-security-versions:check

  Commit: f2a13ef009a97325c4761a7008b9498f40fe2f34
      https://github.com/zanata/zanata-platform/commit/f2a13ef009a97325c4761a7008b9498f40fe2f34
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-07 (Sat, 07 Apr 2018)

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

  Log Message:
  -----------
  Upgrade commons-fileupload (#779)

  Commit: 8a839555570064a4ab8f7356a242e1fffb5a1d5e
      https://github.com/zanata/zanata-platform/commit/8a839555570064a4ab8f7356a242e1fffb5a1d5e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

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

  Log Message:
  -----------
  Merge pull request #769 from zanata/ZNTA-2473

fix(ZNTA-2473) background colour of editor sidebar panels

  Commit: c5b06ba3635cdfdc1a4c62284b6742959014668f
      https://github.com/zanata/zanata-platform/commit/c5b06ba3635cdfdc1a4c62284b6742959014668f
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-17 (Tue, 17 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/editor/components/Dropdown/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/styles/legacy.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2400): Consistency of sizes in css (use rem) (#765)

* refactor(ZNTA-2400) change uses of 'em' to 'rem' in frontend

* refactor(ZNTA-2400) change 'em' to 'rem' in react editor css

* refactor(ZNTA-2400): fix height of h1

* refactor(ZNTA-2400): fix height of h1

  Commit: 6b909b049f54c84cb80c1ad1f0abe289d41bb9dd
      https://github.com/zanata/zanata-platform/commit/6b909b049f54c84cb80c1ad1f0abe289d41bb9dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
    M client/zanata-maven-plugin/pom.xml

  Log Message:
  -----------
  Update jsch (#781)

  Commit: c8a75b8541b7f8c4e922ce1329570211d34d212f
      https://github.com/zanata/zanata-platform/commit/c8a75b8541b7f8c4e922ce1329570211d34d212f
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/.stylelintrc
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/entrypoint/index.js
    A server/zanata-frontend/src/app/styles/ant-theme-vars.less
    A server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2465): ant-design static buttons (#773)

* refactor(ZNJTA-2465) WIP: add new language button

* WIP: get ant-design buttons working. css currently not working. previous commit has working css but no icons

* WIP: get ant-design buttons working. css currently ok, icons still tofu

* WIP: get icons working with ant-design

* refactor(ZNTA-2465) antd icons

* refactor(ZNTA-2465) update antd css variables

* refactor(ZNTA-2465) update antd css variables

* refactor(ZNTA-2465) antd variables working

* refactor(ZNTA-2465) add search icon to language search input, and padding to layout - antd css variables

* refactor(ZNTA-2465) add padding to languages page

* refactor(ZNTA-2465) fix css linting errors

* refactor(ZNTA-2465) fix css linting errors

* refactor(ZNTA-2465) new language modal input sizing

* refactor(ZNTA-2465) WIP: replace static react-boostrap buttons with antd ones

* refactor(ZNTA-2465) replace react-bootstrap buttons with antd on Explore page, WIP glossary page

* refactor(ZNTA-2465) WIP: replace static react-boostrap buttons with antd ones

* refactor(ZNTA-2465) fix alignment of items on glossary page

* refactor(ZNTA-2465) static buttons in frontend changed from react-bootstrap to antd

* refactor(ZNTA-2465) static buttons in frontend changed from react-bootstrap to antd

* refactor(ZNTA-2465) static buttons in frontend changed from react-bootstrap to antd

* refactor(ZNTA-2465) add babel-loader to js loader in webpack - attempt to fix build failure

* refactor(ZNTA-2465) fix typo in test, add babel-loader-plugin so tests will pass

* refactor(ZNTA-2465) update linting errors

* refactor(ZNTA-2465) update failing test

* refactor(ZNTA-2465) add lockfile details and add autoprefixer back to webpack

* fix: Admin page Icon padding -> margin

  Commit: 415789e5e4898a2d85b1b8951a9e91cb413e5b04
      https://github.com/zanata/zanata-platform/commit/415789e5e4898a2d85b1b8951a9e91cb413e5b04
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

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

  Log Message:
  -----------
  Reformat 0install docs (#787)

  Commit: cc4892541cb7b728ea0c41727d14be9ce054f10a
      https://github.com/zanata/zanata-platform/commit/cc4892541cb7b728ea0c41727d14be9ce054f10a
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  fix(ZNTA-2491) add utility classes for text and background status colours

  Commit: 817098fe4c1b5deb6516ce0948fbfe8b79b48709
      https://github.com/zanata/zanata-platform/commit/817098fe4c1b5deb6516ce0948fbfe8b79b48709
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  fix: storybook frontend/editor builds (#788)

  Commit: 2794fbdd5b0e3bc7491f7b16fd949302da25111b
      https://github.com/zanata/zanata-platform/commit/2794fbdd5b0e3bc7491f7b16fd949302da25111b
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

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

  Log Message:
  -----------
  fix: add antd button information to storybook

  Commit: c5321b028d2726c2763b9dc26553dbdf553a4dd4
      https://github.com/zanata/zanata-platform/commit/c5321b028d2726c2763b9dc26553dbdf553a4dd4
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  fix: update failing snapshots

  Commit: daa2c3b0c2e09a6bcd5796de939622f9f289ff81
      https://github.com/zanata/zanata-platform/commit/daa2c3b0c2e09a6bcd5796de939622f9f289ff81
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  Merge pull request #789 from zanata/ZNTA-2491

fix(ZNTA-2491) add status utility classes to frontend

  Commit: 13205fc059eda40f5baf10a60ebe5c9bf46aeb0e
      https://github.com/zanata/zanata-platform/commit/13205fc059eda40f5baf10a60ebe5c9bf46aeb0e
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx

  Log Message:
  -----------
  WIP(ZNTA-2495) refactor button and tooltips from react-bootstrap to antd{

  Commit: c40a7c45d0e05cd91ca12c9b04b6b57bd2c213f6
      https://github.com/zanata/zanata-platform/commit/c40a7c45d0e05cd91ca12c9b04b6b57bd2c213f6
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

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

  Log Message:
  -----------
  style: dynamically size editor sidebar to match header expanded/contracted states (#785)

  Commit: 91f9564a9f31df4cd34400addfefcf9082a82b00
      https://github.com/zanata/zanata-platform/commit/91f9564a9f31df4cd34400addfefcf9082a82b00
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  fix(ZNTA-2490): Fix missing profile email icon (#782)

  Commit: 90ff2fc826010a887a169956c965e62e37647eea
      https://github.com/zanata/zanata-platform/commit/90ff2fc826010a887a169956c965e62e37647eea
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/docker/Dockerfile
    R server/docker/conf/zanata-config.cli
    M server/docker/docker-compose.yml
    M server/docker/rundev.sh
    M server/etc/scripts/allocate-jboss-ports
    A server/etc/scripts/configure-app-server.js
    R server/etc/scripts/configureAppServer.js
    A server/etc/scripts/jboss-cli-jjs
    M server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/tsconfig.json
    A server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml

  Log Message:
  -----------
  Use configure-app-server.js for rundev.sh (#761)

* Rename configureAppServer.js
* Convert configure-app-server.js to use ES6 let/const
* Reduce default logging; add --quiet option
* Create jboss-cli-jjs
* Add file comments with basic documentation
* Avoid some Mozilla extensions
* Convert to plain JavaScript instead of Nashorn -scripting
* Sort system properties
* Refactor configure-app-server.js and integrate rundev options
* Switch rundev.sh to use configure-app-server.js
* Fix port config for rundev.sh
* Add authentication options
* Require at least one authentication method
* Move some top-level code to functions
* Simplify most of the functions
* Move some system properties to options object
* Fix type confusion for callbacks; enable ts-check
* Fix --list-commands option
* Split out individual options
* Use docker hub image's env var names for DB and MAIL
* Add more env vars to generated config
* Eliminate my-smtp socket binding

  Commit: 17de651c45623342c575d77706f3354c8db9aeb9
      https://github.com/zanata/zanata-platform/commit/17de651c45623342c575d77706f3354c8db9aeb9
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  WIP: add antd tooltips to DraggableVersionPanels

  Commit: 85e25687ecb25058ba2faf4dfd3848ed0a9d8c95
      https://github.com/zanata/zanata-platform/commit/85e25687ecb25058ba2faf4dfd3848ed0a9d8c95
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  fix: use tsImportPlugin to load antd in webpack build (#793)

  Commit: a5400b2360532e1e1fdec746ef7a7d9b00380da0
      https://github.com/zanata/zanata-platform/commit/a5400b2360532e1e1fdec746ef7a7d9b00380da0
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/docker/Dockerfile
    R server/docker/conf/zanata-config.cli
    M server/docker/docker-compose.yml
    M server/docker/rundev.sh
    M server/etc/scripts/allocate-jboss-ports
    A server/etc/scripts/configure-app-server.js
    R server/etc/scripts/configureAppServer.js
    A server/etc/scripts/jboss-cli-jjs
    M server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/tsconfig.json
    A server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

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

  Commit: 4ad3b9992de70109756160c09800c614d3bf95af
      https://github.com/zanata/zanata-platform/commit/4ad3b9992de70109756160c09800c614d3bf95af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java

  Log Message:
  -----------
  fix(ZNTA-2497) support OpenID-only option (#791)

  Commit: 9acd6010355b8543b443e66ca985b037a9093312
      https://github.com/zanata/zanata-platform/commit/9acd6010355b8543b443e66ca985b037a9093312
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java

  Log Message:
  -----------
  Merge commit '4ad3b9992de70109756160c09800c614d3bf95af' into HEAD

  Commit: c2300358cdade107968f6326b058d82a610acd3b
      https://github.com/zanata/zanata-platform/commit/c2300358cdade107968f6326b058d82a610acd3b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M Jenkinsfile
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Backport new vulnerability scanners (#767 and #777) (#792)

  Commit: 22284939ad797007fae7976414203b1acea225fe
      https://github.com/zanata/zanata-platform/commit/22284939ad797007fae7976414203b1acea225fe
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

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

  Commit: 9f2ac4a31f2165e10a43c11b71d59c003a89edda
      https://github.com/zanata/zanata-platform/commit/9f2ac4a31f2165e10a43c11b71d59c003a89edda
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  WIP: tooltips for Glossary and Languages page

  Commit: c22f8c84daa6d721e57d04f25521ad4b6ee348c3
      https://github.com/zanata/zanata-platform/commit/c22f8c84daa6d721e57d04f25521ad4b6ee348c3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/pom.xml

  Log Message:
  -----------
  update: jackson-databind library (#796)

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

  Commit: 0758ed50cab6207090fbbc7e4961ace20cf6fc41
      https://github.com/zanata/zanata-platform/commit/0758ed50cab6207090fbbc7e4961ace20cf6fc41
  Author: efloden <efloden at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx

  Log Message:
  -----------
  fix: antd button onClick props

  Commit: b920cd3a365c9c6209a943aa3af35c1ce5abe887
      https://github.com/zanata/zanata-platform/commit/b920cd3a365c9c6209a943aa3af35c1ce5abe887
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

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

  Log Message:
  -----------
  Remove refs to Zero Install for Windows (#798)

  Commit: 82c7127408e5c9693f04d71b5505d7da0cba449d
      https://github.com/zanata/zanata-platform/commit/82c7127408e5c9693f04d71b5505d7da0cba449d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/App.js
    A server/zanata-frontend/src/app/styles/frontend-jsf.less
    A server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/legacy.less

  Log Message:
  -----------
  refactor(ZNTA-2460): split legacy.less into frontend-nav and frontend-jsf (#784)

* refactor: split up legacy.less into 4 files

* refactor(ZNTA-2460) break up legacy.css

* refactor(ZNTA-2460) split legacy css into frontend-nav and frontend-jsf

  Commit: cfe3841b2f04c7c8382d80a282fe2dfb11ba4c42
      https://github.com/zanata/zanata-platform/commit/cfe3841b2f04c7c8382d80a282fe2dfb11ba4c42
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  style(ZNTA-2488) add Tachyons css utility classes to frontend (#783)

  Commit: 997a86064e847c9ffc6d841e9e42328600b39ba6
      https://github.com/zanata/zanata-platform/commit/997a86064e847c9ffc6d841e9e42328600b39ba6
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M docs/client/installation/windows-installation.md
    M server/docker/Dockerfile
    R server/docker/conf/zanata-config.cli
    M server/docker/docker-compose.yml
    M server/docker/rundev.sh
    M server/etc/scripts/allocate-jboss-ports
    A server/etc/scripts/configure-app-server.js
    R server/etc/scripts/configureAppServer.js
    A server/etc/scripts/jboss-cli-jjs
    M server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/tsconfig.json
    A server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    A server/zanata-frontend/src/app/styles/frontend-jsf.less
    A server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/legacy.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/zanata/zanata-platform into storybook-btn-update

  Commit: 4bb55cac75e9031f8f2d21942339e76aa1fdbefe
      https://github.com/zanata/zanata-platform/commit/4bb55cac75e9031f8f2d21942339e76aa1fdbefe
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M docs/client/installation/windows-installation.md
    M server/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    A server/zanata-frontend/src/app/styles/frontend-jsf.less
    A server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/legacy.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2495) fix merge conflicts

  Commit: 91fec6cabe710bc87efe906b3402c440fa7b106f
      https://github.com/zanata/zanata-platform/commit/91fec6cabe710bc87efe906b3402c440fa7b106f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

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

  Log Message:
  -----------
  Update commons-io (#778)

  Commit: 220925d6d2660f56017417f350fb502371048f26
      https://github.com/zanata/zanata-platform/commit/220925d6d2660f56017417f350fb502371048f26
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2495) WIP: glossary and language page tooltips

  Commit: 18a13f4979fab4a4261e54616ad1a9dedafa8b8e
      https://github.com/zanata/zanata-platform/commit/18a13f4979fab4a4261e54616ad1a9dedafa8b8e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Add aether-api (#802)

  Commit: f7aba2887101a6a4738edc05ef8a262d3ef12179
      https://github.com/zanata/zanata-platform/commit/f7aba2887101a6a4738edc05ef8a262d3ef12179
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Merge commit '18a13f4979fab4a4261e54616ad1a9dedafa8b8e' into HEAD

  Commit: 54187870a373bc8fbf01497cd6a73397849d0895
      https://github.com/zanata/zanata-platform/commit/54187870a373bc8fbf01497cd6a73397849d0895
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/resources/messages.properties
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  feat: delete version group (#800)

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

  Commit: d8a86a15f86afd95fa7c79ea0d2b83b540587783
      https://github.com/zanata/zanata-platform/commit/d8a86a15f86afd95fa7c79ea0d2b83b540587783
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M parent/pom.xml

  Log Message:
  -----------
  update : nexus-staging-maven-plugin

  Commit: 83a78609711a8867df18d471dc00301ac51913fa
      https://github.com/zanata/zanata-platform/commit/83a78609711a8867df18d471dc00301ac51913fa
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M parent/pom.xml

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

  Commit: 870500cbf220d232a369267f96abf9d0ac39dd72
      https://github.com/zanata/zanata-platform/commit/870500cbf220d232a369267f96abf9d0ac39dd72
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Update versions-maven-plugin to 2.5

  Commit: 3673490b0f8c49693c1311c5ea1168c69fb2e0ff
      https://github.com/zanata/zanata-platform/commit/3673490b0f8c49693c1311c5ea1168c69fb2e0ff
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Log Message:
  -----------
  Merge branch 'release' for updating versions-maven-plugin

Conflicts:
	parent/pom.xml

  Commit: 79f676c8d9733d8766e4f49ee88261f782400b45
      https://github.com/zanata/zanata-platform/commit/79f676c8d9733d8766e4f49ee88261f782400b45
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Update docs/release-notes.md for version 4.4.4

  Commit: 15757edd8cf8e49e9c68bd76ed639170ab0a5a63
      https://github.com/zanata/zanata-platform/commit/15757edd8cf8e49e9c68bd76ed639170ab0a5a63
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.4.4

  Commit: f440517777095f41dc9c8a24990da8100e0832f9
      https://github.com/zanata/zanata-platform/commit/f440517777095f41dc9c8a24990da8100e0832f9
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.4.5-SNAPSHOT

  Commit: 12ac7dc66543985c195d7ad7d2e88af41c9e4731
      https://github.com/zanata/zanata-platform/commit/12ac7dc66543985c195d7ad7d2e88af41c9e4731
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge branch 'release' for platform-4.4.4

  Commit: 62eecad9ac18ccaba28a17cc761c10b0e227f84f
      https://github.com/zanata/zanata-platform/commit/62eecad9ac18ccaba28a17cc761c10b0e227f84f
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-30 (Mon, 30 Apr 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js

  Log Message:
  -----------
  refactor(ZNTA-2495) replace all other glossary buttons with antd ones

  Commit: 3ce308ab4a41fe6d57216347bed71c1f8602d666
      https://github.com/zanata/zanata-platform/commit/3ce308ab4a41fe6d57216347bed71c1f8602d666
  Author: kgough <kgough at redhat.com>
  Date:   2018-04-30 (Mon, 30 Apr 2018)

  Changed paths:
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/resources/messages.properties
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

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

  Commit: ac887eae1462d2cf92074296efb19400bf1f26fe
      https://github.com/zanata/zanata-platform/commit/ac887eae1462d2cf92074296efb19400bf1f26fe
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java

  Log Message:
  -----------
  fix(ZNTA-2387): Add email and name to user search query (#794)

* fix(ZNTA-2387): Add email and name to user search query
Admin can search for users via display name, email or username.
* fix(ZNTA-2387): use String not builder
* fix(ZNTA-2387): Don't bother handling null on select count

  Commit: ef5501ff501f591fe1d8f7640e506943d648afc5
      https://github.com/zanata/zanata-platform/commit/ef5501ff501f591fe1d8f7640e506943d648afc5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix: username height in user profile page (#804)

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

  Commit: a148bf9de29789d9147a5636d837df82d1c21cfa
      https://github.com/zanata/zanata-platform/commit/a148bf9de29789d9147a5636d837df82d1c21cfa
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2495) replace react-bootstrap tooltips and buttons in frontend

  Commit: dc75e987951dfbcae24d41d2c48e394ad422a0a7
      https://github.com/zanata/zanata-platform/commit/dc75e987951dfbcae24d41d2c48e394ad422a0a7
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx

  Log Message:
  -----------
  refactor(ZNTA-2495) glossary tooltip styling

  Commit: ef1491c3bb22766835dd8bced7556f8623d00f06
      https://github.com/zanata/zanata-platform/commit/ef1491c3bb22766835dd8bced7556f8623d00f06
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZTA-2945) minor css fixes to Glossary, update tooltip component usage

  Commit: c9218ffbb8221b00bbd684d046645822c198544d
      https://github.com/zanata/zanata-platform/commit/c9218ffbb8221b00bbd684d046645822c198544d
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js

  Log Message:
  -----------
  refactor(ZNTA-2495) update failing tests (snapshots still failing)

  Commit: cc593b16f0e4ed3454202277b912a6a0d7da6687
      https://github.com/zanata/zanata-platform/commit/cc593b16f0e4ed3454202277b912a6a0d7da6687
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx

  Log Message:
  -----------
  refactor(ZNTA-2495) add margin to Glossary tooltip buttons using utility classes from Tachyons

  Commit: d9d33303a057e013c0b6d989cb5978f539ee9fcb
      https://github.com/zanata/zanata-platform/commit/d9d33303a057e013c0b6d989cb5978f539ee9fcb
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZNTA-2495) aligment of glossary header icons

  Commit: 97bed17566681e394f1e88a0061fd4e8ed172403
      https://github.com/zanata/zanata-platform/commit/97bed17566681e394f1e88a0061fd4e8ed172403
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2495) fix quotes used in TypeScript files

  Commit: 0cd03031601cc171b040c939bc8f8ba31f238bbf
      https://github.com/zanata/zanata-platform/commit/0cd03031601cc171b040c939bc8f8ba31f238bbf
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2495) fix linting errors

  Commit: e46ad3d184f00be48eb269fce3f8285200a49037
      https://github.com/zanata/zanata-platform/commit/e46ad3d184f00be48eb269fce3f8285200a49037
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M docs/client/installation/windows-installation.md
    M docs/release-notes.md
    M parent/pom.xml
    M server/docker/Dockerfile
    R server/docker/conf/zanata-config.cli
    M server/docker/docker-compose.yml
    M server/docker/rundev.sh
    M server/etc/scripts/allocate-jboss-ports
    A server/etc/scripts/configure-app-server.js
    R server/etc/scripts/configureAppServer.js
    A server/etc/scripts/jboss-cli-jjs
    M server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/tsconfig.json
    A server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    A server/zanata-frontend/src/app/styles/frontend-jsf.less
    A server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/legacy.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into storybook-btn-update

  Commit: fa0460441c8a0beb9de404149fcf8897abee9e81
      https://github.com/zanata/zanata-platform/commit/fa0460441c8a0beb9de404149fcf8897abee9e81
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js

  Log Message:
  -----------
  refactor(ZNTA-2495) add 'no test' to antd snapshots as interim solution to broken snapshots

  Commit: 89a2be57e713eeb6d95c84e105b7de031fc60c69
      https://github.com/zanata/zanata-platform/commit/89a2be57e713eeb6d95c84e105b7de031fc60c69
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js

  Log Message:
  -----------
  fix: add 'no test' to antd snapshots as interim solution to broken snapshots

  Commit: ead4b7c3840c2515e0bc57a56d2c4a9d0b3f0006
      https://github.com/zanata/zanata-platform/commit/ead4b7c3840c2515e0bc57a56d2c4a9d0b3f0006
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Merge branch 'storybook-btn-update' of https://github.com/zanata/zanata-platform into storybook-btn-update

  Commit: 6eb44e1e277027478431da0418e0a76c9091174b
      https://github.com/zanata/zanata-platform/commit/6eb44e1e277027478431da0418e0a76c9091174b
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2466) minor tweaks to full-width frontend layout (#786)

  Commit: d1d9e6ca35c5742ebfd01505ca18885a8918cf7e
      https://github.com/zanata/zanata-platform/commit/d1d9e6ca35c5742ebfd01505ca18885a8918cf7e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js

  Log Message:
  -----------
  fix(ZNTA-2501) change copy to text icon in react editor (#795)

* fix(ZNTA-2501) change copy to text icon in react editor

* fix(ZNTA-2501) update failing snapshots

  Commit: 8470fb73ca21a7f0a85055393b426406e644c347
      https://github.com/zanata/zanata-platform/commit/8470fb73ca21a7f0a85055393b426406e644c347
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js

  Log Message:
  -----------
  Merge pull request #790 from zanata/storybook-btn-update

fix: add antd button information to storybook

  Commit: fe2f8b2efe89452a4c5987546eee5bffedd75596
      https://github.com/zanata/zanata-platform/commit/fe2f8b2efe89452a4c5987546eee5bffedd75596
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2495

  Commit: fe917df27ae1d01390e808f05c05e2038f99e909
      https://github.com/zanata/zanata-platform/commit/fe917df27ae1d01390e808f05c05e2038f99e909
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2495) update button styling for activity table on profile page

  Commit: a2e3d7bf1b4525b5d7676071f178463a3cd14dfb
      https://github.com/zanata/zanata-platform/commit/a2e3d7bf1b4525b5d7676071f178463a3cd14dfb
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Languages/index.js

  Log Message:
  -----------
  refactor(ZNTA-2514) badges and breadcrumbs in frontend from react-bootstrap to antd

  Commit: a078f0623fd4cfeed43804fb5367a2935c27945a
      https://github.com/zanata/zanata-platform/commit/a078f0623fd4cfeed43804fb5367a2935c27945a
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) alignment of language count (tag) on languages page

  Commit: 289fb6b54eb2bd217ca0601ea0e0db1a704cb2aa
      https://github.com/zanata/zanata-platform/commit/289fb6b54eb2bd217ca0601ea0e0db1a704cb2aa
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-03 (Thu, 03 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    A server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/messages/ja.json

  Log Message:
  -----------
   perf(ZNTA-2459): improve activity panel / translationinfo panel performance (#771)

* perf(ZNTA-2459): improve activity panel / translationinfo panel performance

* fix: required props for activity panel, detailpane

* refactor: move filter logic to activitytab

* refactor: create interfaces, abstract filter functions in activitytab

* feat: track Glossary/Activity panel open state, create selector

* feat: display active panel of both glossary/activity tabs in controls header.
Enable toggling active panel of glossary/activity from controls header.

* perf: skip fetchTransUnitHistory on selecting a phrase if activity panel not visible

* perf: restrict fetchTransUnitHistory calls on selectPhrasePluralIndex if activity panel not visible

* refactor: controlheader activity/glossary button logic:
activity/glossary panel buttons will toggle if information panel is visible.
else if the information panel is not visible, they will toggle the information panel.
refactored controlheader to use react-intl messages, removed gettextCatalog.

* refactor: remove flow from ControlsHeader, define propTypes

* fix: activity/glossary icon display logic

* feat: include ja translations for new react-intl messages

* feat: convert Pager to SFC, paginate Activity items

* refactor: also use SFC Pager component in ControlsHeader

* feat: create react-intl messages for Pager I18n
update Pager test to inject intl

* fix: pagination indexing

* style: reduce margin-top on activity items

* refactor: use more types, enums. remove unused code

* feat: do not render pager if less than two pages

  Commit: 8e2fdd957eee162a14620e5fc681f8a395291781
      https://github.com/zanata/zanata-platform/commit/8e2fdd957eee162a14620e5fc681f8a395291781
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) refactor layout and components on Admin homepage to use antd instead of react-bootstrap

  Commit: e963571de01e5444a83369cabfe54fa219b482f0
      https://github.com/zanata/zanata-platform/commit/e963571de01e5444a83369cabfe54fa219b482f0
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-04 (Fri, 04 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: refactor Admin review criteria page from react-bootstrap to antd

  Commit: 60f8dccd6271a060663ab7de55529ece9bdb2650
      https://github.com/zanata/zanata-platform/commit/60f8dccd6271a060663ab7de55529ece9bdb2650
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

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

  Log Message:
  -----------
  feat: editor validation component and storybook (#805)

* feat: editor validators component and storybook

* fix: storyshot test, give dynamic validation message keys

* refactor: use interface instead of type literal

* feat: create stories for multiple validation errors/warnings

* feat: if message description exists, display in Tooltip

* chore: use PascalCase for interfaces

  Commit: fa759a906f2ff69b1f611a060f607d14854e8489
      https://github.com/zanata/zanata-platform/commit/fa759a906f2ff69b1f611a060f607d14854e8489
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js

  Log Message:
  -----------
  refactor(ZNTA-2514) admin rejection criteria page to antd

  Commit: 8fe613c64bd8c9b551a31b78ca4e69333dcc4a27
      https://github.com/zanata/zanata-platform/commit/8fe613c64bd8c9b551a31b78ca4e69333dcc4a27
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx

  Log Message:
  -----------
  refactor(ZNTA-2508): add aria-label to antd buttons (#803)

* refactor: add aria-label to antd buttons

* refactor(ZNTA-2508) remove duplicate aria labels for button

  Commit: 8dfeca336680c85cadcc8c949f1a4b303bdb08e7
      https://github.com/zanata/zanata-platform/commit/8dfeca336680c85cadcc8c949f1a4b303bdb08e7
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/index.css
    A server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    A server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/messages/ja.json

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2495

fix merge conflicts

  Commit: 4132d6b9e06daa6aa501c8c6895653269851ad0a
      https://github.com/zanata/zanata-platform/commit/4132d6b9e06daa6aa501c8c6895653269851ad0a
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2495) remove duplicate prop from button

  Commit: af97c2c89cc97af65ebe8cd461ad178ea5dcdb28
      https://github.com/zanata/zanata-platform/commit/af97c2c89cc97af65ebe8cd461ad178ea5dcdb28
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/index.css
    A server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    A server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/messages/ja.json

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 03f1f56fae2a9db32f61686600ba8281b7540f81
      https://github.com/zanata/zanata-platform/commit/03f1f56fae2a9db32f61686600ba8281b7540f81
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/Entry.js

  Log Message:
  -----------
  refactor(ZNTA-2415) glossary pages to antd

  Commit: d4163b9a4052d8d85c27d18eac57f4c936c617c6
      https://github.com/zanata/zanata-platform/commit/d4163b9a4052d8d85c27d18eac57f4c936c617c6
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2415) glossary pages to antd

  Commit: f43a4ea7dbc588da04a8a5942521abba046fb2f9
      https://github.com/zanata/zanata-platform/commit/f43a4ea7dbc588da04a8a5942521abba046fb2f9
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2415) user profile to antd

  Commit: 72ee19c9b4b62cfe879aadda7a7ef3fd904d5750
      https://github.com/zanata/zanata-platform/commit/72ee19c9b4b62cfe879aadda7a7ef3fd904d5750
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2415) fix LockIcon test

  Commit: 5754a65523807a0185431fdce95ca90451dc65b5
      https://github.com/zanata/zanata-platform/commit/5754a65523807a0185431fdce95ca90451dc65b5
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-09 (Wed, 09 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #797 from zanata/ZNTA-2495

ZNTA-2495: antd tooltips and buttons

  Commit: 327617e0352cf864d63ff9603c6b038e3917ca3f
      https://github.com/zanata/zanata-platform/commit/327617e0352cf864d63ff9603c6b038e3917ca3f
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-09 (Wed, 09 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2514) fix merge conflicts

  Commit: 9c85e4253721368275f5dd651c3f22efd30dee69
      https://github.com/zanata/zanata-platform/commit/9c85e4253721368275f5dd651c3f22efd30dee69
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-09 (Wed, 09 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: refactor TM Merge modal to antd, fix issues with LockIcon component and Glossary Entry

  Commit: 95bde4735da80213810a76c4859d22f237617a64
      https://github.com/zanata/zanata-platform/commit/95bde4735da80213810a76c4859d22f237617a64
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-09 (Wed, 09 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: refactor TM Merge modal to antd

  Commit: 19e89b8105ce9a117a791f61fc0ff69110d17dc4
      https://github.com/zanata/zanata-platform/commit/19e89b8105ce9a117a791f61fc0ff69110d17dc4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M client/zanata-client-commands/src/main/resources/prompts.properties

  Log Message:
  -----------
  docs: update help url in cli (#812)

  Commit: 60d83bf51048d57e2c6fcfc67000a251264cd84c
      https://github.com/zanata/zanata-platform/commit/60d83bf51048d57e2c6fcfc67000a251264cd84c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/services/src/main/java/org/zanata/action/HasUserDetail.java
    M server/services/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  fix(ZNTA-860): Indicate username must start with a letter or number (#806)

  Commit: 9abc42f51fe374cdf50e6c2c2d8c5e35e360d5e9
      https://github.com/zanata/zanata-platform/commit/9abc42f51fe374cdf50e6c2c2d8c5e35e360d5e9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/services/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M server/services/src/main/java/org/zanata/liquibase/custom/RebuildTMXPlainText.java
    M server/services/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java

  Log Message:
  -----------
  Fix old Liquibase migrations (#810)

* Clean up ResultSet handling
* Fix init order
* Minor tidy-up

  Commit: a988e2fb2ce9de05076186733c77f9a47a0318d1
      https://github.com/zanata/zanata-platform/commit/a988e2fb2ce9de05076186733c77f9a47a0318d1
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/services/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M server/services/src/main/java/org/zanata/liquibase/custom/RebuildTMXPlainText.java
    M server/services/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java

  Log Message:
  -----------
  Merge commit '9abc42f51fe374cdf50e6c2c2d8c5e35e360d5e9' into HEAD

  Commit: f5405f4efa7e70e4a3bd9d457f7e1b3102dbfd19
      https://github.com/zanata/zanata-platform/commit/f5405f4efa7e70e4a3bd9d457f7e1b3102dbfd19
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: TM Merge modal

  Commit: 321a30ab8b9dd1a3b4c6927b5605e08368803b28
      https://github.com/zanata/zanata-platform/commit/321a30ab8b9dd1a3b4c6927b5605e08368803b28
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  fix(ZNTA-2533): Liquibase script does not accept system properties (-D) (#813)

* fix(ZNTA-2533): Liquibase script does not accept system properties (-D)

  Commit: d270a506ccb3c8a9aaca821ee43526a0fa4028b1
      https://github.com/zanata/zanata-platform/commit/d270a506ccb3c8a9aaca821ee43526a0fa4028b1
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  Merge commit '321a30ab8b9dd1a3b4c6927b5605e08368803b28' into HEAD

  Commit: 1cf06632aef1165544ba2ec93456fefcf326bcf7
      https://github.com/zanata/zanata-platform/commit/1cf06632aef1165544ba2ec93456fefcf326bcf7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Update docs/release-notes.md for version 4.4.5

  Commit: 639e43d7be35f2ec0d4a90a0976f6ca9b2addce6
      https://github.com/zanata/zanata-platform/commit/639e43d7be35f2ec0d4a90a0976f6ca9b2addce6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.4.5

  Commit: ce117775ee6dd55865ac8ad4d347b914d609a734
      https://github.com/zanata/zanata-platform/commit/ce117775ee6dd55865ac8ad4d347b914d609a734
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.4.6-SNAPSHOT

  Commit: 05661189d7e2718c8d8caf2b22c49da6c76eb144
      https://github.com/zanata/zanata-platform/commit/05661189d7e2718c8d8caf2b22c49da6c76eb144
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-05-10 (Thu, 10 May 2018)

  Changed paths:
    M docs/release-notes.md

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

  Commit: dcd383bdff4e718b47df92a23683f735468c7fef
      https://github.com/zanata/zanata-platform/commit/dcd383bdff4e718b47df92a23683f735468c7fef
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-11 (Fri, 11 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514)  Collapse Panel for TM Merge Modal

  Commit: 513f5742cfd62e3a0df5cbf56d26ec89e0c6a84a
      https://github.com/zanata/zanata-platform/commit/513f5742cfd62e3a0df5cbf56d26ec89e0c6a84a
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: TM Merge Modal css fixes

  Commit: 0ebe469d594b242ae6e9c60552419579871d2bb5
      https://github.com/zanata/zanata-platform/commit/0ebe469d594b242ae6e9c60552419579871d2bb5
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M client/zanata-client-commands/src/main/resources/prompts.properties
    M docs/release-notes.md
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/services/src/main/java/org/zanata/action/HasUserDetail.java
    M server/services/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/services/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M server/services/src/main/java/org/zanata/liquibase/custom/RebuildTMXPlainText.java
    M server/services/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java
    M server/services/src/main/resources/ValidationMessages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

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

  Commit: 6b4f4c4bb09c8e91e701a071a51fcf2810e66593
      https://github.com/zanata/zanata-platform/commit/6b4f4c4bb09c8e91e701a071a51fcf2810e66593
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

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

  Log Message:
  -----------
  fix: include context path for doc and language link (#808)

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

  Commit: 9db13f8fd51773b30b7d22f2fd52ca2108d61677
      https://github.com/zanata/zanata-platform/commit/9db13f8fd51773b30b7d22f2fd52ca2108d61677
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-13 (Sun, 13 May 2018)

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

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

  Commit: c7e7068fd58ae1a915b449d369b5c648f874c721
      https://github.com/zanata/zanata-platform/commit/c7e7068fd58ae1a915b449d369b5c648f874c721
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-14 (Mon, 14 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: TM Merge modal

  Commit: 71905c5f44d53f485c0851a970cc716491a190dd
      https://github.com/zanata/zanata-platform/commit/71905c5f44d53f485c0851a970cc716491a190dd
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2514) fix linting errors

  Commit: 05e63112c00fc8ed6bc4113aa70aa6a07438285d
      https://github.com/zanata/zanata-platform/commit/05e63112c00fc8ed6bc4113aa70aa6a07438285d
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: TM Merge modal

  Commit: 8fbebefdf2caefdbdf1eaa867b11b5ad2cb258c3
      https://github.com/zanata/zanata-platform/commit/8fbebefdf2caefdbdf1eaa867b11b5ad2cb258c3
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
    M server/zanata-frontend/src/app/editor/containers/RejectTranslation/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/DateHelper.ts

  Log Message:
  -----------
  refactor(ZNTA-2494): replace bootstrap modals with ant.design modals (#799)

* feat(ZNTA-2494): replace bootstrap modals with antd

* feat: convert rejectionmodal dropdown to antd select

* chore: update criteriadropdown test, snapshot

* feat: refactor rejectionmodal prioritydropdown to antd select

* refactor: rejecttranslationmodal to antd modal

* refactor: suggestiondetailsmodal to antd modal

* refactor: GlossaryTermModal to antd modal

* refactor: replace all react-bootstrap components with antd in NewLanguageModal

* refactor: UserProfile RecentContributions modal to antd modal

* refactor: react-bootstrap components to antd in TMXExportModal

* refactor: react-bootstrap components with antd, NewEntryModal - Glossary

* refactor: react-bootstrap components with antd, ImportModal - Glossary

* refactor: react-bootstrap components with antd, ExportModal - Glossary

* fix: antd modal storybook

* fix: use css style imports in editor

* fix: unnecessary icon imports, test imports match components

* fix: NewLanguageModal validation and select option style

* fix: export glossary modal X close button, DateHelper type

  Commit: d9289bf1f7e454443b847dd34b01ce28d0fdc944
      https://github.com/zanata/zanata-platform/commit/d9289bf1f7e454443b847dd34b01ce28d0fdc944
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    R server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M server/zanata-war/src/main/webapp/public/info.xhtml

  Log Message:
  -----------
  fix(ZNTA-2540): Reinstate anonymous admin contact (#819)

* fix(ZNTA-2540): Reinstate anonymous admin contact
* fix(ZNTA-2540): add render condition to functions
* fix(ZNTA-2540): fix functional test
* fix(ZNTA-2540): minimise test code

  Commit: 262358c789d9d3a91ddf7a627c03f3e8ed584798
      https://github.com/zanata/zanata-platform/commit/262358c789d9d3a91ddf7a627c03f3e8ed584798
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-16 (Wed, 16 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/RoleAction.java
    M server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/action/RoleActionTest.java
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml

  Log Message:
  -----------
  fix(ZNTA-1993): Fix the role manager validation (#814)

* fix(ZNTA-1993): Fix the role manager validation
Prevent empty role name or greater that 255 characters
Prevent role name changes
Prevent overwriting an existing role
Remove users from role before deleting it
Add test

* fix(ZNTA-1993): Update based on review
Fix test function names
Move checking logic around to be less heavy handed
Rename stuff for clarity

* fix(ZNTA-1993): add test comment
* fix(ZNTA-1993): fix Codacy errors
* fix(ZNTA-1993): fix FB error
* fix(ZNTA-1993): I18n messages
* fix(ZNTA-1993): fix msgs error and ABC complaint

  Commit: 124861d1b5914699af0ef3632a75bad4d1f3aa9a
      https://github.com/zanata/zanata-platform/commit/124861d1b5914699af0ef3632a75bad4d1f3aa9a
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/services/src/main/java/org/zanata/action/RoleAction.java
    M server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/action/RoleActionTest.java
    M server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
    M server/zanata-frontend/src/app/editor/containers/RejectTranslation/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    M server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    R server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/public/info.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2514

  Commit: 5b8d35a753a410ada2273e84a3960bc41629ba81
      https://github.com/zanata/zanata-platform/commit/5b8d35a753a410ada2273e84a3960bc41629ba81
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) layout and styling of panels in TM Merge modal

  Commit: b82df5361adf6d29ee72d587e4b991400a5981d8
      https://github.com/zanata/zanata-platform/commit/b82df5361adf6d29ee72d587e4b991400a5981d8
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix: glossary UI icon and project name overlap

  Commit: 8ccb806b44c0b8e8166d2f1842dcaf6766722f07
      https://github.com/zanata/zanata-platform/commit/8ccb806b44c0b8e8166d2f1842dcaf6766722f07
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) replace TMMergeModal modal and toggle components with antd Modal and Switch

  Commit: 4c5c7e5e39fe5b271db33db8842a4b08c7abc399
      https://github.com/zanata/zanata-platform/commit/4c5c7e5e39fe5b271db33db8842a4b08c7abc399
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) css styling for TMMergeModal

  Commit: 6b41f62b019491cfa9d23cb5f5d6af05376abb52
      https://github.com/zanata/zanata-platform/commit/6b41f62b019491cfa9d23cb5f5d6af05376abb52
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  Merge pull request #820 from zanata/fix-glossary-ui/ZNTA-2550

fix: glossary UI icon and project name overlap

  Commit: 73b797963184f96acb6172d07ab7bbf45196682e
      https://github.com/zanata/zanata-platform/commit/73b797963184f96acb6172d07ab7bbf45196682e
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx

  Log Message:
  -----------
  refactor(ZNTA-2514) update import statements for antd components

  Commit: 694ad8c45b4c66d3a8f660107b30a1f3822f7a70
      https://github.com/zanata/zanata-platform/commit/694ad8c45b4c66d3a8f660107b30a1f3822f7a70
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

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

  Commit: 88889090ff379e59d81f4c1c528f4b2f774b6d01
      https://github.com/zanata/zanata-platform/commit/88889090ff379e59d81f4c1c528f4b2f774b6d01
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) minor fixes to Explore page css

  Commit: e30988f20a5dd4e923a6f012f2b3430c805d80fb
      https://github.com/zanata/zanata-platform/commit/e30988f20a5dd4e923a6f012f2b3430c805d80fb
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js

  Log Message:
  -----------
  refactor(ZNTA-2514) update failing tests in frontend

  Commit: 14f98ee69da8adf3ca2fe661f75e23a97bf783f8
      https://github.com/zanata/zanata-platform/commit/14f98ee69da8adf3ca2fe661f75e23a97bf783f8
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js

  Log Message:
  -----------
  refactor(ZNTA-2514) fix glossary row info icons

  Commit: 8136269e4267f2642b187abd92794ed9450fa00f
      https://github.com/zanata/zanata-platform/commit/8136269e4267f2642b187abd92794ed9450fa00f
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js

  Log Message:
  -----------
  refactor(ZNTA-2514) update failing CancellableProgressBar test

  Commit: 498c176e92c7d9f083e299caf44fab21612330cc
      https://github.com/zanata/zanata-platform/commit/498c176e92c7d9f083e299caf44fab21612330cc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/test/DBUnitDataSetRunner.java
    M server/services/src/test/java/org/zanata/test/rule/DataSetOperation.java
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M server/zanata-model-test/src/main/java/org/zanata/provider/DBUnitProvider.java
    M server/zanata-war/src/test/java/org/zanata/ArquillianTest.java

  Log Message:
  -----------
  Refactor DBUnitProvider (#824)

* Refactor DBUnitProvider
* Configure for H2 in DBUnitDataSetRunner

  Commit: 483e9395befc6aa066cbab9cf38ea48e7823a5ef
      https://github.com/zanata/zanata-platform/commit/483e9395befc6aa066cbab9cf38ea48e7823a5ef
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2514) fix linting issues in TS files

  Commit: 60ead7bbefc9d444b9f3120d18961f1acc8dc73e
      https://github.com/zanata/zanata-platform/commit/60ead7bbefc9d444b9f3120d18961f1acc8dc73e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js

  Log Message:
  -----------
  Allow 75% fuzzy threshold (#825)

  Commit: 9885544fc1e23d67c9bf867b1b92c72cf5685fd1
      https://github.com/zanata/zanata-platform/commit/9885544fc1e23d67c9bf867b1b92c72cf5685fd1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/ContactAdminAction.java
    M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    M server/services/src/main/java/org/zanata/service/EmailService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
    M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java

  Log Message:
  -----------
  refactor: EmailStrategy to VelocityEmailStrategy (#823)

  Commit: 8f518d4fa594a9204d95561460b40f1fb6075007
      https://github.com/zanata/zanata-platform/commit/8f518d4fa594a9204d95561460b40f1fb6075007
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/ContactAdminAction.java
    M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/service/EmailService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
    M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/services/src/test/java/org/zanata/test/DBUnitDataSetRunner.java
    M server/services/src/test/java/org/zanata/test/rule/DataSetOperation.java
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M server/zanata-model-test/src/main/java/org/zanata/provider/DBUnitProvider.java
    M server/zanata-war/src/test/java/org/zanata/ArquillianTest.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 7d7c6c7b13d9ca902627a81142c07870d3e2f5bf
      https://github.com/zanata/zanata-platform/commit/7d7c6c7b13d9ca902627a81142c07870d3e2f5bf
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) remove or refactor rows to antd

  Commit: f0933dae82f26ae8a8b0955e3ddcef17938cb287
      https://github.com/zanata/zanata-platform/commit/f0933dae82f26ae8a8b0955e3ddcef17938cb287
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) remove react-bootstrap table from editor

  Commit: 979f78865252d41cf7eb723df34706f15260690c
      https://github.com/zanata/zanata-platform/commit/979f78865252d41cf7eb723df34706f15260690c
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js

  Log Message:
  -----------
  fix: AddLanguageTest selenium ids (#829)

* fix: AddLanguageTest selenium ids

* fix: update selenium tests for AddLanguagePage to fill all fields

  Commit: 220787bef996b7cebc110557a4a41507e44ec242
      https://github.com/zanata/zanata-platform/commit/220787bef996b7cebc110557a4a41507e44ec242
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: replace react-bootstrap components in editor with antd

  Commit: b9e828783bfe204acf38ead790304e638cf7938b
      https://github.com/zanata/zanata-platform/commit/b9e828783bfe204acf38ead790304e638cf7938b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/UserAction.java
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.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/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  ZNTA-2492 erase a user and its data (#811)

* ZNTA-2492 erase a user and its data
* review fix
* another round
* UniqueValidator to inject EMF
* ZNTA-2492 remove locale membership when erasing

  Commit: d3f514c753ffc3ea53dbfe822b7143247e023cc5
      https://github.com/zanata/zanata-platform/commit/d3f514c753ffc3ea53dbfe822b7143247e023cc5
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

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

  Log Message:
  -----------
  feat: implement ant select in tmmergemodal

  Commit: fc217ad7a0ab8f10bf7269ee156c36675bf71efd
      https://github.com/zanata/zanata-platform/commit/fc217ad7a0ab8f10bf7269ee156c36675bf71efd
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: replace react-bootstrap components in editor with antd

  Commit: e0c42da39e6cc6dba966f4e7764ac46c1c6aad89
      https://github.com/zanata/zanata-platform/commit/e0c42da39e6cc6dba966f4e7764ac46c1c6aad89
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2514) styling changes to tooltip buttons in tm merge modal

  Commit: 45be3cf8169cce86d3571e79a6178e6a4842b45e
      https://github.com/zanata/zanata-platform/commit/45be3cf8169cce86d3571e79a6178e6a4842b45e
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2514) styling changes to tooltip buttons in tm merge modal

  Commit: 52757b9f94895413efa02e43df9b978ad6fb2819
      https://github.com/zanata/zanata-platform/commit/52757b9f94895413efa02e43df9b978ad6fb2819
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
    M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    R 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/service/impl/TranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/rest/service/raw/ArquillianRest.kt
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  feat(ZNTA-1818): generate email report for TM Merge (#818)

* Also fix TM Merge: avoid skipping unprocessed batches
  * Iterate over text flows in project, not by *untranslated* text flows
  * Update MergeTranslationsTaskHandle to count text flows
  * Add filter Predicate in TMServiceImpl.getSearchResult
  * Avoid mock TranslationService in TransMemoryMergeServiceImplJpaTest
  * Reduce iterations in TransMemoryMergeServiceImplJpaTest
* Use RAMDirectoryProvider for Hibernate Search unit tests
* Refactor TransMemoryMergeServiceImpl
* Log query when TM_MAX_RESULTS is reached
* Update Kotlin
* Replace kotlin-stdlib-jre7/8 with kotlin-stdlib-jdk7/8
* Fix some null annotations
* Isolate data between tests in TranslationFinderTest
* Use stdout in Deployments.main()
* Reduce logging in Arquillian tests
* Upgrade detekt and fix/ignore complaints
* Skip detekt for frontend
* Update ProjectVersionTest
* Update FrontendAssetsTest
* Improve test failure messages
* Fix smtp.port for functional tests
* Disable FindBugs warning
* Use waitForPageSilence when creating project
* Tweak JNDI lookup to work with cargo:run

  Commit: 2d32f4d589d88eb25f9f34ce060098cceb81d41f
      https://github.com/zanata/zanata-platform/commit/2d32f4d589d88eb25f9f34ce060098cceb81d41f
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): development version is now 4.6.0-SNAPSHOT

  Commit: 35156bd238206890f288bb4f70a89cd2a4ae9106
      https://github.com/zanata/zanata-platform/commit/35156bd238206890f288bb4f70a89cd2a4ae9106
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2554): remove ant design badge component (#831)

* fix(ZNTA-2554): remove ant design badge component

* style: override new-zanata global modal styles

  Commit: 22f00753f387c0f7ab1ea8b8e7fcdd0eda8f71ee
      https://github.com/zanata/zanata-platform/commit/22f00753f387c0f7ab1ea8b8e7fcdd0eda8f71ee
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  feat: implement language select ant component, fix select styles

  Commit: 7906be82de477177045948c6ffa9d73e071f0175
      https://github.com/zanata/zanata-platform/commit/7906be82de477177045948c6ffa9d73e071f0175
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  fix: prevent language select render when modal close/resetting state

  Commit: 3de2681c66b48728ed4a814c2aed3433941635d0
      https://github.com/zanata/zanata-platform/commit/3de2681c66b48728ed4a814c2aed3433941635d0
  Author: efloden <efloden at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

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

  Commit: e3a4d319a43265360367424717b54a4312b64236
      https://github.com/zanata/zanata-platform/commit/e3a4d319a43265360367424717b54a4312b64236
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: css fixes to TM Merge modal

  Commit: 94c28809c79132b519de56e7d6d7fc6851b9a900
      https://github.com/zanata/zanata-platform/commit/94c28809c79132b519de56e7d6d7fc6851b9a900
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2554) remove css override on the 'fr' class which is due to tachyon classes

  Commit: 1e0751844303eb31df330c78e8b2b4781f7efe2d
      https://github.com/zanata/zanata-platform/commit/1e0751844303eb31df330c78e8b2b4781f7efe2d
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  fix(ZNTA-2517) add ellipsis to delete group confirmation modal

  Commit: b48b0f4800abdddcc1ab76177f06e91f476bd094
      https://github.com/zanata/zanata-platform/commit/b48b0f4800abdddcc1ab76177f06e91f476bd094
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-2567) allow TM Merge (project version) to be cancelled (#838)

  Commit: 6eecd8c531216584eb96100cb7e1575167a386a2
      https://github.com/zanata/zanata-platform/commit/6eecd8c531216584eb96100cb7e1575167a386a2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.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/ProjectIterationClientTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/DocumentListPresenterTest.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/SearchResultsPresenterTest.java
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.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/model/DocumentJPATest.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/rest/service/ResourceUtilsParamTest.java
    M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  test(ZNTA-2555): fix assertion descriptions (#836)

* Fix assertion descriptions with structural replace
* Add back comment (was in middle of expression)

  Commit: b7ffc797cc89b2b26feff4aa9619f9445093111b
      https://github.com/zanata/zanata-platform/commit/b7ffc797cc89b2b26feff4aa9619f9445093111b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt

  Log Message:
  -----------
  fix(ZNTA-2141): escape Lucene keywords more precisely (#837)

  Commit: 0f6444f8da1d246f1111077bffe1b3811293d302
      https://github.com/zanata/zanata-platform/commit/0f6444f8da1d246f1111077bffe1b3811293d302
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) WIP: css fixes to TM Merge modal

  Commit: 0a8e9429ccf6142ff36b9c044570559f9324a88f
      https://github.com/zanata/zanata-platform/commit/0a8e9429ccf6142ff36b9c044570559f9324a88f
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M api/pom.xml
    M client/pom.xml
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M common/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/pom.xml

  Log Message:
  -----------
  fix: version

  Commit: 8d992c2177352822d02ede4660318c8cea751bec
      https://github.com/zanata/zanata-platform/commit/8d992c2177352822d02ede4660318c8cea751bec
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt

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

  Commit: 9124339ab3e6f194673cd5ece39cef9409fc0ffb
      https://github.com/zanata/zanata-platform/commit/9124339ab3e6f194673cd5ece39cef9409fc0ffb
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml

  Log Message:
  -----------
  fix(ZNTA-2554) prefix locale class to avoid conflicts with tachyon utility classes

  Commit: 8ec46c5e32ab4630aea559b4713452626eb52aab
      https://github.com/zanata/zanata-platform/commit/8ec46c5e32ab4630aea559b4713452626eb52aab
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js

  Log Message:
  -----------
  refactor(ZNTA-2514) spacing in tm merge modal

  Commit: 0dd047fe5d4aa8bad81a4baf6b27a55b40e50510
      https://github.com/zanata/zanata-platform/commit/0dd047fe5d4aa8bad81a4baf6b27a55b40e50510
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt

  Log Message:
  -----------
  Add locale ID to the TM Merge report (#842)

  Commit: 0a127bf15d40f4b229901e6970a38d0aa83401e7
      https://github.com/zanata/zanata-platform/commit/0a127bf15d40f4b229901e6970a38d0aa83401e7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt

  Log Message:
  -----------
  Merge commit '0dd047fe5d4aa8bad81a4baf6b27a55b40e50510' into HEAD

  Commit: 26ef880cfebb11816ec8749245e02c02e773c51c
      https://github.com/zanata/zanata-platform/commit/26ef880cfebb11816ec8749245e02c02e773c51c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/zanata-frontend/src/app/styles/style.less
    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

  Log Message:
  -----------
  fix(ZNTA-2552): Cookie consent banner (#843)

* fix(ZNTA-2552): Cookie consent banner
* fix(ZNTA-2552): handle banner in test
* fix(ZNTA-2552): update privacy link
* fix(ZNTA-2552): add banner to pages without sidebar

  Commit: 06d4120e6e74cdc71415c96a29459902061c21c0
      https://github.com/zanata/zanata-platform/commit/06d4120e6e74cdc71415c96a29459902061c21c0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/zanata-frontend/src/app/styles/style.less
    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

  Log Message:
  -----------
  Merge commit '26ef880cfebb11816ec8749245e02c02e773c51c' into HEAD

  Commit: b3b2f6e90a049e805e17569d8f0a4603f35f1620
      https://github.com/zanata/zanata-platform/commit/b3b2f6e90a049e805e17569d8f0a4603f35f1620
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

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

  Commit: b5fa117265f7e500aedaf3409e9ef47d3c4cfce6
      https://github.com/zanata/zanata-platform/commit/b5fa117265f7e500aedaf3409e9ef47d3c4cfce6
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix(ZNTA-2522) fix list alignment of languages on user profile page (#840)

  Commit: 013618f7f37178783a4ed6a0e6806e48eb8429ae
      https://github.com/zanata/zanata-platform/commit/013618f7f37178783a4ed6a0e6806e48eb8429ae
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2554): update jQuery locator script

  Commit: 7b88a66cb3e6bd78b98e73ed088a4417c2cfc841
      https://github.com/zanata/zanata-platform/commit/7b88a66cb3e6bd78b98e73ed088a4417c2cfc841
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) change label colours and minor formatting of tm merge modal

  Commit: 104f689acf7a0a931da46aea9fcdcd52417f99ae
      https://github.com/zanata/zanata-platform/commit/104f689acf7a0a931da46aea9fcdcd52417f99ae
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  fix: invalid group link in version page (#845)

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

  Commit: b4990a20789466cb3379bd9c46b49a17475bed2d
      https://github.com/zanata/zanata-platform/commit/b4990a20789466cb3379bd9c46b49a17475bed2d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  Merge commit '104f689acf7a0a931da46aea9fcdcd52417f99ae' into HEAD

  Commit: 36047b59d30ecc90300721f33d44cb7e0950f74b
      https://github.com/zanata/zanata-platform/commit/36047b59d30ecc90300721f33d44cb7e0950f74b
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  fix(ZNTA-2561): Jenkinsfile: preprocess node should be kept minimal (#833)

* fix(ZNTA-2561): Jenkinsfile: preprocess node should be kept minimal

  Commit: 7ac33f9d84b78695260356661545818d6ee94048
      https://github.com/zanata/zanata-platform/commit/7ac33f9d84b78695260356661545818d6ee94048
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) minor formatting of tm merge modal

  Commit: 1ce904aebb049f191a6054590d7959d8c86566fb
      https://github.com/zanata/zanata-platform/commit/1ce904aebb049f191a6054590d7959d8c86566fb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java

  Log Message:
  -----------
  Improve TraceDebugFilter; add debug for FileResourceClientTest (#844)

* Improve TraceDebugFilter
* Add more debugging to FileResourceClientTest
* Update help for --log-http

  Commit: f992d7518ed2b5cac5c632d3dc3e267acedfc94c
      https://github.com/zanata/zanata-platform/commit/f992d7518ed2b5cac5c632d3dc3e267acedfc94c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Merge commit '36047b59d30ecc90300721f33d44cb7e0950f74b' into HEAD

  Commit: 9adbab7c56978e4fc87b7ed0c2218c55d4d94b95
      https://github.com/zanata/zanata-platform/commit/9adbab7c56978e4fc87b7ed0c2218c55d4d94b95
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) final styling fixes to tm merge modal

  Commit: 5e04a53b4f5ab7a63de14fa5265193bfe3e9c536
      https://github.com/zanata/zanata-platform/commit/5e04a53b4f5ab7a63de14fa5265193bfe3e9c536
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx

  Log Message:
  -----------
  refactor(ZNTA-2514) update failing frontend tests

  Commit: 02c8a21cbbd287e0479b846753a7e60ce002323b
      https://github.com/zanata/zanata-platform/commit/02c8a21cbbd287e0479b846753a7e60ce002323b
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) fix modal padding

  Commit: 7a843361b7837206383c59e5798e4b90027d4e57
      https://github.com/zanata/zanata-platform/commit/7a843361b7837206383c59e5798e4b90027d4e57
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.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/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/DocumentListPresenterTest.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/SearchResultsPresenterTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/UserAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
    M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    R 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/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.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/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/raw/ArquillianRest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: ca3dab05e3ee9261cf3c1229405c18e776a90d84
      https://github.com/zanata/zanata-platform/commit/ca3dab05e3ee9261cf3c1229405c18e776a90d84
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) remove extra line from less file

  Commit: a1ab000b83bdfd2d3963f74b2472b0819582fc68
      https://github.com/zanata/zanata-platform/commit/a1ab000b83bdfd2d3963f74b2472b0819582fc68
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.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/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/DocumentListPresenterTest.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/SearchResultsPresenterTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/UserAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
    M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    R 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/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/LocaleDAOTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.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/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/raw/ArquillianRest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

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

  Commit: bf73cc3660903b6928b7f80c0190f755fe2e0fde
      https://github.com/zanata/zanata-platform/commit/bf73cc3660903b6928b7f80c0190f755fe2e0fde
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2517) add padding to modal titles

  Commit: 3f9d166b9d49b321109c52613326bca8109ff29c
      https://github.com/zanata/zanata-platform/commit/3f9d166b9d49b321109c52613326bca8109ff29c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-27 (Sun, 27 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

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

  Commit: c6f3d7db746939acd26afc2de128daed07f78f51
      https://github.com/zanata/zanata-platform/commit/c6f3d7db746939acd26afc2de128daed07f78f51
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #839 from zanata/ZNTA-2554-release

fix(ZNTA-2554) remove css conflicts between tachyon class and locales

  Commit: ad1b94c221c143206683885cadb552290b87ba19
      https://github.com/zanata/zanata-platform/commit/ad1b94c221c143206683885cadb552290b87ba19
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2574) group pages: language dropdown height corrected, container width corrected

  Commit: 2f5c1a763faa36dc916a37d788b215d2adb2a2b5
      https://github.com/zanata/zanata-platform/commit/2f5c1a763faa36dc916a37d788b215d2adb2a2b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml

  Log Message:
  -----------
  fix: unique html id for checkbox (#848)

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

  Commit: e9f9ed7ca8c0b5ecc417cf76c42d7b0a9639af6d
      https://github.com/zanata/zanata-platform/commit/e9f9ed7ca8c0b5ecc417cf76c42d7b0a9639af6d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml

  Log Message:
  -----------
  fix: unique html id for checkbox (#848)

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

  Commit: a9ab63ba4c698666d0d27fbeeca8cbebc0ff9c6e
      https://github.com/zanata/zanata-platform/commit/a9ab63ba4c698666d0d27fbeeca8cbebc0ff9c6e
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2574) dashboard: improve line height of page titles

  Commit: e06be62d5380bc54d789b8647d624c60d342bc4c
      https://github.com/zanata/zanata-platform/commit/e06be62d5380bc54d789b8647d624c60d342bc4c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Commit: 67166e490db4b7e61f39da43723d64f59543e6ee
      https://github.com/zanata/zanata-platform/commit/67166e490db4b7e61f39da43723d64f59543e6ee
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) revert changes to EditorSearchInput

  Commit: 49eee03e205799d3f9ae596d6e4da047ac9374b3
      https://github.com/zanata/zanata-platform/commit/49eee03e205799d3f9ae596d6e4da047ac9374b3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

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

  Log Message:
  -----------
  Update JavaMelody to 1.72.0 (#847)

  Commit: 31f5b60c1bb8260a85f6bd61a3bcb7cfe6dc4a2b
      https://github.com/zanata/zanata-platform/commit/31f5b60c1bb8260a85f6bd61a3bcb7cfe6dc4a2b
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

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

  Log Message:
  -----------
  Merge pull request #850 from zanata/ZNTA-2574

fix(ZNTA-2574) group pages styling fixes

  Commit: efe7df35a4c2d892d87eb0273c787f390db8f802
      https://github.com/zanata/zanata-platform/commit/efe7df35a4c2d892d87eb0273c787f390db8f802
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/functional-test/pom.xml
    A server/functional-test/src/test/resources/liquibase.properties

  Log Message:
  -----------
  test(ZNTA-2532): run liquibase script for tests (#851)

* Run liquibase script for tests
* Add option to skip liquibase exec: -Dliquibase.exec.skip

  Commit: 1e7906e35a068564495edb4414602752aa4cc4e0
      https://github.com/zanata/zanata-platform/commit/1e7906e35a068564495edb4414602752aa4cc4e0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/functional-test/pom.xml
    A server/functional-test/src/test/resources/liquibase.properties

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

  Commit: 8dbe1203b69215fa961c5848b12629ebe9966ab7
      https://github.com/zanata/zanata-platform/commit/8dbe1203b69215fa961c5848b12629ebe9966ab7
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  Merge pull request #841 from zanata/ZNTA-2517-release

fix(ZNTA-2517) add ellipsis to delete group modal

  Commit: 498a7a49c2c82ca8b4056edb27c4fb6425f75ad4
      https://github.com/zanata/zanata-platform/commit/498a7a49c2c82ca8b4056edb27c4fb6425f75ad4
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2534) react-bootstrap buttons in editor to antd (styling fixes still needed)

  Commit: ab131ce90695cbc4ace5f73f21ab370bb1ce22e8
      https://github.com/zanata/zanata-platform/commit/ab131ce90695cbc4ace5f73f21ab370bb1ce22e8
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) react-bootstrap buttons in editor to antd (styling fixes still needed)

  Commit: 9fb414999a1fbe809169a5b8a6f7911a97e53002
      https://github.com/zanata/zanata-platform/commit/9fb414999a1fbe809169a5b8a6f7911a97e53002
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) fix activity tab fuzzy posts, minor css styling to editor

  Commit: 8b1747653efc4f09c5a2b7b5f0c5d95331a7a385
      https://github.com/zanata/zanata-platform/commit/8b1747653efc4f09c5a2b7b5f0c5d95331a7a385
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) refactor translation footer buttons to antd

  Commit: a67c52034b216b5cbd83ae688b9aa95b0719cc32
      https://github.com/zanata/zanata-platform/commit/a67c52034b216b5cbd83ae688b9aa95b0719cc32
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into release-fix-may18

  Commit: 85a691ef7dd30317234ce65562b24ec943a2b44b
      https://github.com/zanata/zanata-platform/commit/85a691ef7dd30317234ce65562b24ec943a2b44b
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) toggle buttons in editor to antd

  Commit: 5d4c8982fce5f5373bbc3ff4ee5228bc8a94400f
      https://github.com/zanata/zanata-platform/commit/5d4c8982fce5f5373bbc3ff4ee5228bc8a94400f
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update editor snapshot tests

  Commit: d2c8ae43308fcb41489698b15fc7ee6f901367d7
      https://github.com/zanata/zanata-platform/commit/d2c8ae43308fcb41489698b15fc7ee6f901367d7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  feat: display projects in dashboard for member and maintainer (#852)

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

  Commit: a5b65fbd09527c9e6476170286871e0439e3b330
      https://github.com/zanata/zanata-platform/commit/a5b65fbd09527c9e6476170286871e0439e3b330
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml

  Log Message:
  -----------
  Merge pull request #857 from zanata/release-fix-may18

fix: release-to-master merge conflicts

  Commit: ed6c2a456743fd1d5f4baf8b1d677cd8e9389d8f
      https://github.com/zanata/zanata-platform/commit/ed6c2a456743fd1d5f4baf8b1d677cd8e9389d8f
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js

  Log Message:
  -----------
  fix(ZNTA-2587): mock ant design buttons, re-enable storyshot tests (#821)

* fix: mock ant design buttons, re-enable storyshot tests

* fix: move ant button mock to storyshots-editor and storyshots-frontend test files

  Commit: 954eefb9c1c925a58169c6757f0f1c6d1cd8503c
      https://github.com/zanata/zanata-platform/commit/954eefb9c1c925a58169c6757f0f1c6d1cd8503c
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js

  Log Message:
  -----------
  refactor(ZNTA-2534) migrate comment box, and editor panels to antd

  Commit: cd308893d70069a106f25bef7747d0005097cb41
      https://github.com/zanata/zanata-platform/commit/cd308893d70069a106f25bef7747d0005097cb41
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) remove last of react-bootstrap components from editor (excluding alerts). css styling fixes still required

  Commit: 6d953e614249913f3c0879eaa2d9f63deedd39ab
      https://github.com/zanata/zanata-platform/commit/6d953e614249913f3c0879eaa2d9f63deedd39ab
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.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/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    A server/functional-test/src/test/resources/liquibase.properties
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/DocumentListPresenterTest.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/SearchResultsPresenterTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/action/ContactAdminAction.java
    M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/UserAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.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/TextFlowDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/EmailService.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
    R 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/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/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/TextFlowTargetHistoryDAOTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.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/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/raw/ArquillianRest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

  Commit: 19323098342895579ff6e31332dd3ebfad2c7ea4
      https://github.com/zanata/zanata-platform/commit/19323098342895579ff6e31332dd3ebfad2c7ea4
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2584): EditorSearchInput to use Ant Collapse (#856)

* refactor: EditorSearchInput to use Ant Collapse

* test: update EditorSearchInput test to reflect changes

  Commit: db3978a9c7ee5a41d0c53e4374bc1088413245fa
      https://github.com/zanata/zanata-platform/commit/db3978a9c7ee5a41d0c53e4374bc1088413245fa
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2538): RejectionsForm bootstap components to ant design (#817)

* refactor: RejectionsForm bootstap components to ant design

* refactor(ZNTA-2538) css styling for RejectionsForm

* chore: update RejectionsForm storybook

* fix: Comment Required Switch

* fix: button tooltip behaviour

* fix: setState infinite loop, use ant components in Review controller

  Commit: b005043042702f5805f4cb1d5bbbf020e3d29af0
      https://github.com/zanata/zanata-platform/commit/b005043042702f5805f4cb1d5bbbf020e3d29af0
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav icons

  Commit: b74d28db884414e6f4e7cdb03a4edaca7f13b2d7
      https://github.com/zanata/zanata-platform/commit/b74d28db884414e6f4e7cdb03a4edaca7f13b2d7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java

  Log Message:
  -----------
  Use waitForPageSilence, not Thread.sleep (#832)

  Commit: 62a76ad3f49042f3cb22980e9e87f60f71f91af2
      https://github.com/zanata/zanata-platform/commit/62a76ad3f49042f3cb22980e9e87f60f71f91af2
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: editor sidebar tabs

  Commit: bdb54007e89bd37bad50aca174421bcfc3b511d9
      https://github.com/zanata/zanata-platform/commit/bdb54007e89bd37bad50aca174421bcfc3b511d9
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.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/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    A server/functional-test/src/test/resources/liquibase.properties
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/DocumentListPresenterTest.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/SearchResultsPresenterTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/action/ContactAdminAction.java
    M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/UserAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.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/TextFlowDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/EmailService.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
    R 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/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/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/TextFlowTargetHistoryDAOTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.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/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/raw/ArquillianRest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

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

  Commit: bf0dce856d7d3a100a27d83f1c1a9e3ce23e7066
      https://github.com/zanata/zanata-platform/commit/bf0dce856d7d3a100a27d83f1c1a9e3ce23e7066
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

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

  Commit: d25a21b56dbb9439982c8aaae5bf79f2d8a32b75
      https://github.com/zanata/zanata-platform/commit/d25a21b56dbb9439982c8aaae5bf79f2d8a32b75
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    A server/functional-test/src/test/resources/liquibase.properties
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 41bd4a9b3a75f3f9936ca714b5b00e80956cc369
      https://github.com/zanata/zanata-platform/commit/41bd4a9b3a75f3f9936ca714b5b00e80956cc369
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2534) css fixes to editor

  Commit: 4760f8f00e6d623c15625fdbb3c854a5ae4b76b7
      https://github.com/zanata/zanata-platform/commit/4760f8f00e6d623c15625fdbb3c854a5ae4b76b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java

  Log Message:
  -----------
  fix: cleanup obsolete groups (#859)

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

  Commit: 3fbc165258165eea88d786f589eda95444abf5a1
      https://github.com/zanata/zanata-platform/commit/3fbc165258165eea88d786f589eda95444abf5a1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  fix(ZNTA-544): include user content in emails as plain text (#815)

* fix(ZNTA-544): incoming email message to plaintext

Incoming messages should be plaintext, to avoid malicious links
hidden in anchors

* fix(ZNTA-544): fix test
* fix(ZNTA-544): escape and santize instead
* fix(ZNTA-544): rename parameter to safeHtmlMessage
* fix(ZNTA-544): rename htmlMessage to userMessage
* fix(ZNTA-544): codacy - explicit scope on variable
* fix(ZNTA-544): safe-html more emails

  Commit: 79e359d6a8433697726f0c046f137e08f7510972
      https://github.com/zanata/zanata-platform/commit/79e359d6a8433697726f0c046f137e08f7510972
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java

  Log Message:
  -----------
  Merge commit '3fbc165258165eea88d786f589eda95444abf5a1' into HEAD

  Commit: 39a6c637a4937365da5e7968fabdad3990f1365c
      https://github.com/zanata/zanata-platform/commit/39a6c637a4937365da5e7968fabdad3990f1365c
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

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

  Log Message:
  -----------
  fix: TranslationInfoPanel tabs

  Commit: c09abd16b23d1fc849a45bd0c694a6774a8aaac8
      https://github.com/zanata/zanata-platform/commit/c09abd16b23d1fc849a45bd0c694a6774a8aaac8
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx

  Log Message:
  -----------
  fix: Commentbox controlled input

  Commit: 98d85736e11585baf7173e0b418edb18a9fc7410
      https://github.com/zanata/zanata-platform/commit/98d85736e11585baf7173e0b418edb18a9fc7410
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js

  Log Message:
  -----------
  chore: update editor tests

  Commit: 66541d86ead50561ff6edc2cd588d33ebbc33383
      https://github.com/zanata/zanata-platform/commit/66541d86ead50561ff6edc2cd588d33ebbc33383
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2591) remove extra width given to wideView containers

  Commit: a0aa7d7159d05fb1171cf105c6ad1c84650bfab7
      https://github.com/zanata/zanata-platform/commit/a0aa7d7159d05fb1171cf105c6ad1c84650bfab7
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java

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

  Commit: 9717b4f90ec4dc6d61d0b2e71dc4c06e096f17a3
      https://github.com/zanata/zanata-platform/commit/9717b4f90ec4dc6d61d0b2e71dc4c06e096f17a3
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    M server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java

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

  Commit: 4874eddb742f65244cbac5f3adb4adfbb10d969a
      https://github.com/zanata/zanata-platform/commit/4874eddb742f65244cbac5f3adb4adfbb10d969a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M docs/user-guide/documents/upload-documents.md
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

  Log Message:
  -----------
  fix(ZNTA-1083): add offline PO upload for File projects (#858)

* fix(ZNTA-1083): po translation upload on File project
* fix(ZNTA-1083): indicate the experimental nature of raw upload
* fix(ZNTA-1083): remove Properties from support list
* fix(ZNTA-1083): improve test
* fix(ZNTA-1083): remove temp files and unused imports
* Remove last temp file from test

  Commit: 37b390dfe272b43e1a555796d87e29f310da83cd
      https://github.com/zanata/zanata-platform/commit/37b390dfe272b43e1a555796d87e29f310da83cd
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M docs/user-guide/documents/upload-documents.md
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

  Log Message:
  -----------
  Merge commit '4874eddb742f65244cbac5f3adb4adfbb10d969a' into HEAD

  Commit: 3aa751ed169093b96a3eae79ce7761667135ba77
      https://github.com/zanata/zanata-platform/commit/3aa751ed169093b96a3eae79ce7761667135ba77
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js

  Log Message:
  -----------
  fix(UI): glossary entry details icon (#864)

Give it back its circle.

  Commit: fb37a94b7431c96f06eb49a7940a878bbfc0db7d
      https://github.com/zanata/zanata-platform/commit/fb37a94b7431c96f06eb49a7940a878bbfc0db7d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js

  Log Message:
  -----------
  Merge commit '3aa751ed169093b96a3eae79ce7761667135ba77' into HEAD

  Commit: 8932a194983bafb3d83a944c8d2c89c2752c18e8
      https://github.com/zanata/zanata-platform/commit/8932a194983bafb3d83a944c8d2c89c2752c18e8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  fix(ZNTA-2596): detect invalid project slug in url (#867)

  Commit: d75e1a636956e65821ddc657a2ed68939c90f9a1
      https://github.com/zanata/zanata-platform/commit/d75e1a636956e65821ddc657a2ed68939c90f9a1
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  Merge commit '8932a194983bafb3d83a944c8d2c89c2752c18e8' into HEAD

  Commit: a63bcefe1efb734947c5b285b6b07705b1e517fb
      https://github.com/zanata/zanata-platform/commit/a63bcefe1efb734947c5b285b6b07705b1e517fb
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Update maven-javadoc-plugin, maven-source-plugin, maven-compiler-plug… (#855)

* Update maven plugins for Fedora 28

  Commit: 02b17eab9d48120d7d5daa60e620c34344a849cc
      https://github.com/zanata/zanata-platform/commit/02b17eab9d48120d7d5daa60e620c34344a849cc
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml

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

  Commit: a914d842bd0cd0cdc5c9f2120cd5c688ceeedd5f
      https://github.com/zanata/zanata-platform/commit/a914d842bd0cd0cdc5c9f2120cd5c688ceeedd5f
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    A server/zanata-war/src/main/resources/messages_bg.properties
    A server/zanata-war/src/main/resources/messages_br.properties
    A server/zanata-war/src/main/resources/messages_ca.properties
    A server/zanata-war/src/main/resources/messages_cs.properties
    A server/zanata-war/src/main/resources/messages_de.properties
    A server/zanata-war/src/main/resources/messages_en_GB.properties
    A server/zanata-war/src/main/resources/messages_eo.properties
    A server/zanata-war/src/main/resources/messages_es.properties
    A server/zanata-war/src/main/resources/messages_es_ES.properties
    A server/zanata-war/src/main/resources/messages_fr.properties
    A server/zanata-war/src/main/resources/messages_gu.properties
    A server/zanata-war/src/main/resources/messages_hu.properties
    A server/zanata-war/src/main/resources/messages_it.properties
    A server/zanata-war/src/main/resources/messages_ja.properties
    A server/zanata-war/src/main/resources/messages_ko.properties
    A server/zanata-war/src/main/resources/messages_nl.properties
    A server/zanata-war/src/main/resources/messages_pl.properties
    A server/zanata-war/src/main/resources/messages_pt_BR.properties
    A server/zanata-war/src/main/resources/messages_pt_PT.properties
    A server/zanata-war/src/main/resources/messages_ru.properties
    A server/zanata-war/src/main/resources/messages_tr.properties
    A server/zanata-war/src/main/resources/messages_uk.properties
    A server/zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    A server/zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Pull translations

  Commit: 0520d6b72e3e9a75f1a0764a1bafad53078e2933
      https://github.com/zanata/zanata-platform/commit/0520d6b72e3e9a75f1a0764a1bafad53078e2933
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    A api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/MockFileResource.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.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
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Min content state when retrieving translations (approved or translated)

  Commit: a913c676a9f12541f7e44ccc21c50c46db540289
      https://github.com/zanata/zanata-platform/commit/a913c676a9f12541f7e44ccc21c50c46db540289
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Make dbunit tests easier to understand

Add more explanations to ProjectDAOTest
Move constants for ProjectsData.dbunit.xml
Add ContentState guide to MultipleTextFlowTestData.dbunit.xml

  Commit: 17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
      https://github.com/zanata/zanata-platform/commit/17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    R api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    R server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.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
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.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:
  -----------
  feat(ZNTA-2437) Code review changes and refactoring

Changes/Refactorings based on the code review
Removing code duplicates

  Commit: af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
      https://github.com/zanata/zanata-platform/commit/af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore

  Log Message:
  -----------
  Update .gitignore

  Commit: 48db1f267786e7963cb885030c9f7121a2a373b2
      https://github.com/zanata/zanata-platform/commit/48db1f267786e7963cb885030c9f7121a2a373b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    R server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    R server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.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
    R server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    R server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437): replace minContentState options with approvedOnly

FileResource/Service: change minContentState to approvedOnly
TranslatedDocResource: change minContentState to markTranslatedAsApproved
Refactor MinContentStateRestITCase: bring in constants for test data
Rename MinContentStateRestITCase to TranslationResourceApprovedRestITCase
Refactor FileRawRestITCase; add test which downloads XLIFF source
Add approvedOnly option to CLI, PoWriter2, XliffWriter and PropWriter
Add approvedOnly unit tests for XliffWriter and PropWriter
Refactor PoReader2Test
Refactor PoWriter2 to add Builder
Add unit tests for PoWriter2

  Commit: fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
      https://github.com/zanata/zanata-platform/commit/fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M parent/pom.xml

  Log Message:
  -----------
  Use slf4j-simple in common modules

  Commit: d7b7fe3772227cc8a1196c0e6b17bc23ef83f7c4
      https://github.com/zanata/zanata-platform/commit/d7b7fe3772227cc8a1196c0e6b17bc23ef83f7c4
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

  Changed paths:
    R server/zanata-war/src/main/resources/messages_bg.properties
    R server/zanata-war/src/main/resources/messages_br.properties
    R server/zanata-war/src/main/resources/messages_ca.properties
    R server/zanata-war/src/main/resources/messages_cs.properties
    R server/zanata-war/src/main/resources/messages_de.properties
    R server/zanata-war/src/main/resources/messages_en_GB.properties
    R server/zanata-war/src/main/resources/messages_eo.properties
    R server/zanata-war/src/main/resources/messages_es.properties
    R server/zanata-war/src/main/resources/messages_es_ES.properties
    R server/zanata-war/src/main/resources/messages_fr.properties
    R server/zanata-war/src/main/resources/messages_gu.properties
    R server/zanata-war/src/main/resources/messages_hu.properties
    R server/zanata-war/src/main/resources/messages_it.properties
    R server/zanata-war/src/main/resources/messages_ja.properties
    R server/zanata-war/src/main/resources/messages_ko.properties
    R server/zanata-war/src/main/resources/messages_nl.properties
    R server/zanata-war/src/main/resources/messages_pl.properties
    R server/zanata-war/src/main/resources/messages_pt_BR.properties
    R server/zanata-war/src/main/resources/messages_pt_PT.properties
    R server/zanata-war/src/main/resources/messages_ru.properties
    R server/zanata-war/src/main/resources/messages_tr.properties
    R server/zanata-war/src/main/resources/messages_uk.properties
    R server/zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    R server/zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Revert "Pull translations"

This reverts commit a914d842bd0cd0cdc5c9f2120cd5c688ceeedd5f.

  Commit: 0834f07b0a574609ea5c220da20506d97191a417
      https://github.com/zanata/zanata-platform/commit/0834f07b0a574609ea5c220da20506d97191a417
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

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

  Commit: 12290b80188520b12a02b6b62b014c626f42fd85
      https://github.com/zanata/zanata-platform/commit/12290b80188520b12a02b6b62b014c626f42fd85
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/TranslationResourceRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Code review fixes
FileResource: parameter documentation change
FileRawRestITCase: checking the resource
TranslationResourceRestITCase: removing duplicates

  Commit: 6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
      https://github.com/zanata/zanata-platform/commit/6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Configure compiler to fail on warning

  Commit: 9840852c0effb613b2fe36c48b710a1cffc55a9e
      https://github.com/zanata/zanata-platform/commit/9840852c0effb613b2fe36c48b710a1cffc55a9e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  Make log msg less like a javac warning

  Commit: dafdf14f9168d25a553d221f3dad7e7a4efb24d5
      https://github.com/zanata/zanata-platform/commit/dafdf14f9168d25a553d221f3dad7e7a4efb24d5
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) styling for editor tabs

  Commit: 7b058db1c8cb763d16849c13ea20d2c06b7f08ff
      https://github.com/zanata/zanata-platform/commit/7b058db1c8cb763d16849c13ea20d2c06b7f08ff
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) media queries for sidebar in editor

  Commit: 04c380e730362f2fc3e71351db3d070361f25004
      https://github.com/zanata/zanata-platform/commit/04c380e730362f2fc3e71351db3d070361f25004
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) add tachyon utility classes to editor, small margin fixes to activity tab

  Commit: 448678243cf48e3c3360f34b37d52d6d17a035b7
      https://github.com/zanata/zanata-platform/commit/448678243cf48e3c3360f34b37d52d6d17a035b7
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) correct location in tachyon css import, minor css fixes to editor sidebar

  Commit: 17a689dc2f4b3d90028bd2b03fba297ca5ae493b
      https://github.com/zanata/zanata-platform/commit/17a689dc2f4b3d90028bd2b03fba297ca5ae493b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M server/pom.xml

  Log Message:
  -----------
  Fail on Kotlin warnings (#869)

  Commit: 17367257b395193eb4513aaf3000ae0b49a3ea4f
      https://github.com/zanata/zanata-platform/commit/17367257b395193eb4513aaf3000ae0b49a3ea4f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M server/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into min-content-state

  Commit: 220a1beffff1b665b9f1a382930168f8baf6cc1e
      https://github.com/zanata/zanata-platform/commit/220a1beffff1b665b9f1a382930168f8baf6cc1e
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  upgrade less-loader to 4.0.5 (#871)

  Commit: f4f3b5e8425f80de5507b171da7fc17423607ec7
      https://github.com/zanata/zanata-platform/commit/f4f3b5e8425f80de5507b171da7fc17423607ec7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '220a1beffff1b665b9f1a382930168f8baf6cc1e' into HEAD

  Commit: 54d117b7353e8b8075031fe4910be443044cad88
      https://github.com/zanata/zanata-platform/commit/54d117b7353e8b8075031fe4910be443044cad88
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) styling fixes to react editor, update snapshots

  Commit: a6cf4a2fcb14d535bdeb6e6cc2f5fda520b104b0
      https://github.com/zanata/zanata-platform/commit/a6cf4a2fcb14d535bdeb6e6cc2f5fda520b104b0
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M .gitignore
    M server/pom.xml

  Log Message:
  -----------
  fix(pom): use doclint none for maven-javadoc 3.X

  Commit: 40b1dc3648841a820dcabd98333e7ad0980b7619
      https://github.com/zanata/zanata-platform/commit/40b1dc3648841a820dcabd98333e7ad0980b7619
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M .gitignore
    M server/pom.xml

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

  Commit: c14cb6e91295cecf4ed51921330a4a32c05661d4
      https://github.com/zanata/zanata-platform/commit/c14cb6e91295cecf4ed51921330a4a32c05661d4
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2534) vertical alignment of editor breadcrumb menu

  Commit: 47a576748dd567c19790fc2aafbbd20100ba2a89
      https://github.com/zanata/zanata-platform/commit/47a576748dd567c19790fc2aafbbd20100ba2a89
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M docs/user-guide/documents/upload-documents.md
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

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

  Commit: 5ea641e859f060c75920cf12d20e5b7aad23ee8f
      https://github.com/zanata/zanata-platform/commit/5ea641e859f060c75920cf12d20e5b7aad23ee8f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  remove(profile): doclint-java8-disable (#873)

also change aggregate phase to site

  Commit: 1825b803dcd24a43041afcb29c8627294e7ae879
      https://github.com/zanata/zanata-platform/commit/1825b803dcd24a43041afcb29c8627294e7ae879
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Merge commit '5ea641e859f060c75920cf12d20e5b7aad23ee8f' into HEAD

  Commit: 64b51d5c00cef9cf012d75f0dfc8ad22c554ed59
      https://github.com/zanata/zanata-platform/commit/64b51d5c00cef9cf012d75f0dfc8ad22c554ed59
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.5.0-rc-2

  Commit: 8857402fc21d3314544b3558f941fdaa0d3d918b
      https://github.com/zanata/zanata-platform/commit/8857402fc21d3314544b3558f941fdaa0d3d918b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.5.0-rc-3-SNAPSHOT

  Commit: c6a74500adbe29650c589eddd826515db061c874
      https://github.com/zanata/zanata-platform/commit/c6a74500adbe29650c589eddd826515db061c874
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

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

  Commit: b490718d676fd0fe205cf5d6459531428a1af59c
      https://github.com/zanata/zanata-platform/commit/b490718d676fd0fe205cf5d6459531428a1af59c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  fix: improve stats collection (#872)

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

  Commit: 52a0b4e91426e30eeb02cb5b97a64b064f7d4f07
      https://github.com/zanata/zanata-platform/commit/52a0b4e91426e30eeb02cb5b97a64b064f7d4f07
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    R docs/images/version-translation-settings.png
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix: remove requireReview flag (#874)

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

  Commit: db3327e5c915b3555604175cb029fa96ff1e199f
      https://github.com/zanata/zanata-platform/commit/db3327e5c915b3555604175cb029fa96ff1e199f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf

  Log Message:
  -----------
  Fix approvedOnly handling in adapters, add more tests

Also fix ZNTA-2601: in .TS, only use type=unfinished when appropriate

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

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

  Log Message:
  -----------
  refactor(ZNTA-2534) fix import statement for tachyon utility classes

  Commit: 9610a5e9223f6799cf6f6a5b2927ef8388dbe5bd
      https://github.com/zanata/zanata-platform/commit/9610a5e9223f6799cf6f6a5b2927ef8388dbe5bd
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2590) decrease height of keyboard shortcut modal, add scrolling (#861)

* fix(ZNTA-2590) decrease height of keyboard shortcut modal, add scrolling

* fix(ZNTA-2590) fix linting errors

  Commit: bdef4f576130f72a95a0286ae8498b379e10f74b
      https://github.com/zanata/zanata-platform/commit/bdef4f576130f72a95a0286ae8498b379e10f74b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-06 (Wed, 06 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '9610a5e9223f6799cf6f6a5b2927ef8388dbe5bd' into HEAD

  Commit: 58c3eb03d9b65c332db42a7c7be8af56c72b146a
      https://github.com/zanata/zanata-platform/commit/58c3eb03d9b65c332db42a7c7be8af56c72b146a
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2591) remove extra width from react containers, remove background colour added by antd to react-autosuggest input component

  Commit: a1e8aac6075d76f84783b6dc817aa4e795bc9656
      https://github.com/zanata/zanata-platform/commit/a1e8aac6075d76f84783b6dc817aa4e795bc9656
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2591) remove wideView wrapper from languages page

  Commit: 9b255246411afb4c806a3db835dd04995b54ddc6
      https://github.com/zanata/zanata-platform/commit/9b255246411afb4c806a3db835dd04995b54ddc6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Enable strictNullChecks for TypeScript (#880)

  Commit: 946013fab8d80da095d8a3ce0cb0f13dfbe05cea
      https://github.com/zanata/zanata-platform/commit/946013fab8d80da095d8a3ce0cb0f13dfbe05cea
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2615): editor translate button (#886)

  Commit: 4f5b384712c106cff09e47e96f74f7f9118eb376
      https://github.com/zanata/zanata-platform/commit/4f5b384712c106cff09e47e96f74f7f9118eb376
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '946013fab8d80da095d8a3ce0cb0f13dfbe05cea' into HEAD

  Commit: b80ea0111d4b95d6c805f7aa63bc3a039fe4c9bd
      https://github.com/zanata/zanata-platform/commit/b80ea0111d4b95d6c805f7aa63bc3a039fe4c9bd
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2614) increase contrast of concurrent editor username in gwt editor

  Commit: 1f651a313bdcc6ba601661cdffccaa53b00f5600
      https://github.com/zanata/zanata-platform/commit/1f651a313bdcc6ba601661cdffccaa53b00f5600
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java

  Log Message:
  -----------
  fix: GWT editor option (#890)

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

  Commit: 937493a87eab71377333302d1ae3cb5c7847b6b8
      https://github.com/zanata/zanata-platform/commit/937493a87eab71377333302d1ae3cb5c7847b6b8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java

  Log Message:
  -----------
  Merge commit '1f651a313bdcc6ba601661cdffccaa53b00f5600' into HEAD

  Commit: f6790b9236fb74f09d844f9932d70a8383dc2ef2
      https://github.com/zanata/zanata-platform/commit/f6790b9236fb74f09d844f9932d70a8383dc2ef2
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  Merge pull request #889 from zanata/ZNTA-2614

fix(ZNTA-2614) increase contrast of concurrent editor username in gwt editor

  Commit: e20ce80029ab41744adc5bf34c0a4b8aa61b4a6d
      https://github.com/zanata/zanata-platform/commit/e20ce80029ab41744adc5bf34c0a4b8aa61b4a6d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #868 from zanata/ZNTA-2591

fix(ZNTA-2591) remove extra width and height from languages page + minor styling fixes

  Commit: 2e866d0dd10d43c418cc2f7dba4cd0dec93be8fd
      https://github.com/zanata/zanata-platform/commit/2e866d0dd10d43c418cc2f7dba4cd0dec93be8fd
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx

  Log Message:
  -----------
  fix: hide activity commentbox when no translations to comment on (#883)

  Commit: df85c9a3cf1f89396739d76e016606c110b7269f
      https://github.com/zanata/zanata-platform/commit/df85c9a3cf1f89396739d76e016606c110b7269f
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js

  Log Message:
  -----------
  fix(ZNTA-2608): reset new language form fields on close or submit (#885)

  Commit: d5abeda17b8ba0f66c426d295734f96693c9db4b
      https://github.com/zanata/zanata-platform/commit/d5abeda17b8ba0f66c426d295734f96693c9db4b
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less

  Log Message:
  -----------
  fix(ZNTA-2589) set fixed width and height on logoloader to ensure nav icons are same size across frontend

  Commit: cffd08113a19ca90b7c57551d07ea815feeae955
      https://github.com/zanata/zanata-platform/commit/cffd08113a19ca90b7c57551d07ea815feeae955
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2589) ensure antd dropdowns have a white/transparent background for visibility

  Commit: 5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
      https://github.com/zanata/zanata-platform/commit/5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2589) WIP: nav-icon size

  Commit: 9f6d01c1f7cd85a3fae89661d8783df87538ca60
      https://github.com/zanata/zanata-platform/commit/9f6d01c1f7cd85a3fae89661d8783df87538ca60
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav-icon size across react and jsf pages

  Commit: 658f15710c1df388ca997378442c8b89756d8d78
      https://github.com/zanata/zanata-platform/commit/658f15710c1df388ca997378442c8b89756d8d78
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

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

  Commit: c31c76d6f8d802417b83f13883a142fd948e44b2
      https://github.com/zanata/zanata-platform/commit/c31c76d6f8d802417b83f13883a142fd948e44b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

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

  Log Message:
  -----------
  Hide translation-comment search (can't show/edit) (#892)

  Commit: 02757d8717bba2f8ef5665075fb12b6203744ae1
      https://github.com/zanata/zanata-platform/commit/02757d8717bba2f8ef5665075fb12b6203744ae1
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-11 (Mon, 11 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js

  Log Message:
  -----------
  feat(ZNTA-2528): refactor to ant notifications and alerts (#875)

* feat(ZNTA-2528): refactor to ant notifications and alerts

* chore: remove bootstrap notification story, snapshots

* refactor: bootstrap Alert to Ant Notification

* refactor: match notification props with ant component

* chore: update reducer tests

  Commit: c0181625c53ea012218fcd6467e4b305e6e9d541
      https://github.com/zanata/zanata-platform/commit/c0181625c53ea012218fcd6467e4b305e6e9d541
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js

  Log Message:
  -----------
  fix: statistics update after save (#888)

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

  Commit: 5f42051bed6ba80ce3e0923846c5c31f116e3578
      https://github.com/zanata/zanata-platform/commit/5f42051bed6ba80ce3e0923846c5c31f116e3578
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M .gitignore
    R docs/images/version-translation-settings.png
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M parent/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    R server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

  Commit: 5572692dd39b47b709920763867870b962fbc8cd
      https://github.com/zanata/zanata-platform/commit/5572692dd39b47b709920763867870b962fbc8cd
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling

  Commit: 963fe462d20398bc471e0eb750ecf70a6443e9fc
      https://github.com/zanata/zanata-platform/commit/963fe462d20398bc471e0eb750ecf70a6443e9fc
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling

  Commit: 5f9b5a65cdadf772fd9635b33633936db75be376
      https://github.com/zanata/zanata-platform/commit/5f9b5a65cdadf772fd9635b33633936db75be376
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M .gitignore
    M Jenkinsfile
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    R docs/images/version-translation-settings.png
    M docs/user-guide/documents/upload-documents.md
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    R server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2514

  Commit: ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
      https://github.com/zanata/zanata-platform/commit/ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2607) TMX modal styling

  Commit: 1a7a59b75c0c99659ae58ed9f99ca98888b68605
      https://github.com/zanata/zanata-platform/commit/1a7a59b75c0c99659ae58ed9f99ca98888b68605
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #893 from zanata/merge-release-master

merge release into master

  Commit: 925b2778b593c91f050d09b8f0a8cf772e3130a7
      https://github.com/zanata/zanata-platform/commit/925b2778b593c91f050d09b8f0a8cf772e3130a7
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2617) add spacing to delete entry buttons on language page, fix alignment of no languages statement (#887)

  Commit: 2c5ccfe355ee10c7b7cb11162a14a1d6cb307aee
      https://github.com/zanata/zanata-platform/commit/2c5ccfe355ee10c7b7cb11162a14a1d6cb307aee
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js

  Log Message:
  -----------
  Merge commit '925b2778b593c91f050d09b8f0a8cf772e3130a7' into HEAD

  Commit: 65efb9b0866898d8bf8859213e5adf5ad08e44e3
      https://github.com/zanata/zanata-platform/commit/65efb9b0866898d8bf8859213e5adf5ad08e44e3
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

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

  Commit: ff430e4b704a43885c75c08f518a4eeac2b04332
      https://github.com/zanata/zanata-platform/commit/ff430e4b704a43885c75c08f518a4eeac2b04332
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

  Commit: b4a08f634b8ed177ef2a705615bfec708ae96aef
      https://github.com/zanata/zanata-platform/commit/b4a08f634b8ed177ef2a705615bfec708ae96aef
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update snapshots

  Commit: d13c0481b2f76b87eba581a21dad740084da1e27
      https://github.com/zanata/zanata-platform/commit/d13c0481b2f76b87eba581a21dad740084da1e27
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 4fa791e438dbda18844217a11603203c5148daeb
      https://github.com/zanata/zanata-platform/commit/4fa791e438dbda18844217a11603203c5148daeb
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534)fix linting issues

  Commit: c98bd78d0e445723e4b9601a28bb92c842f5c1ec
      https://github.com/zanata/zanata-platform/commit/c98bd78d0e445723e4b9601a28bb92c842f5c1ec
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/src/test/java/TestJenkinsfile.java

  Log Message:
  -----------
  chore(ZNTA-2390): run all tests if PR description contains allFuncTests (#846)

  Commit: 9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
      https://github.com/zanata/zanata-platform/commit/9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

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

  Log Message:
  -----------
  fix: js warning in frontend (#897)

  Commit: c287e55a8548ab961c5fb06a5e88fc90490963dd
      https://github.com/zanata/zanata-platform/commit/c287e55a8548ab961c5fb06a5e88fc90490963dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  fix(ZNTA-2532) fix liquibase configuration (#853)

* Test: ensure build fails if liquibase does
* Configure liquibase and appserver to use basedir/target/documents
* Download mysql/slf4j if required

  Commit: 2c10d4f295f111fb19c2f842c57b1519509e46d5
      https://github.com/zanata/zanata-platform/commit/2c10d4f295f111fb19c2f842c57b1519509e46d5
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

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

  Commit: 92fb27d10ff41c083d7d553161de66ed2e1cc4fc
      https://github.com/zanata/zanata-platform/commit/92fb27d10ff41c083d7d553161de66ed2e1cc4fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge pull request #834 from dragosv/min-content-state

feat(ZNTA-2437) add option to get Approved translations only

  Commit: d7c7d1eb627c09015dd7e6dd4c125aab416cd518
      https://github.com/zanata/zanata-platform/commit/d7c7d1eb627c09015dd7e6dd4c125aab416cd518
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java

  Log Message:
  -----------
  Add some missing assertions (#835)

* Add some missing assertions
* Remove useless assertThat calls

  Commit: 13ec976997819c3165f89c2101c2535b68f34778
      https://github.com/zanata/zanata-platform/commit/13ec976997819c3165f89c2101c2535b68f34778
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  Merge pull request #894 from zanata/ZNTA-2620

fix(ZNTA-2620) user profile button styling

  Commit: c4b90fb52254de18a056aca3ecea146ae742f27a
      https://github.com/zanata/zanata-platform/commit/c4b90fb52254de18a056aca3ecea146ae742f27a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  Merge commit '13ec976997819c3165f89c2101c2535b68f34778' into HEAD

  Commit: c28c34cf09acab475f1e0acfcbd145be160d50eb
      https://github.com/zanata/zanata-platform/commit/c28c34cf09acab475f1e0acfcbd145be160d50eb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

  Log Message:
  -----------
  fix(ZNTA-2605): fix contact admin on Google log in (#878)

  Commit: f433f4204ac8868cf58f1293459106fab6d10ac0
      https://github.com/zanata/zanata-platform/commit/f433f4204ac8868cf58f1293459106fab6d10ac0
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-87): notify failed translation saves in alpha editor (#877)

* feat(ZNTA-87): notify failed translation saves in alpha editor

* fix: update individual phrase details inProgressSave

* fix: check undefined translation (saving as untranslated), show error status

  Commit: 628765e06864973e17825408dc79b7dd10719fe0
      https://github.com/zanata/zanata-platform/commit/628765e06864973e17825408dc79b7dd10719fe0
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-war/src/main/webapp/editor/index.xhtml

  Log Message:
  -----------
  fix(ZNTA-821): alpha editor to use zanata language setting as lang attribute (#862)

* fix(ZNTA-821): alpha editor to use zanata language setting as html lang attribute

* fix: try catch unsupported locales for react-intl locale data

  Commit: c5b5d8018d969a43cfdfad1d40b6fa5c84355f23
      https://github.com/zanata/zanata-platform/commit/c5b5d8018d969a43cfdfad1d40b6fa5c84355f23
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: e8bef20abd78c22b7773cda9be35481fee99a2cd
      https://github.com/zanata/zanata-platform/commit/e8bef20abd78c22b7773cda9be35481fee99a2cd
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #860 from zanata/ZNTA-2589

fix(ZNTA-2589) consistency of nav icons

  Commit: 0435bf01d8aec13c2932f6f2a941d44b2f9e627c
      https://github.com/zanata/zanata-platform/commit/0435bf01d8aec13c2932f6f2a941d44b2f9e627c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

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

  Commit: 119c0da3545e4bc05b44f7bb06d84401da7b9e0d
      https://github.com/zanata/zanata-platform/commit/119c0da3545e4bc05b44f7bb06d84401da7b9e0d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #895 from zanata/ZNTA-2607-release

fix(ZNTA-2607) TMX modal styling

  Commit: a5ab1431c92f5d46398dfd6d54dbdd67e241f581
      https://github.com/zanata/zanata-platform/commit/a5ab1431c92f5d46398dfd6d54dbdd67e241f581
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

  Commit: 5c0299468c93dd5b5f62017482b811145557eabf
      https://github.com/zanata/zanata-platform/commit/5c0299468c93dd5b5f62017482b811145557eabf
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js

  Log Message:
  -----------
  fix: callstack error

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

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

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

  Commit: 7003ea99e4915070427273c7bb06fed7a7b55ede
      https://github.com/zanata/zanata-platform/commit/7003ea99e4915070427273c7bb06fed7a7b55ede
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix: resolve merge conflicts, minor changes to TMX modal styling

  Commit: 3dfa7ffd1ba8208553e9dcb81d0227b7555b5be1
      https://github.com/zanata/zanata-platform/commit/3dfa7ffd1ba8208553e9dcb81d0227b7555b5be1
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #898 from zanata/release-to-master-0618

fix release-to-master conflicts

  Commit: adbb537c564027b31fb69316513bc53f5ce4c637
      https://github.com/zanata/zanata-platform/commit/adbb537c564027b31fb69316513bc53f5ce4c637
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix: project url in glossary page (#901)

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

  Commit: f60374455aa308be589348199154196254a850e0
      https://github.com/zanata/zanata-platform/commit/f60374455aa308be589348199154196254a850e0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

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

  Commit: d83619b39231843041ca514c731b0ea23b09565a
      https://github.com/zanata/zanata-platform/commit/d83619b39231843041ca514c731b0ea23b09565a
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) fix draggable pagel z-index

  Commit: dd15002b21db7be32bd9fd2d1a0112dc3289cbc3
      https://github.com/zanata/zanata-platform/commit/dd15002b21db7be32bd9fd2d1a0112dc3289cbc3
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java

  Log Message:
  -----------
  fix: AddLanguageTest selenium id for notifications (#896)

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

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) fix padding of draggable panel content in TmMergeModal

  Commit: 5bde7f6fd8186d70f98e0fb492ecaca84a967758
      https://github.com/zanata/zanata-platform/commit/5bde7f6fd8186d70f98e0fb492ecaca84a967758
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js

  Log Message:
  -----------
  refactor(ZNTA-2514) update draggablepanels test

  Commit: 5d8c811f4eb72215e10008949d1cefb8da3140fe
      https://github.com/zanata/zanata-platform/commit/5d8c811f4eb72215e10008949d1cefb8da3140fe
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

  Log Message:
  -----------
  refactor(ZNTA-2514) fix merge conflicts

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

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

  Log Message:
  -----------
  fix: small styling improvements to frontend

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

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

  Log Message:
  -----------
  fix: small styling improvements to frontend

  Commit: 4899be912eba3a93eb65c9151e8a67c42f62c44f
      https://github.com/zanata/zanata-platform/commit/4899be912eba3a93eb65c9151e8a67c42f62c44f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2626): hide translation-comment search (can't show/edit) (#899)

  Commit: 94897146080c175bc48f170e75569a29e3cbcf4a
      https://github.com/zanata/zanata-platform/commit/94897146080c175bc48f170e75569a29e3cbcf4a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release'

  Commit: d35aedd5ca8446911848d4b4fd6cc3272e0a247a
      https://github.com/zanata/zanata-platform/commit/d35aedd5ca8446911848d4b4fd6cc3272e0a247a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix: loader text in button (#905)

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

  Commit: 66aa56007220be1b29e5e933d6b2a7fa67c02e2f
      https://github.com/zanata/zanata-platform/commit/66aa56007220be1b29e5e933d6b2a7fa67c02e2f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/pom.xml

  Log Message:
  -----------
  Update to Kotlin 1.2.50; enable -Xprogressive (#907)

  Commit: cba730cb846e5222fba2d4fafe5834680558c25f
      https://github.com/zanata/zanata-platform/commit/cba730cb846e5222fba2d4fafe5834680558c25f
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs

  Commit: 14e7b05a5bb81a06dca5450b28f860c27732ec77
      https://github.com/zanata/zanata-platform/commit/14e7b05a5bb81a06dca5450b28f860c27732ec77
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

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

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs

  Commit: c6aa4e961ff61b7986245fb5458f9416361387ef
      https://github.com/zanata/zanata-platform/commit/c6aa4e961ff61b7986245fb5458f9416361387ef
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs

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

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

  Log Message:
  -----------
  fix: input focus for explore page search

  Commit: ee3103729d625c9aed3be592b03fc656e9177e80
      https://github.com/zanata/zanata-platform/commit/ee3103729d625c9aed3be592b03fc656e9177e80
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  fix: input border color for glossary header

  Commit: 659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
      https://github.com/zanata/zanata-platform/commit/659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-2300): editor concurrent save resolution

  Commit: 8e8e287a7a6d513580e4ac4f6351c46ce755624d
      https://github.com/zanata/zanata-platform/commit/8e8e287a7a6d513580e4ac4f6351c46ce755624d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/pom.xml
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357
      https://github.com/zanata/zanata-platform/commit/9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #908 from zanata/rel-ft-fix

fix: small ui changes

  Commit: b66249f80d276cd9150ae082233baf5d0ac743f8
      https://github.com/zanata/zanata-platform/commit/b66249f80d276cd9150ae082233baf5d0ac743f8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge commit '9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357' into HEAD

  Commit: 1e1de54acde6cb1f8ea3a8b3cc6cf572151792a5
      https://github.com/zanata/zanata-platform/commit/1e1de54acde6cb1f8ea3a8b3cc6cf572151792a5
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js

  Log Message:
  -----------
  fix(ZNTA-2514) remove unused LoaderText compont from glossary entry

  Commit: d674e1c8185087588c29cb5dcc4bbafcdb68a2f4
      https://github.com/zanata/zanata-platform/commit/d674e1c8185087588c29cb5dcc4bbafcdb68a2f4
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/pom.xml
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534

  Commit: aad83cbc31197562d938485edb5ceb96cb91a980
      https://github.com/zanata/zanata-platform/commit/aad83cbc31197562d938485edb5ceb96cb91a980
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java

  Log Message:
  -----------
  fix(test): Update e2e assert descriptions (#903)

* fix(test): Update e2e assert descriptions
* fix(test): Add isTrue after as
* fix(test): move .contains to after .as
* fix(test): fix assertion on people page
* Add .isTrue() to assertThat(boolean);
* Add .isTrue() to assertThat(boolean).as(descr);
* Add assertions to assertThat(actual);
* Filter blank entries from upload errors

  Commit: 25f42e588d340fb881c443eeca5e96fe632c7f7f
      https://github.com/zanata/zanata-platform/commit/25f42e588d340fb881c443eeca5e96fe632c7f7f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js

  Log Message:
  -----------
  Fix console logger for EAP tests (#910)

  Commit: 72e511afaf5579c9611c0604713082f36bb2c0e2
      https://github.com/zanata/zanata-platform/commit/72e511afaf5579c9611c0604713082f36bb2c0e2
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: e35cb8ed7227c94d898151677a41591b56a21a34
      https://github.com/zanata/zanata-platform/commit/e35cb8ed7227c94d898151677a41591b56a21a34
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: create redux action for save conflict

  Commit: bc4bf1c9eadb76303182d803a6cef1b6bcf778bf
      https://github.com/zanata/zanata-platform/commit/bc4bf1c9eadb76303182d803a6cef1b6bcf778bf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release'

  Commit: 5d6a180cba603af8539acc2c7bb5cf366907200f
      https://github.com/zanata/zanata-platform/commit/5d6a180cba603af8539acc2c7bb5cf366907200f
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) remove card component from editor glossary term modal

  Commit: db96f3330532aba96a46d8c01f1eb6cd22de300b
      https://github.com/zanata/zanata-platform/commit/db96f3330532aba96a46d8c01f1eb6cd22de300b
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.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/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.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/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

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

  Commit: 187872a78b14fb57c24b496be2b908aa4c880b25
      https://github.com/zanata/zanata-platform/commit/187872a78b14fb57c24b496be2b908aa4c880b25
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) fix merge conflicts in tm merge modal

  Commit: 755dc6a84e1139e97b5268398af2f803311a0e5d
      https://github.com/zanata/zanata-platform/commit/755dc6a84e1139e97b5268398af2f803311a0e5d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  fix: remove '0' notification label in gwt editor (#902)

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

  Commit: dfb9c83b89464fc0e7d91f2c7818341297ab3a9a
      https://github.com/zanata/zanata-platform/commit/dfb9c83b89464fc0e7d91f2c7818341297ab3a9a
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js

  Log Message:
  -----------
  fix(ZNTA-2606): validate duplicate glossary entries (#904)

* fix: server glossary entry service to return warnings, display ant notifications

* fix: consider undefined descriptions as similar

* Revert "fix: consider undefined descriptions as similar"

This reverts commit 1865d793128c059333415d37962827bce277b2b2.

* fix: functional tests, check warnings after response

  Commit: 6bfd9a968427224cda92e5fbcefdcda165881cd9
      https://github.com/zanata/zanata-platform/commit/6bfd9a968427224cda92e5fbcefdcda165881cd9
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  fix: projectSearchTermChanged function

  Commit: cab747a885768fac8780e96e85282121460c08aa
      https://github.com/zanata/zanata-platform/commit/cab747a885768fac8780e96e85282121460c08aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  fix: use link component in admin home (#914)

  Commit: 38ac68996c9a610139a8b6aff38ffd8b65a63a5f
      https://github.com/zanata/zanata-platform/commit/38ac68996c9a610139a8b6aff38ffd8b65a63a5f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  refactor: remove unnecessary flushProjectSearch function (handled by ant search)

  Commit: 5d48ef28eaea22803a75d7a5881686316a5d7b74
      https://github.com/zanata/zanata-platform/commit/5d48ef28eaea22803a75d7a5881686316a5d7b74
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js

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

  Commit: 002d46d70cea23facfe8f6e7d21ca2b1a9914a43
      https://github.com/zanata/zanata-platform/commit/002d46d70cea23facfe8f6e7d21ca2b1a9914a43
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/utils/FeatureToggles.ts
    A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
    A server/zanata-frontend/src/app/validators/ValidationMessages.ts
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
    A server/zanata-frontend/src/app/validators/index.ts
    A server/zanata-frontend/src/app/validators/messages/en.json
    A server/zanata-frontend/src/app/validators/messages/fr.json
    A server/zanata-frontend/src/app/validators/messages/index.ts
    A server/zanata-frontend/src/app/validators/messages/ja.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  feat(ZNTA-75): Add live validations to React Editor (#809)

* feat: convert AbstractValidationAction class and interfaces to TS

* fix: AbstractValidationAction implementation

* refactor: ValidationMessages to use react-intl style messages

* feat: implement HtmlXmlTagValidation

* feat: create webpack config for Validators package, index.ts entrypoint

* feat: implement XmlEntityValidation, unit test

* feat: implement HtmlXmlTagValidation, partial unit tests

* feat: convert newlineleadtrailvalidation, tabvalidation validators

* feat: implement PrintfVariablesValidation

* test: TabValidation with jest

* test: HtmlXmlTagValidation, XmlEntityValidation, TabValidation jest tests

* test: PrintfVariablesValidation

* test: NewlineLeadTrailValidation

* feat: wip PrintVariablesValidation and jest test

* feat: implement JavaVariablesValidation and jest test

* feat: use intl-messageformat parser for validation i18n, test produced messages

* feat: wip integrate validators with frontend component (tabvalidator)

* feat: implement, test intl messages for PrintfVariablesValidation, XMLEntityValidation

* feat: use i18n messages for all validators, test results

* feat: use validation factory to generate validators, generate messages for all selected validation opts
Update Storybook to show each validator result

* feat: Integrate Validators with TransUnitTranslationPanel

* test: TransUnitTranslationPanel with Validator component, update storyshots

* feat: enable and integrate editor validation option settings

* fix: HtmlXmlValidation orderValidation method, test all message results

* fix: PrintfXSIExtensionValidation positional test

* test: update EditorAlphaTest to only check editor page, wait for page silence

* feat: Use JSON for intl message files

* feat: use translated intl messages based on selected locale for validators

* feat: localize Validation frontend UI

* chore: upgrade typescript at 2.9.1, utilize native JSON imports

* fix: don't validate empty translations

* fix: only display errors/warnings titles if warnings/errors exist

* test: Validation frontend component markup with jest

* refactor: move intl messages to validators module, remove feature switch

* test: update test class constructors

* refactor: remove ValidationID enum, move validationFactory to validators module,
shallow merge (extend) translated messages to default missing translations to english

* fix: unnecessary abstract class

* refactor: assert enDefault messages as ValidationMessages

* refactor: AbstractValidationAction, reduce Validators super arguments

* refactor: make messages protected, update HtmlXmlTagValidation

* Swap constructor param order

  Commit: c577204a83e2dbf0ab982125365635c3304c9ead
      https://github.com/zanata/zanata-platform/commit/c577204a83e2dbf0ab982125365635c3304c9ead
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java

  Log Message:
  -----------
  Merge pull request #913 from zanata/merge-release-to-master

Merge release to master

  Commit: 4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
      https://github.com/zanata/zanata-platform/commit/4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js

  Log Message:
  -----------
  feat: convert ConcurrentModal to tsx, handle redux state for modal

  Commit: c9af7c3958923c2a827b6d6933837a30dd333356
      https://github.com/zanata/zanata-platform/commit/c9af7c3958923c2a827b6d6933837a30dd333356
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js

  Log Message:
  -----------
  Merge branch 'release' of github.com:zanata/zanata-platform

  Commit: 1c9ca8258df72ec3375bab5fe014271f9d3aa205
      https://github.com/zanata/zanata-platform/commit/1c9ca8258df72ec3375bab5fe014271f9d3aa205
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update editor snapshots

  Commit: 4470c67d7a78a5d9d994475932eafad5f76ce5cb
      https://github.com/zanata/zanata-platform/commit/4470c67d7a78a5d9d994475932eafad5f76ce5cb
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.5.0-rc-3

  Commit: 351a9163fc8a30e31a68f46b43b73170ddf51586
      https://github.com/zanata/zanata-platform/commit/351a9163fc8a30e31a68f46b43b73170ddf51586
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.5.0-rc-4-SNAPSHOT

  Commit: 64756d047e63a13deaf158e4fcfa01a188fab2ea
      https://github.com/zanata/zanata-platform/commit/64756d047e63a13deaf158e4fcfa01a188fab2ea
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

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

  Commit: 81e565ee5c92f00a0c8391e59617e5201bd259e0
      https://github.com/zanata/zanata-platform/commit/81e565ee5c92f00a0c8391e59617e5201bd259e0
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2514) fix functional tests, tag styling

  Commit: 47dc61cbf5b2792c74b6b4919b50b06c7ddd6a38
      https://github.com/zanata/zanata-platform/commit/47dc61cbf5b2792c74b6b4919b50b06c7ddd6a38
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #830 from zanata/ZNTA-2534

refactor(ZNTA-2534) editor components to antd

  Commit: a094e6e349f301328849aba9597246734d304683
      https://github.com/zanata/zanata-platform/commit/a094e6e349f301328849aba9597246734d304683
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/utils/FeatureToggles.ts
    A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
    A server/zanata-frontend/src/app/validators/ValidationMessages.ts
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
    A server/zanata-frontend/src/app/validators/index.ts
    A server/zanata-frontend/src/app/validators/messages/en.json
    A server/zanata-frontend/src/app/validators/messages/fr.json
    A server/zanata-frontend/src/app/validators/messages/index.ts
    A server/zanata-frontend/src/app/validators/messages/ja.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514

  Commit: 7c831048c9fbf1c869a351d75468e13d3b1373b4
      https://github.com/zanata/zanata-platform/commit/7c831048c9fbf1c869a351d75468e13d3b1373b4
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M server/pom.xml
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/FeatureToggles.ts
    A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
    A server/zanata-frontend/src/app/validators/ValidationMessages.ts
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
    A server/zanata-frontend/src/app/validators/index.ts
    A server/zanata-frontend/src/app/validators/messages/en.json
    A server/zanata-frontend/src/app/validators/messages/fr.json
    A server/zanata-frontend/src/app/validators/messages/index.ts
    A server/zanata-frontend/src/app/validators/messages/ja.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: 68469343b4f2c5a4597da7515014e30c56f0486d
      https://github.com/zanata/zanata-platform/commit/68469343b4f2c5a4597da7515014e30c56f0486d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #807 from zanata/ZNTA-2514

refactor(ZNTA-2514): react-bootstrap containers to antd

  Commit: 41b905f04196b4a8b378919edafef9073cce86bb
      https://github.com/zanata/zanata-platform/commit/41b905f04196b4a8b378919edafef9073cce86bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java

  Log Message:
  -----------
  refactor(ZNTA-2622): use param objs for file adapters (#900)

  Commit: d0a64fa87eb5d473240629da59db25df35cf5d73
      https://github.com/zanata/zanata-platform/commit/d0a64fa87eb5d473240629da59db25df35cf5d73
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  antd css fixes: minor ui fixes for consistency across frontend

  Commit: e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
      https://github.com/zanata/zanata-platform/commit/e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: implement save original translation selection from conflict modal

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

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

  Log Message:
  -----------
  fix: add antd import to root css in editor

  Commit: 8d221faf27d040143d2cf30f262e0c06807dbf1b
      https://github.com/zanata/zanata-platform/commit/8d221faf27d040143d2cf30f262e0c06807dbf1b
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  WIP: antd select for glossary languages

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js

  Log Message:
  -----------
  feat(ZNTA-2504) WIP: storybook for MTMerge modal

  Commit: 92eef5b1ab1d55e8ae9d174ffc3fce302c6defe2
      https://github.com/zanata/zanata-platform/commit/92eef5b1ab1d55e8ae9d174ffc3fce302c6defe2
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2504) Download user information button added to profile

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  feat(ZNTA-2504) revert changes added from a different PR

  Commit: 7800ce10e1913c6f00d5e9fdff7dc3e0fed94295
      https://github.com/zanata/zanata-platform/commit/7800ce10e1913c6f00d5e9fdff7dc3e0fed94295
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

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

  Log Message:
  -----------
  Merge pull request #917 from zanata/editor-tab-fix

fix: add antd import to root css in editor

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

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

  Log Message:
  -----------
  feat(ZNTA-2504) WIP: MT Batch Merge modal

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  feat(ZNTA-2504) add components to mt batch merge modal, styling of most of modal

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

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  feat(ZNTA-2504) styling for MT batch merge modal

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less

  Log Message:
  -----------
  feat(ZNTA-2504 correct css import locations for storybook,important statements added to buttons to ensure styling is not overridden by antd defaults (variables not available for these specific styles)

  Commit: 796c150d22cf5826c859eb4eb99a0480f6299182
      https://github.com/zanata/zanata-platform/commit/796c150d22cf5826c859eb4eb99a0480f6299182
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  feat(ZNTA-2504) update frontend snapshot test

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  feat(ZNTA-2504) add fuzzy/translated switch to MT batch merge modal

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

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

  Log Message:
  -----------
  feat(ZNTA-2075) first commit: files created for editor search and replace

  Commit: 527ec1d5480d324ef05e5cd3ca6eefa4793ef2ad
      https://github.com/zanata/zanata-platform/commit/527ec1d5480d324ef05e5cd3ca6eefa4793ef2ad
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less

  Log Message:
  -----------
  Merge pull request #919 from zanata/ZNTA-2504

ZNTA-2504: MTMerge modal story

  Commit: dd1ab2ef97694a67966dd680609e4d0f9d48ff84
      https://github.com/zanata/zanata-platform/commit/dd1ab2ef97694a67966dd680609e4d0f9d48ff84
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less

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

  Commit: 821a436d61b297ad89e183b40f8416e6bae0807b
      https://github.com/zanata/zanata-platform/commit/821a436d61b297ad89e183b40f8416e6bae0807b
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/app.css
    A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
    A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
    R server/zanata-frontend/src/app/editor/components/SearchReplace/searchreplace.story.js
    M server/zanata-frontend/src/app/editor/components/components.story.js

  Log Message:
  -----------
  feat(ZNTA-2075) add stylesheet and button for search and replace modal

  Commit: b94a821eee0ccb5a45fe700cd7b05f55547bae8a
      https://github.com/zanata/zanata-platform/commit/b94a821eee0ccb5a45fe700cd7b05f55547bae8a
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) add stylesheet and button for search and replace modal

  Commit: d4d8a498af0bc46ea703700ba07bb98d231abd7c
      https://github.com/zanata/zanata-platform/commit/d4d8a498af0bc46ea703700ba07bb98d231abd7c
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  feat(ZNTA-2544): add 'Export user data' button

  Commit: 6613df9679f85cca436f6193a494cab4972598ed
      https://github.com/zanata/zanata-platform/commit/6613df9679f85cca436f6193a494cab4972598ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

  Log Message:
  -----------
  Add GraphQL

  Commit: 87789a08ddddbce24979739da99a988889f3d919
      https://github.com/zanata/zanata-platform/commit/87789a08ddddbce24979739da99a988889f3d919
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: handle save as latest or original

  Commit: a9b728a24a22d4f0db698433504036b6de504ff8
      https://github.com/zanata/zanata-platform/commit/a9b728a24a22d4f0db698433504036b6de504ff8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts

  Log Message:
  -----------
  fix(ZNTA-2483): Fix context in TS file write (#922)

  Commit: 50309f08ca31f1d33f8167eee9a3c772459d5c1b
      https://github.com/zanata/zanata-platform/commit/50309f08ca31f1d33f8167eee9a3c772459d5c1b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Update docs/release-notes.md for version 4.5.0

  Commit: 2f7f1941c545af2283418731476f1a3ac79e9ca6
      https://github.com/zanata/zanata-platform/commit/2f7f1941c545af2283418731476f1a3ac79e9ca6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.5.0

  Commit: 86a6cade8bc43aba75c7d6fea7b25d63181f56ee
      https://github.com/zanata/zanata-platform/commit/86a6cade8bc43aba75c7d6fea7b25d63181f56ee
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.5.1-SNAPSHOT

  Commit: f6978427b28d366a658e9a735707fc94658ee248
      https://github.com/zanata/zanata-platform/commit/f6978427b28d366a658e9a735707fc94658ee248
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts

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

  Commit: b76836c6741dbd5762138210b5bc08e7e2e0c42c
      https://github.com/zanata/zanata-platform/commit/b76836c6741dbd5762138210b5bc08e7e2e0c42c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Update ASM to fix upper bound dependencies error

Configure enforceBytecodeVersion to ignore module-info.class
Update animal-sniffer to support module-info.class
Update duplicate-finder to support module-info.class

  Commit: c6f2cfc078fd4b9b02f46bf929cd34d5a89321b6
      https://github.com/zanata/zanata-platform/commit/c6f2cfc078fd4b9b02f46bf929cd34d5a89321b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    R server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/util/json.kt
    R server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Complete initial version of ExportRestService

Add HPerson.projectLocaleMemberships
Eliminate some cases of GraphQLIgnore
Override GraphQL type names for "H" entities
Add scalar type defs for LocaleId and ContentType
Rename GraphQLRestService to ExportRestService
Convert to Kotlin
Split up tests for ExportRestService and GraphQLService
Replace DBUnit in test with bespoke entities
Extract GraphQL 'data' for ExportRestService response
Return data as JSON
Change REST path for exporting user data
Ensure CDI proxy constructor is non-private
Avoid non-compliant package name *.graphQL

  Commit: 90f293a373d39c5ec11c6e9046ace88c616b5749
      https://github.com/zanata/zanata-platform/commit/90f293a373d39c5ec11c6e9046ace88c616b5749
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java

  Log Message:
  -----------
  Eliminate Guava Beta API usage

  Commit: 9b28be1e92cb69f17c93009584aae88f4d3adb00
      https://github.com/zanata/zanata-platform/commit/9b28be1e92cb69f17c93009584aae88f4d3adb00
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java

  Log Message:
  -----------
  Fix badly merged test

  Commit: 87ce1510d1a3c23fc067bf8bef022f69f9bd6a44
      https://github.com/zanata/zanata-platform/commit/87ce1510d1a3c23fc067bf8bef022f69f9bd6a44
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java

  Log Message:
  -----------
  Clean up static analysis warnings

  Commit: 680bac412a87c33f123ffc4e4e71e00be0c2dced
      https://github.com/zanata/zanata-platform/commit/680bac412a87c33f123ffc4e4e71e00be0c2dced
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) WIP: add components to editor search and replace

  Commit: 7a1166c161b9feb4f20215b0becf4f1a98667503
      https://github.com/zanata/zanata-platform/commit/7a1166c161b9feb4f20215b0becf4f1a98667503
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) complete adding components for search and replace, half of modal stylign

  Commit: 58f1b64e75d2aee72f901b54ef11c9327ebca3fa
      https://github.com/zanata/zanata-platform/commit/58f1b64e75d2aee72f901b54ef11c9327ebca3fa
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css

  Log Message:
  -----------
  feat(ZNTA-2075) checkbox styling

  Commit: 0bb563aa00909ef12190b475c29e109a307c3ff2
      https://github.com/zanata/zanata-platform/commit/0bb563aa00909ef12190b475c29e109a307c3ff2
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css

  Log Message:
  -----------
  feat(ZNTA-2075) checkbox styling

  Commit: a5dda6805a8cb48613d723b6f12d95b5458f7542
      https://github.com/zanata/zanata-platform/commit/a5dda6805a8cb48613d723b6f12d95b5458f7542
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css

  Log Message:
  -----------
  feat(ZNTA-2075) checkbox styling

  Commit: e94c780192b4f267997c9bd0b9227ae8c68584ed
      https://github.com/zanata/zanata-platform/commit/e94c780192b4f267997c9bd0b9227ae8c68584ed
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css

  Log Message:
  -----------
  feat(ZNTA-2075) search adn replace ui  styling

  Commit: ef30f354607089ef90624dd9a3ab05ae2ed66f4f
      https://github.com/zanata/zanata-platform/commit/ef30f354607089ef90624dd9a3ab05ae2ed66f4f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  feat: include latest username, modified date in conflict response
display in conflict modal UI

  Commit: 0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
      https://github.com/zanata/zanata-platform/commit/0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  refactor: extract conflictData interface

  Commit: 124926fd9fed6d2492a3890161f3b967c4999685
      https://github.com/zanata/zanata-platform/commit/124926fd9fed6d2492a3890161f3b967c4999685
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  fix: tslint error

  Commit: 16820c2c21748cb80f80769a28707686ca4141fc
      https://github.com/zanata/zanata-platform/commit/16820c2c21748cb80f80769a28707686ca4141fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.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/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.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/search/FilterConstraintToQueryJpaTest.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/GetTransUnitListHandlerTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  refactor: eliminate some Guava (#921)

* Eliminate some Guava from tests
* Simplify using lambdas
* Allow empty lambdas in Checkstyle
* Comment out allowEmptyCatches
* Refactor collection code
* Refactor ProjectHomeAction

  Commit: e33f25eba17ce2536ea72023c5df63eb3dabfef5
      https://github.com/zanata/zanata-platform/commit/e33f25eba17ce2536ea72023c5df63eb3dabfef5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M docs/release-notes.md
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.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/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.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/search/FilterConstraintToQueryJpaTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2544

  Commit: 6f731166c73162a136bc7f941051ab68ce852510
      https://github.com/zanata/zanata-platform/commit/6f731166c73162a136bc7f941051ab68ce852510
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java

  Log Message:
  -----------
  Add MACHINE_TRANS to AUTOMATED_ENTRIES (#915)

  Commit: f4da8ce4ed1062caece059f5c64cb9090a4dde93
      https://github.com/zanata/zanata-platform/commit/f4da8ce4ed1062caece059f5c64cb9090a4dde93
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java

  Log Message:
  -----------
  Move PersonProjectMemberships to org.zanata.service

  Commit: 9897499eb71993452d765a085c4e882c6b3d85ca
      https://github.com/zanata/zanata-platform/commit/9897499eb71993452d765a085c4e882c6b3d85ca
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  refactor: use date type on server, convert in frontend

  Commit: 1bd511244d55da5166112265c3af595afd12327b
      https://github.com/zanata/zanata-platform/commit/1bd511244d55da5166112265c3af595afd12327b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts

  Log Message:
  -----------
  Fix some TypeScript errors

  Commit: a4bb9d2c7b24cb56c710dba4437c7f5fd88521b7
      https://github.com/zanata/zanata-platform/commit/a4bb9d2c7b24cb56c710dba4437c7f5fd88521b7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Re-enable TypeScript type checking

  Commit: 2a03023756c921dfef47bcf54d79139f8ba86a6f
      https://github.com/zanata/zanata-platform/commit/2a03023756c921dfef47bcf54d79139f8ba86a6f
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2638) remove borders from antd buttons using btn-link styling

  Commit: 6c8c6fa5abb835ea92a08618f74d094bfabddd82
      https://github.com/zanata/zanata-platform/commit/6c8c6fa5abb835ea92a08618f74d094bfabddd82
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) styling changes to editor search and replace styling

  Commit: eda3bb2f88d2552b9570cdf12ab590461a3ef258
      https://github.com/zanata/zanata-platform/commit/eda3bb2f88d2552b9570cdf12ab590461a3ef258
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts

  Log Message:
  -----------
  Fix TypeScript compiler errors

  Commit: 9742788a5fd8d1d7bf811eabf78448892b82ae44
      https://github.com/zanata/zanata-platform/commit/9742788a5fd8d1d7bf811eabf78448892b82ae44
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2544) remove duplicate button from dashboard settings

  Commit: f376a5991a58713f1922bd0c57be354e8622a72c
      https://github.com/zanata/zanata-platform/commit/f376a5991a58713f1922bd0c57be354e8622a72c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java

  Log Message:
  -----------
  Remove unused import

  Commit: 91c1a6ff6beceab147739417e3c73a2ca9c98b9a
      https://github.com/zanata/zanata-platform/commit/91c1a6ff6beceab147739417e3c73a2ca9c98b9a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge pull request #920 from zanata/ZNTA-2544

feat(ZNTA-2544): Download user information button added to profile

  Commit: 8085822c2a949835daaec1061ff905855d4afe3b
      https://github.com/zanata/zanata-platform/commit/8085822c2a949835daaec1061ff905855d4afe3b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Tweak tslint settings

  Commit: a3bb48de5d3dcff6dd2b83423ebe393aef5fbfa4
      https://github.com/zanata/zanata-platform/commit/a3bb48de5d3dcff6dd2b83423ebe393aef5fbfa4
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2638

  Commit: 5626fc36b1868bc8fbfd527c3628c6fb20bd54e4
      https://github.com/zanata/zanata-platform/commit/5626fc36b1868bc8fbfd527c3628c6fb20bd54e4
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.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/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.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/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' into frontend-ui-fixes

  Commit: 224ebd78a1da91545f6f08e640ab103ba1ab89e1
      https://github.com/zanata/zanata-platform/commit/224ebd78a1da91545f6f08e640ab103ba1ab89e1
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix(ZMTA-2279) revert antd select refactor, update icons to antd

  Commit: 5745a5224b8f92455da257eab467911733cd550c
      https://github.com/zanata/zanata-platform/commit/5745a5224b8f92455da257eab467911733cd550c
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #930 from zanata/ZNTA-2638

fix(ZNTA-2638) remove borders from antd buttons using btn-link styling

  Commit: 51b7e79f1d7e75a3aadc84c6e5331a07928177c8
      https://github.com/zanata/zanata-platform/commit/51b7e79f1d7e75a3aadc84c6e5331a07928177c8
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into frontend-ui-fixes

  Commit: 030765331d616d33d3b5e3e9bf9992627d774770
      https://github.com/zanata/zanata-platform/commit/030765331d616d33d3b5e3e9bf9992627d774770
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #916 from zanata/frontend-ui-fixes

antd css fixes: minor ui fixes for consistency across frontend

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  fix(ZNTA-2279) fix position of glossary languageSelect icon and count

  Commit: 683b064220347b7e8ca1a65d422f0f70969aea07
      https://github.com/zanata/zanata-platform/commit/683b064220347b7e8ca1a65d422f0f70969aea07
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Merge pull request #929 from zanata/fix-typescript-settings

Fix TypeScript settings

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  fix(ZNTA-2279) alignment of languageSelect icon and count with select

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

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove react-bootstrap css from frontend components

  Commit: 6639cf9fafc1c1b289c5bcffc317248bb4a00617
      https://github.com/zanata/zanata-platform/commit/6639cf9fafc1c1b289c5bcffc317248bb4a00617
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove unused css (WIP)

  Commit: 92decc569d9313c07ae15b9d657bc964342ffb7f
      https://github.com/zanata/zanata-platform/commit/92decc569d9313c07ae15b9d657bc964342ffb7f
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: frontend pages, remove react-bootstrap

  Commit: 5313f278e353c03649eaa4a8caa0fc8d1cda1df6
      https://github.com/zanata/zanata-platform/commit/5313f278e353c03649eaa4a8caa0fc8d1cda1df6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

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

  Log Message:
  -----------
  fix: nav link (#934)

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

  Commit: f04c6ba930255012d1cfd13d56b7fb00aed737b6
      https://github.com/zanata/zanata-platform/commit/f04c6ba930255012d1cfd13d56b7fb00aed737b6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

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

  Log Message:
  -----------
  Merge commit '5313f278e353c03649eaa4a8caa0fc8d1cda1df6' into HEAD

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove react-bootstrap styling from frontend containers (WIP)

  Commit: 84e5597356bb95351a4fbf1fc56604f5f54d132c
      https://github.com/zanata/zanata-platform/commit/84e5597356bb95351a4fbf1fc56604f5f54d132c
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) remove unused props from SearchReplace component

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  feat(ZNTA-2075) update editor snapshot

  Commit: d547a37fbf383ff7033138d07cc1c7e00c6b6380
      https://github.com/zanata/zanata-platform/commit/d547a37fbf383ff7033138d07cc1c7e00c6b6380
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Enable TypeScript's strict option, ts-ignore old violations (#938)

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

  Changed paths:
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove unused css from style.less, refactor EditableText component and WIP: glossary container

  Commit: 3452b3c2ae7c45ec8ed614584e191aa83e981c48
      https://github.com/zanata/zanata-platform/commit/3452b3c2ae7c45ec8ed614584e191aa83e981c48
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

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

  Commit: 14107a8346105b593cada9ba73ce9a117cee5bb4
      https://github.com/zanata/zanata-platform/commit/14107a8346105b593cada9ba73ce9a117cee5bb4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  chore: fix Jest configuration for TypeScript (#940)

Upgrade Jest
Convert jest.config.json to jest.config.js
Remove unnecessary quotes from jest.config.js
Add JSDoc types to jest.config.js
Change Jest's testRegex to include TypeScript tests
Fix broken test: Pager.test.jsx

  Commit: 7a48f9c1f7bc95af606659052747af99d8e4d4c0
      https://github.com/zanata/zanata-platform/commit/7a48f9c1f7bc95af606659052747af99d8e4d4c0
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.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/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.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/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
      https://github.com/zanata/zanata-platform/commit/f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

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

  Log Message:
  -----------
  fix: typescript strict checks

  Commit: bc03058f42acb3324c7c3bdc71a65787c6ddaeaa
      https://github.com/zanata/zanata-platform/commit/bc03058f42acb3324c7c3bdc71a65787c6ddaeaa
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    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

  Log Message:
  -----------
  fix(test): upgrade account tests to Kotlin and fix (#931)

* fix(test): upgrade account tests to Kotlin and fix
Includes the Experiment and TransMemory lone tests.
* fix(test): fix indent

  Commit: 9a32abaf3cfb0ae36d08a01805ebd27a88c5b63d
      https://github.com/zanata/zanata-platform/commit/9a32abaf3cfb0ae36d08a01805ebd27a88c5b63d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt

  Log Message:
  -----------
  fix(test): convert dashboard tests to Kotlin (#936)

* fix(test): convert dashboard tests to Kotlin
* fix(test): remove backticks and throws, use lateinit

  Commit: 2e1f36e99d51ff04938fa60a437d0c56a308b314
      https://github.com/zanata/zanata-platform/commit/2e1f36e99d51ff04938fa60a437d0c56a308b314
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  Merge pull request #918 from zanata/ZNTA-2279

refactor(ZNTA-2279): antd icons and select styling for glossary

  Commit: 57b0c6e5a848e7c9363ed10104a7f4fb6f633159
      https://github.com/zanata/zanata-platform/commit/57b0c6e5a848e7c9363ed10104a7f4fb6f633159
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock
    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

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

  Commit: d62c1721203b473b92f253fe91afc1c63976b4d0
      https://github.com/zanata/zanata-platform/commit/d62c1721203b473b92f253fe91afc1c63976b4d0
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  fix: java findbugs - exposing internal representation of Date

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove react-bootstrap from frontend

  Commit: 7894538f31aaa6687df0c2d28d4cd37873b77dc4
      https://github.com/zanata/zanata-platform/commit/7894538f31aaa6687df0c2d28d4cd37873b77dc4
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2529) remove bstrapReact wrapper from frontend

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

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

  Log Message:
  -----------
  refactor(ZNTA-2529) react-bootstrap nav to antd less file

  Commit: 1db8b85668e0386654457f9d7923e29a1eb3bf56
      https://github.com/zanata/zanata-platform/commit/1db8b85668e0386654457f9d7923e29a1eb3bf56
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2529) update frontend snapshot tests

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

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing test in frontend - DraggableVersionPanels

  Commit: b8bd62a02d9d7ca42340655a446b3294283da667
      https://github.com/zanata/zanata-platform/commit/b8bd62a02d9d7ca42340655a446b3294283da667
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java

  Log Message:
  -----------
  fix: functional test (#942)

  Commit: 0acef8f4d93a2435415fcade553b414aa11a4261
      https://github.com/zanata/zanata-platform/commit/0acef8f4d93a2435415fcade553b414aa11a4261
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) add spacing variables to ant-theme-vars.less

  Commit: 3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
      https://github.com/zanata/zanata-platform/commit/3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  fix: use latest versionNum when resolving with original

  Commit: 988161a9561460a1d2c4b7b004c60e8219fab471
      https://github.com/zanata/zanata-platform/commit/988161a9561460a1d2c4b7b004c60e8219fab471
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js

  Log Message:
  -----------
  fix: save as latest action params

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  chore(ZNTA-2610): upgrade react to 16.4.0 (#882)

* chore(ZNTA-2610): upgrade react to 16.4.0, upgrade affected dependancies

* fix: resolve new react warnings

* fix: use storybook-addon-intl to provide intl decorator

* fix: remove use of storybook-addon-actions

* fix: disable GlossaryTermModal storyshot

* fix: Glossary EntryModal replace incompatible component

* fix: include Validation.story.js merge conflict resolution

* chore: update snapshots

* fix: typescript strict checks

* chore: upgrade enzyme, refactor tests

  Commit: a10977c50847bb43ca92ef5c0a24f180f0e569fa
      https://github.com/zanata/zanata-platform/commit/a10977c50847bb43ca92ef5c0a24f180f0e569fa
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock
    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

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: 86e5691a6564e340c3458beef84dc87411dffab9
      https://github.com/zanata/zanata-platform/commit/86e5691a6564e340c3458beef84dc87411dffab9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  refactor: ConcurrentModal to stateless component

  Commit: 7d4ded8e9a7e630b33382e3b85123f2bdf6aab62
      https://github.com/zanata/zanata-platform/commit/7d4ded8e9a7e630b33382e3b85123f2bdf6aab62
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove all bootstrap css from explore container

  Commit: 7912fe617e47d69de54efac6068da7678e32009c
      https://github.com/zanata/zanata-platform/commit/7912fe617e47d69de54efac6068da7678e32009c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2529) fix merge conflicts

  Commit: 36f26444a91ac3ff10dd1ea32fe08fa27def59f3
      https://github.com/zanata/zanata-platform/commit/36f26444a91ac3ff10dd1ea32fe08fa27def59f3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) fix merge conflicts

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix ui bugs on explpore page after removing bstrapReact wraper

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to project version modals, WIP: media queries

  Commit: 64b6a2cf3a9546198bf94f2a2d9cb52276ef13eb
      https://github.com/zanata/zanata-platform/commit/64b6a2cf3a9546198bf94f2a2d9cb52276ef13eb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) media queries for react pages and dashboard, WIP: profile fixes

  Commit: 74a1659510c2cb1ac196e52a9955cecf01f2d2a6
      https://github.com/zanata/zanata-platform/commit/74a1659510c2cb1ac196e52a9955cecf01f2d2a6
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) antd variables modified, user profile fixes WIP

  Commit: 80f4ccb8a9a1cb6495de7f7b403f13cd595e1d79
      https://github.com/zanata/zanata-platform/commit/80f4ccb8a9a1cb6495de7f7b403f13cd595e1d79
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  refactor(ZNTA-2529) activity filter buttons on profile styled

  Commit: 3c37fabc13648d2cc26651e3e55cdcdb6ec8b45e
      https://github.com/zanata/zanata-platform/commit/3c37fabc13648d2cc26651e3e55cdcdb6ec8b45e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) refactor utility classes used in user profile, fix alignment of activity details word count

  Commit: 606f8fa464ac83ed0348e59bab4e7867172e709a
      https://github.com/zanata/zanata-platform/commit/606f8fa464ac83ed0348e59bab4e7867172e709a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529( misc ui fixes to user profile page and TM Merge modal

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx

  Log Message:
  -----------
  refactor(ZNTA-2529) fix alignment of word count in activity panel of user profile, fix height of glossary header and search input

  Commit: 373dba5b4e4631e248be9d7757fa29a2185caeb5
      https://github.com/zanata/zanata-platform/commit/373dba5b4e4631e248be9d7757fa29a2185caeb5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt

  Log Message:
  -----------
  fix(test): convert concurrentedit tests to Kotlin (#935)

* fix(test): convert concurrentedit tests to Kotlin
* fix(test): remove exception throws, use lateinit
* fix(test): simplify the status code collection

  Commit: 2bbf831f34b0dc2b68af7213454c127b29975c7a
      https://github.com/zanata/zanata-platform/commit/2bbf831f34b0dc2b68af7213454c127b29975c7a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) bug fixes to glossary ui

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

  Changed paths:
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to languages page and frontend LoaderText component

  Commit: 51e4cbf8ea19dec5abe453c30a4250d6c7083c17
      https://github.com/zanata/zanata-platform/commit/51e4cbf8ea19dec5abe453c30a4250d6c7083c17
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) responsive layout of languages page

  Commit: 0b9c0d1c7cb908f75a1a7ceb821eee5528a15cd1
      https://github.com/zanata/zanata-platform/commit/0b9c0d1c7cb908f75a1a7ceb821eee5528a15cd1
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js

  Log Message:
  -----------
  refactor(ZNTA-2529) set tooltip popup triggers to click

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) align tooltip for delete all glossary entries, styling to admin homepage

  Commit: 769f529c271f8fc1f862e2fc5f956b9a6c7eb8c7
      https://github.com/zanata/zanata-platform/commit/769f529c271f8fc1f862e2fc5f956b9a6c7eb8c7
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) layout and styling fixes to reject translation settings page (WIP), update frontend snapshots

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

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to review admin page and react editor

  Commit: 7ee5196fe325cb069030048e3f93573e765aac74
      https://github.com/zanata/zanata-platform/commit/7ee5196fe325cb069030048e3f93573e765aac74
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) editor: refactor utility classes for text colours, minor styling fixes to react editor

  Commit: 5abb413ad4263fd52383ca0b9ea70e06595aa95b
      https://github.com/zanata/zanata-platform/commit/5abb413ad4263fd52383ca0b9ea70e06595aa95b
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) customise antd card header variables

  Commit: 77b5907d638726f4796e28a49ca3e2c6a2b4e5de
      https://github.com/zanata/zanata-platform/commit/77b5907d638726f4796e28a49ca3e2c6a2b4e5de
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) alignment of admin review criteria page rows

  Commit: 6645b5f90a1c5105b08ac185f903816f59cbf67d
      https://github.com/zanata/zanata-platform/commit/6645b5f90a1c5105b08ac185f903816f59cbf67d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js

  Log Message:
  -----------
  Revert "refactor(ZNTA-2529) editor: refactor utility classes for text colours, minor styling fixes to react editor"

This reverts commit 7ee5196fe325cb069030048e3f93573e765aac74.

  Commit: d736b0910cb3362fd07e7c493b894530f612c907
      https://github.com/zanata/zanata-platform/commit/d736b0910cb3362fd07e7c493b894530f612c907
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) utility classes and small ui fixes for react editor

  Commit: 437695a5418c5ef3382e30ea9608f99226b9cccb
      https://github.com/zanata/zanata-platform/commit/437695a5418c5ef3382e30ea9608f99226b9cccb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) editor ui fixes, remove references to react-bootstrap stories

  Commit: 6328d05141590fecd82fab49db3adda8822295e6
      https://github.com/zanata/zanata-platform/commit/6328d05141590fecd82fab49db3adda8822295e6
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx

  Log Message:
  -----------
  refactor(ZNTA-2529) update test files and stories

  Commit: f0f0b8f985dd7617b9d5095d0330ac426767f1bf
      https://github.com/zanata/zanata-platform/commit/f0f0b8f985dd7617b9d5095d0330ac426767f1bf
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2529) remove react-bootstrap package and update storybook styleguide

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

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  reactjs: server config (#927)

  Commit: 0a6c2cc85893098635d76322c511ba9338a37a44
      https://github.com/zanata/zanata-platform/commit/0a6c2cc85893098635d76322c511ba9338a37a44
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  refactor(ZNTA-2529) misc css fixes for frontend

  Commit: 32955cb1f58fd6aa6f96db5267ab0fa6856c4036
      https://github.com/zanata/zanata-platform/commit/32955cb1f58fd6aa6f96db5267ab0fa6856c4036
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/messages/ja.json

  Log Message:
  -----------
  feat(ZNTA-2078): translation permalinks in alpha editor (#943)

* feat(ZNTA-2078): translation permalinks in alpha editor

* refactor: extract link builder function

  Commit: b41abb5ca754cfef4baa452c31c6b2ed3b8b6343
      https://github.com/zanata/zanata-platform/commit/b41abb5ca754cfef4baa452c31c6b2ed3b8b6343
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2529

  Commit: c915546facef1ef829288acb0c91e83cb751bd1c
      https://github.com/zanata/zanata-platform/commit/c915546facef1ef829288acb0c91e83cb751bd1c
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: 6ab3543cd12baaab42c5f6bde57e04b91a2a9f02
      https://github.com/zanata/zanata-platform/commit/6ab3543cd12baaab42c5f6bde57e04b91a2a9f02
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    A server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update tests

  Commit: 8798239750ecf556397b866cdbb07dd00fe6230d
      https://github.com/zanata/zanata-platform/commit/8798239750ecf556397b866cdbb07dd00fe6230d
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update tests

  Commit: 37b476ae9251ce749ddad9653619d534b79d824a
      https://github.com/zanata/zanata-platform/commit/37b476ae9251ce749ddad9653619d534b79d824a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) add button story back to frontend [antd]

  Commit: 1ce1b0f9c8245f3da39531d6f58bc5b7e711dfac
      https://github.com/zanata/zanata-platform/commit/1ce1b0f9c8245f3da39531d6f58bc5b7e711dfac
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing tests, add Button back to frontend storybook

  Commit: 20f211c7d8af0ce396218b150e5f42c17b8b52b4
      https://github.com/zanata/zanata-platform/commit/20f211c7d8af0ce396218b150e5f42c17b8b52b4
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix codecov issues

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

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

  Log Message:
  -----------
  refactor(ZNTA-2529) styling for antd danger buttons

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

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/services/src/main/java/org/zanata/ZanataInit.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  ZNTA-2504 able to query from MT service

  Commit: 8198db2957d35ef4262ee1f749483a48038320d5
      https://github.com/zanata/zanata-platform/commit/8198db2957d35ef4262ee1f749483a48038320d5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/security/CheckRoleDecisionVoter.java

  Log Message:
  -----------
  ZNTA-2631 - Check role will allow admin to bypass

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

  Changed paths:
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java

  Log Message:
  -----------
  ZNTA-2504 REST api for bulk translation via MT

  Commit: 850ade1edd62d28791b8ff1575478a483adfc0a8
      https://github.com/zanata/zanata-platform/commit/850ade1edd62d28791b8ff1575478a483adfc0a8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java

  Log Message:
  -----------
  fix static analysis warning

  Commit: 6d4999b2170dc576d1a842435d6c4d0775d5359f
      https://github.com/zanata/zanata-platform/commit/6d4999b2170dc576d1a842435d6c4d0775d5359f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  fix deployment and test

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

  Changed paths:
    M server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  ZNTA-2504 use dto as payload to configure MT prefill

  Commit: 6e86ca922e5783ebaba0c6438833aafb81e0a4bf
      https://github.com/zanata/zanata-platform/commit/6e86ca922e5783ebaba0c6438833aafb81e0a4bf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  ZNTA-2504 return 503 when MT is not configured

  Commit: 2525f01b1d8b256596e19f5d805fe44ab50bce69
      https://github.com/zanata/zanata-platform/commit/2525f01b1d8b256596e19f5d805fe44ab50bce69
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/security/CheckRoleDecisionVoter.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  ZNTA-2504 - refactoring

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

  Changed paths:
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  ZNTA-2504 - minor update

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

  Changed paths:
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  ZNTA-2504 add test

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

  Changed paths:
    M server/pom.xml
    M server/services/pom.xml

  Log Message:
  -----------
  fix enforcer rule - update dep versoin

  Commit: 88ead79d88f2f716f02008a58ad96dc0c0d0d824
      https://github.com/zanata/zanata-platform/commit/88ead79d88f2f716f02008a58ad96dc0c0d0d824
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/pom.xml

  Log Message:
  -----------
  fix duplicate-finder error

  Commit: 2c1fa231f9758d9ff893627f063502a7b2a05aa6
      https://github.com/zanata/zanata-platform/commit/2c1fa231f9758d9ff893627f063502a7b2a05aa6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java

  Log Message:
  -----------
  ZNTA-2504 - fix test and update javadoc

  Commit: 2c37655e4c2d6e75e2f602421b5729d43d926b90
      https://github.com/zanata/zanata-platform/commit/2c37655e4c2d6e75e2f602421b5729d43d926b90
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Convert MTMerge UI to TSX, modularise, add types

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) heading styling

  Commit: 70328ece39d42cd331c7eed620bcaf5d2ac2176e
      https://github.com/zanata/zanata-platform/commit/70328ece39d42cd331c7eed620bcaf5d2ac2176e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) wideView container padding

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update editor snapshot tests and languages heading

  Commit: 01efa26de084ca3d8bfaf1d6c136447e841150f8
      https://github.com/zanata/zanata-platform/commit/01efa26de084ca3d8bfaf1d6c136447e841150f8
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) implement spacing variables into frontend

  Commit: 4e843b29f0fadf3198e7bd3948f37b6d18fab63c
      https://github.com/zanata/zanata-platform/commit/4e843b29f0fadf3198e7bd3948f37b6d18fab63c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Refactor MT code; use doc's locale; check backendId

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

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

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: tidy up antd.less

  Commit: 2763716d6adc6b22bcdca16896b34ccbe5998b1e
      https://github.com/zanata/zanata-platform/commit/2763716d6adc6b22bcdca16896b34ccbe5998b1e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) antd.less formatting

  Commit: 6fc1a44e1cd87ac9e56715176c3c7b3a86ea97aa
      https://github.com/zanata/zanata-platform/commit/6fc1a44e1cd87ac9e56715176c3c7b3a86ea97aa
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) use antd variables for LogoLoader

  Commit: 608f90779dccaf75eeb7d7ae2423105a3eba9de2
      https://github.com/zanata/zanata-platform/commit/608f90779dccaf75eeb7d7ae2423105a3eba9de2
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

  Log Message:
  -----------
  feat(ZNTA-2635): editor validators error behavior (#924)

* feat: editor behavior on validation errors detected

* feat: track validation error detections for transunits,
display error notification icon in status area, hide validation messages panel when not selected

* refactor: retrieve phrases errors status from redux store

* test: update jest tests, snapshots

* fix: unstage vscode settings

* refactor: remove unneeded let

* fix: typescript errors

* chore: fix typescript strict warnings

* feat: use modal to confirm saving with validation errors

* fix: typescript strict checks, tests

* refactor: save with validation errors modal to SFC component

* refactor: remove Errors detected message

* fix: typo, clarify move to next row logic

  Commit: 01043dc3f6fab2c208825832a635f69ff97520e3
      https://github.com/zanata/zanata-platform/commit/01043dc3f6fab2c208825832a635f69ff97520e3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) use antd variables for all frontend components

  Commit: 591b7444fc697460c509387ba7345bb3bc1a417c
      https://github.com/zanata/zanata-platform/commit/591b7444fc697460c509387ba7345bb3bc1a417c
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2529

  Commit: e0416147d391e77d3cdb1f09dd667de8ae17166f
      https://github.com/zanata/zanata-platform/commit/e0416147d391e77d3cdb1f09dd667de8ae17166f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Handle plurals

  Commit: 596c976254667fe0a61e87d22df0e7dbda2bdc11
      https://github.com/zanata/zanata-platform/commit/596c976254667fe0a61e87d22df0e7dbda2bdc11
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java

  Log Message:
  -----------
  Split role into two: mt-suggestion, mt-bulk

  Commit: 52f9190407470036e1473c5e83e93e9061b39a88
      https://github.com/zanata/zanata-platform/commit/52f9190407470036e1473c5e83e93e9061b39a88
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove duplicate import statements for antd css, styling for antd layout

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: final bugfixes to frontend after react-bootstrap removal

  Commit: 5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
      https://github.com/zanata/zanata-platform/commit/5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
      https://github.com/zanata/zanata-platform/commit/cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  fix: dom hierarchy no div within p

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

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) replace broken antd variables file

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

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix build errors (rename antd variable imports)

  Commit: 2fa27f8acadbd37dbd2f96b065dec81865486701
      https://github.com/zanata/zanata-platform/commit/2fa27f8acadbd37dbd2f96b065dec81865486701
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  WIP: get antd custom variables working

  Commit: cff27e5de1a4ba9a4030db721bf2eeb6c4564f94
      https://github.com/zanata/zanata-platform/commit/cff27e5de1a4ba9a4030db721bf2eeb6c4564f94
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx

  Log Message:
  -----------
  feat: add dropdown option to open MT Merge Modal, fix ternary

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) remove references to prop parentClassName

  Commit: 837ca610984e0a32d387624e36bdd62045fc2806
      https://github.com/zanata/zanata-platform/commit/837ca610984e0a32d387624e36bdd62045fc2806
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js

  Log Message:
  -----------
  refactor(ZNTA-2529) refactor variables in Explore and Admin containers to use antd variables, remove unused css in those files, and fix icon styling in Glossary Entry Modal

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

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

  Log Message:
  -----------
  refactor(ZNTA-2529) fix linting error

  Commit: 6e234e6c71b37d264faf0b2726472654955bee94
      https://github.com/zanata/zanata-platform/commit/6e234e6c71b37d264faf0b2726472654955bee94
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  refactor(ZNTA-2529) a heap of refactoring and bugfixes for frontend

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove the last of the react-bootstrap variables from frontend and the related import statement

  Commit: 2c20911229f3e64db390d5a807cc44516b81e05f
      https://github.com/zanata/zanata-platform/commit/2c20911229f3e64db390d5a807cc44516b81e05f
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) delete variables.less (react-bootstrap variables file)

  Commit: 81baa3b4bf82b694d250cc5677d66a2bf0357e4e
      https://github.com/zanata/zanata-platform/commit/81baa3b4bf82b694d250cc5677d66a2bf0357e4e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) rename variables file imported into languages less file

  Commit: 226f7141455b6c67eeab8771a4a3a7b2a906856f
      https://github.com/zanata/zanata-platform/commit/226f7141455b6c67eeab8771a4a3a7b2a906856f
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    A server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update variables imports for frontend-nav and frontend-jsf css

  Commit: 1d5b15d5473c133afcd554a92a730fc7bf2f76af
      https://github.com/zanata/zanata-platform/commit/1d5b15d5473c133afcd554a92a730fc7bf2f76af
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) delete variables.less after restore

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix build errors, add bstrap4 media queries used by antd

  Commit: 2c69e99ba90c41c985b2530d997b1952241813eb
      https://github.com/zanata/zanata-platform/commit/2c69e99ba90c41c985b2530d997b1952241813eb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  refactor(ZNTA-2529) user profile styling fixes

  Commit: 68a48933b30af04fd873c073581ddf3f9880103c
      https://github.com/zanata/zanata-platform/commit/68a48933b30af04fd873c073581ddf3f9880103c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) misc. ui fixes to frontend

  Commit: 86e7cd9576dbcd9a849c17e9a50ec1cc79bdb9ba
      https://github.com/zanata/zanata-platform/commit/86e7cd9576dbcd9a849c17e9a50ec1cc79bdb9ba
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui fixes, remove antd import from webpack

  Commit: 12fea9064e6af985f7af7de42f67c591aa758de4
      https://github.com/zanata/zanata-platform/commit/12fea9064e6af985f7af7de42f67c591aa758de4
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) styling for date selection field on user profile

  Commit: 9093f4fa696e719d3b9e66a6a3c35aef43fefbf9
      https://github.com/zanata/zanata-platform/commit/9093f4fa696e719d3b9e66a6a3c35aef43fefbf9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix: antd_1 is not defined, import syntax

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

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) editor button hover styling, minor style fixes to editor

  Commit: ad1cbd43e47ed2329bae3d74f7627e9204460d6b
      https://github.com/zanata/zanata-platform/commit/ad1cbd43e47ed2329bae3d74f7627e9204460d6b
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts

  Log Message:
  -----------
  feat: modal onCancel to trigger toggleMTMergeModal action

  Commit: 90307bdada96bdd2fa56ecc994c5a38a34e594b5
      https://github.com/zanata/zanata-platform/commit/90307bdada96bdd2fa56ecc994c5a38a34e594b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Add incomplete types for Redux state (#945)

* Add incomplete types for Redux state
* Update eslintrc
* Fix accidental state mutation of state.importFile

  Commit: 5910479655f7fac5aed454edffb28d0e002301e4
      https://github.com/zanata/zanata-platform/commit/5910479655f7fac5aed454edffb28d0e002301e4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js

  Log Message:
  -----------
  Add some state types for editor

  Commit: 207096f54ecda8ab87247236fb8693bef7e2b339
      https://github.com/zanata/zanata-platform/commit/207096f54ecda8ab87247236fb8693bef7e2b339
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Add io-ts and prop-types-ts for Icon

  Commit: 981c061dee63c5c2137fd056606d75b98b049135
      https://github.com/zanata/zanata-platform/commit/981c061dee63c5c2137fd056606d75b98b049135
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts

  Log Message:
  -----------
  Use prop-types-ts for ActivityTab

  Commit: 8f2c4b5cfba4874126f570b46e7fa12fa2bcdb91
      https://github.com/zanata/zanata-platform/commit/8f2c4b5cfba4874126f570b46e7fa12fa2bcdb91
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) input background fix

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

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

  Log Message:
  -----------
  refactor(ZNTA-2529) input background fix

  Commit: 7b821b87b26fb808f6a709d5e81e5cb4b4dc9035
      https://github.com/zanata/zanata-platform/commit/7b821b87b26fb808f6a709d5e81e5cb4b4dc9035
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) date selector input

  Commit: d270f82c7edfae40c72b2211c1af42f095a9efd4
      https://github.com/zanata/zanata-platform/commit/d270f82c7edfae40c72b2211c1af42f095a9efd4
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts

  Log Message:
  -----------
  feat: modal onSubmit to trigger mergeVersionFromMT action with required opts

  Commit: 38921c037f77cbd4063ade93b314b775e60ab449
      https://github.com/zanata/zanata-platform/commit/38921c037f77cbd4063ade93b314b775e60ab449
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/tslint.json

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

  Commit: e857cf48bc96283248ed625eb013db707656ff70
      https://github.com/zanata/zanata-platform/commit/e857cf48bc96283248ed625eb013db707656ff70
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx

  Log Message:
  -----------
  chore: update storyshots, disable multiple locale story

  Commit: 8a4addc0a129e548be07b7aade9766d52b316582
      https://github.com/zanata/zanata-platform/commit/8a4addc0a129e548be07b7aade9766d52b316582
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui changes to Glossary entry modal and page count select

  Commit: 222627b9b535731fd3ce65f52ef71ae9b6ff0593
      https://github.com/zanata/zanata-platform/commit/222627b9b535731fd3ce65f52ef71ae9b6ff0593
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui changes to Glossary page count select

  Commit: 98fc9c263a1047799eb22edf5bff36f4e74abe64
      https://github.com/zanata/zanata-platform/commit/98fc9c263a1047799eb22edf5bff36f4e74abe64
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  Refactor HTextFlow

Avoid changing natural ID after construction.
Avoid updateWordCount() when JPA calls setDocument().

  Commit: 147b7d1870d5d855558e152cecedc316c103b79b
      https://github.com/zanata/zanata-platform/commit/147b7d1870d5d855558e152cecedc316c103b79b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Add option to overwrite fuzzy translations with MT

  Commit: bf85399626829342e45bd5e418997bfff2c04516
      https://github.com/zanata/zanata-platform/commit/bf85399626829342e45bd5e418997bfff2c04516
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: set up MTMerge api reqest, handle failure notification

  Commit: d7e02566043dcae6735419a83189de5d9c0f7fff
      https://github.com/zanata/zanata-platform/commit/d7e02566043dcae6735419a83189de5d9c0f7fff
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  Use React.Fragment

  Commit: e436b03a8adadeddb1679fef510a248082702cf9
      https://github.com/zanata/zanata-platform/commit/e436b03a8adadeddb1679fef510a248082702cf9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js

  Log Message:
  -----------
  Use React.Fragment more

  Commit: 8119305c4f95f7f3247fc689849d4688a1af5f78
      https://github.com/zanata/zanata-platform/commit/8119305c4f95f7f3247fc689849d4688a1af5f78
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js

  Log Message:
  -----------
  Use <React.Fragment> in JS (<> requires eslint 5)

  Commit: f8a23c6d08980434f06f9581d3088195730dedcf
      https://github.com/zanata/zanata-platform/commit/f8a23c6d08980434f06f9581d3088195730dedcf
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update LoaderText so it is centered and remove p class

  Commit: 8bae8ce949ebb0b3919ceda269b46e2de1b9dac3
      https://github.com/zanata/zanata-platform/commit/8bae8ce949ebb0b3919ceda269b46e2de1b9dac3
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2529) update frontend and editor snapshot tests

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

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tslint.json

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

  Commit: d4d04aff21e7231bed4f9eed1ae5c5435a2dce68
      https://github.com/zanata/zanata-platform/commit/d4d04aff21e7231bed4f9eed1ae5c5435a2dce68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #947 from zanata/types-for-editor-state

Add types for editor state

  Commit: 25e26794c29cb698e3d118b942f5678f758d65d0
      https://github.com/zanata/zanata-platform/commit/25e26794c29cb698e3d118b942f5678f758d65d0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java

  Log Message:
  -----------
  Add public constructor for JAX-RS

  Commit: bf449fbd2d6a782010fea44a6d932d680b2e6a36
      https://github.com/zanata/zanata-platform/commit/bf449fbd2d6a782010fea44a6d932d680b2e6a36
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js

  Log Message:
  -----------
  Change /process keyId to query param

  Commit: eb866c924ab67d6f15fda35630b2fe9a55d454f4
      https://github.com/zanata/zanata-platform/commit/eb866c924ab67d6f15fda35630b2fe9a55d454f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Improve messages and check for empty document

  Commit: ad6c25b5d450365b03f524a381831137162002bd
      https://github.com/zanata/zanata-platform/commit/ad6c25b5d450365b03f524a381831137162002bd
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2529

  Commit: 159f4319fae772da9b1d3a77ba38c37797135507
      https://github.com/zanata/zanata-platform/commit/159f4319fae772da9b1d3a77ba38c37797135507
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

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

  Commit: e94268ba057e515b145822a151c11e29053c5286
      https://github.com/zanata/zanata-platform/commit/e94268ba057e515b145822a151c11e29053c5286
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  fix: update phrase status on conflict resolution save

  Commit: f1e59fc505a8c1c33764e629bec3bc893ffa68e5
      https://github.com/zanata/zanata-platform/commit/f1e59fc505a8c1c33764e629bec3bc893ffa68e5
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  refactor: specify duration for all notifications

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor styling fixes to user profile

  Commit: d03d62cd4786801d69619fa39e193488d246c64a
      https://github.com/zanata/zanata-platform/commit/d03d62cd4786801d69619fa39e193488d246c64a
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: close concurrent edit notification on save as latest/original

  Commit: a1262ada1d0569abbf909b23fa2016db588db725
      https://github.com/zanata/zanata-platform/commit/a1262ada1d0569abbf909b23fa2016db588db725
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

  Commit: 6fdde184578a12379993f915d10ed8f09958fecc
      https://github.com/zanata/zanata-platform/commit/6fdde184578a12379993f915d10ed8f09958fecc
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) revert change that centers all loader content breaking glossary delete buttons

  Commit: d4aab23ab3c7758e3e2ad2be83340e74a68b4826
      https://github.com/zanata/zanata-platform/commit/d4aab23ab3c7758e3e2ad2be83340e74a68b4826
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js

  Log Message:
  -----------
  fix: duplicate type, project version reducer tests

  Commit: c892bfef65d0a033ee2c1898572da47997ff01a1
      https://github.com/zanata/zanata-platform/commit/c892bfef65d0a033ee2c1898572da47997ff01a1
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  Merge branch 'ZNTA-2504-use-mt' of github.com:zanata/zanata-platform into MTMerge-UI

  Commit: 7662b5dbde8d6c914a0e20781b00377b7a3b3ba7
      https://github.com/zanata/zanata-platform/commit/7662b5dbde8d6c914a0e20781b00377b7a3b3ba7
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js

  Log Message:
  -----------
  feat: trigger mt merge start from frontend

  Commit: 298eeb0bdfabb235316f92fb973310ad601dd693
      https://github.com/zanata/zanata-platform/commit/298eeb0bdfabb235316f92fb973310ad601dd693
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing LanguagesPage test

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

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  refactor(ZNTA-2529) update test for Langauges page

  Commit: 5dde59a6ba0270ea915a31cd499bd202210b3ff7
      https://github.com/zanata/zanata-platform/commit/5dde59a6ba0270ea915a31cd499bd202210b3ff7
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #939 from zanata/ZNTA-2529

 refactor(ZNTA-2529) remove react-bootstrap css

  Commit: 9d4636a447cbc5df69d7e6fd2513e39830f22fba
      https://github.com/zanata/zanata-platform/commit/9d4636a447cbc5df69d7e6fd2513e39830f22fba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  Require opt-in for admin to use roles like mt-bulk

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

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Return 502 in case of I/O error for MT

  Commit: 21b010a8d9e9603bbe291f3c2eabed1685d862c3
      https://github.com/zanata/zanata-platform/commit/21b010a8d9e9603bbe291f3c2eabed1685d862c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Include MT's error response when MT fails

  Commit: 3bd0b3a5a178eff23286a947ecf0729051ff3a99
      https://github.com/zanata/zanata-platform/commit/3bd0b3a5a178eff23286a947ecf0729051ff3a99
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Avoid logging warning for MT DEV

  Commit: 2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91
      https://github.com/zanata/zanata-platform/commit/2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Use djansen's fix for batch offset bug

  Commit: 61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
      https://github.com/zanata/zanata-platform/commit/61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  style(ZNTA-2537) update storybooks

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  style(ZNTA-2537) fix warnings in LockIcon test, update snapshots

  Commit: 275c60e4fa35122b67bdcd8f01b1937fdf7fe1bf
      https://github.com/zanata/zanata-platform/commit/275c60e4fa35122b67bdcd8f01b1937fdf7fe1bf
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into react-fragment

  Commit: 330e9156fb9f7c2d401e5e8bb145e12674482802
      https://github.com/zanata/zanata-platform/commit/330e9156fb9f7c2d401e5e8bb145e12674482802
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: integrate progressbar, query loop to update

  Commit: 8976dc9a8864e7ebba3b80d7d181cd1262945a2a
      https://github.com/zanata/zanata-platform/commit/8976dc9a8864e7ebba3b80d7d181cd1262945a2a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js

  Log Message:
  -----------
  fix: repalce empty divs with React.Fragment

  Commit: d8dbc6530f331be508693100ffa36f5b1daf826c
      https://github.com/zanata/zanata-platform/commit/d8dbc6530f331be508693100ffa36f5b1daf826c
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: modal behavior when merge completed

  Commit: c02910900372ec44674e419826b7eb510d4add58
      https://github.com/zanata/zanata-platform/commit/c02910900372ec44674e419826b7eb510d4add58
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

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

  Commit: 7dcf8043f34d75cf64b8864c756b19a8d0f908a0
      https://github.com/zanata/zanata-platform/commit/7dcf8043f34d75cf64b8864c756b19a8d0f908a0
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  feat: implement cancel mt merge action, notifications on success/failure

  Commit: 169519d89f7982f0aeb0439e069b3f9f544f90de
      https://github.com/zanata/zanata-platform/commit/169519d89f7982f0aeb0439e069b3f9f544f90de
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js

  Log Message:
  -----------
  remove unneccessary fragments

  Commit: 1577c73dbdd77b4ab34d315a3d76f81bf54215d8
      https://github.com/zanata/zanata-platform/commit/1577c73dbdd77b4ab34d315a3d76f81bf54215d8
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js

  Log Message:
  -----------
  remove unneccessary fragments

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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx

  Log Message:
  -----------
  fix: linting errors

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js

  Log Message:
  -----------
  fix: failing  tests and snapshots

  Commit: 1f470e9ddbc675fca4e4e3f27269b156c1072cad
      https://github.com/zanata/zanata-platform/commit/1f470e9ddbc675fca4e4e3f27269b156c1072cad
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  remove deprecated package - react-lorem-component, which was used for the editor glossary details modal

  Commit: 8d08866019792cbccda1d4467f9eef9634c74f90
      https://github.com/zanata/zanata-platform/commit/8d08866019792cbccda1d4467f9eef9634c74f90
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  feat: require mt-bulk role to open modal

  Commit: 41dddf53648fb263ce720cd8f5f86b82d5b4efdc
      https://github.com/zanata/zanata-platform/commit/41dddf53648fb263ce720cd8f5f86b82d5b4efdc
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  fix: re-enable TM megre progress query

  Commit: bc652f0319ea8ec2a9b007fca9032ed8989fcf8d
      https://github.com/zanata/zanata-platform/commit/bc652f0319ea8ec2a9b007fca9032ed8989fcf8d
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  Merge commit '2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91' into MTMerge-UI

  Commit: 0599b7db110da65f9e60740e108031ed69150bb4
      https://github.com/zanata/zanata-platform/commit/0599b7db110da65f9e60740e108031ed69150bb4
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx

  Log Message:
  -----------
  refactor: use ant select component with search for language select

  Commit: 7a03e60253360be60f1054294c16fec72f2d8648
      https://github.com/zanata/zanata-platform/commit/7a03e60253360be60f1054294c16fec72f2d8648
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  chore: update storyshot

  Commit: 0baf7a6ad5f93727f8545ef7b3ba8731d6abeac3
      https://github.com/zanata/zanata-platform/commit/0baf7a6ad5f93727f8545ef7b3ba8731d6abeac3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

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

  Log Message:
  -----------
  minor change to get remote branch showing all commits

  Commit: 3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
      https://github.com/zanata/zanata-platform/commit/3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  update editor snapshot test

  Commit: f4af1a7299bc6bd6e19fb68353a729aec22a2f24
      https://github.com/zanata/zanata-platform/commit/f4af1a7299bc6bd6e19fb68353a729aec22a2f24
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/editor/utils/status-util.ts

  Log Message:
  -----------
  fix: server status converter, sort locales by Id

  Commit: ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
      https://github.com/zanata/zanata-platform/commit/ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  Merge pull request #911 from zanata/editor-concurrent-save/ZNTA-2300

feat(ZNTA-2300): editor concurrent save resolution

  Commit: aac2a4822b2145182bc67b5a53ec23313d3be0b8
      https://github.com/zanata/zanata-platform/commit/aac2a4822b2145182bc67b5a53ec23313d3be0b8
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

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

  Commit: 9ee2079de33347dc417c71a89947bc1eb52a37c6
      https://github.com/zanata/zanata-platform/commit/9ee2079de33347dc417c71a89947bc1eb52a37c6
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #952 from zanata/ZNTA-2537

style(ZNTA-2537) update storybooks and tests

  Commit: 2b9de285e125ad62815e1face7d2561779876a1a
      https://github.com/zanata/zanata-platform/commit/2b9de285e125ad62815e1face7d2561779876a1a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix merge conflicts

  Commit: 87046e758318599f04517eb90dde7997fe8dee1c
      https://github.com/zanata/zanata-platform/commit/87046e758318599f04517eb90dde7997fe8dee1c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

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

  Log Message:
  -----------
  remove React.Fragment from ProjectVersion People page

  Commit: a2eca5f35ab91f033cd7e47d91e97fa488d15b80
      https://github.com/zanata/zanata-platform/commit/a2eca5f35ab91f033cd7e47d91e97fa488d15b80
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  feat(ZNTA-2487) use MT to prefill translations (#926)

* ZNTA-2504 able to query from MT service

* ZNTA-2631 - Check role will allow admin to bypass

* ZNTA-2504 REST api for bulk translation via MT

* fix static analysis warning

* fix deployment and test

* ZNTA-2504 use dto as payload to configure MT prefill

* ZNTA-2504 return 503 when MT is not configured

* ZNTA-2504 - refactoring

* ZNTA-2504 - minor update

* ZNTA-2504 add test

* fix enforcer rule - update dep versoin

* fix duplicate-finder error

* ZNTA-2504 - fix test and update javadoc

* Refactor MT code; use doc's locale; check backendId

* Handle plurals

* Split role into two: mt-suggestion, mt-bulk

* Refactor HTextFlow

Avoid changing natural ID after construction.
Avoid updateWordCount() when JPA calls setDocument().

* Add option to overwrite fuzzy translations with MT

* Add public constructor for JAX-RS

* Change /process keyId to query param

* Improve messages and check for empty document

* Require opt-in for admin to use roles like mt-bulk

* Return 502 in case of I/O error for MT

* Include MT's error response when MT fails

* Avoid logging warning for MT DEV

* Use djansen's fix for batch offset bug

  Commit: 2adad5e2a6beeae710f5199aaba586098bffd499
      https://github.com/zanata/zanata-platform/commit/2adad5e2a6beeae710f5199aaba586098bffd499
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

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

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

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) change colour of suggestions heading in editor

  Commit: cfe9aea99b9191bcffa48ffec7ddadced04e15ed
      https://github.com/zanata/zanata-platform/commit/cfe9aea99b9191bcffa48ffec7ddadced04e15ed
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #944 from zanata/MTMerge-UI

feat(ZNTA-2504) Finish MT Merge UI

  Commit: 36a1e99ec3281841d49b793b83c3c61a2db90664
      https://github.com/zanata/zanata-platform/commit/36a1e99ec3281841d49b793b83c3c61a2db90664
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix merge conflicts

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

  Changed paths:
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js

  Log Message:
  -----------
  fix merge conflicts correctly by removing outdated and now removed file

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

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

  Commit: 812dad8d477d7746e7d826f2e98bdab43bd46393
      https://github.com/zanata/zanata-platform/commit/812dad8d477d7746e7d826f2e98bdab43bd46393
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M .editorconfig
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.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/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/jsf/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/require-all.test.ts
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    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/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

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

  Commit: 89b973086a39848a2aa47a0a20063524d67771e5
      https://github.com/zanata/zanata-platform/commit/89b973086a39848a2aa47a0a20063524d67771e5
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js

  Log Message:
  -----------
  Merge pull request #953 from zanata/ZNTA-2663

refactor(ZNTA-2529) change colour of suggestions heading in editor

  Commit: 1dd0d8fe2a8f720cfafa4c2069cb802faec2cb56
      https://github.com/zanata/zanata-platform/commit/1dd0d8fe2a8f720cfafa4c2069cb802faec2cb56
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #948 from zanata/react-fragment

Use React.Fragment

  Commit: 6f1d9d5448592f514190e37c9140477762d22327
      https://github.com/zanata/zanata-platform/commit/6f1d9d5448592f514190e37c9140477762d22327
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

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

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/config.js
    M server/zanata-frontend/src/app/editor/app.css
    M server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  feat(ZNTA-2075) upadate SearchReplace story, remove bootstrap wrapper from storybook, remove unnecessary endpoint

  Commit: 5700ef8a6fa5783fa4c4032b602f1fdd82a52af9
      https://github.com/zanata/zanata-platform/commit/5700ef8a6fa5783fa4c4032b602f1fdd82a52af9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/services/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/service/PoUtility.java
    A server/services/src/main/java/org/zanata/service/impl/AttributionService.kt
    M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    A server/services/src/test/java/org/zanata/service/impl/AttributionServiceTest.kt
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java

  Log Message:
  -----------
  feat(ZNTA-2487) avoid copying MT; add attribution to docs (#954)

* Prevent copyTrans from copying MT
* Refactor: use/rename constants for SourceType
* Preserve MT SourceType in CopyVersionServiceImpl
* Prevent "Merge Translations" from copying MT
* Avoid int conversion
* Refactor TransMemoryMergeServiceImpl a bit
* Refactor TransMemoryMergeServiceImpl.startMergeTranslations()
* Mark some TM results as MT, filter out for TM Merge
* Add AttributionService

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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

  Log Message:
  -----------
  feat(ZNTA-2075) update snapshots

  Commit: 505d35455905e1862d0a9d7b72e5ca964883833d
      https://github.com/zanata/zanata-platform/commit/505d35455905e1862d0a9d7b72e5ca964883833d
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js

  Log Message:
  -----------
  feat(ZNTA-2075) update SearchReplace story failures

  Commit: 6b3f3668603f9b6a32fe5ebf7135e7975e2073a2
      https://github.com/zanata/zanata-platform/commit/6b3f3668603f9b6a32fe5ebf7135e7975e2073a2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    R server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    A server/services/src/test/java/org/zanata/adapter/TSAdapterTest.kt
    R server/services/src/test/resources/org/zanata/adapter/basicts.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-comment.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-invalid.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-multiplecontexts.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-plurals.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-translated.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java

  Log Message:
  -----------
  fix(ZNTA-2634): replace language property in translated TS (#925)

* fix(ZNTA-2634): replace language property in translated TS
* fix(ZNTA-2634): improve the regex and add tests
* fix(ZNTA-2634): add bad locale check and test
* fix(ZNTA-2634): remove unnecessary check
* fix(ZNTA-2634): convert test to Kotlin
* fix(ZNTA-2634): clean up adapter and test
* fix(ZNTA-2634): preserve case on target locale
* fix(ZNTA-2634): ignore test, cannot support user parts in locale
* fix(ZNTA-2634): use empty string instead of .EMPTY

  Commit: f9a67a5b5f8ce47a1e21f1182bdaeaf931e42936
      https://github.com/zanata/zanata-platform/commit/f9a67a5b5f8ce47a1e21f1182bdaeaf931e42936
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/config.js
    M server/zanata-frontend/src/app/editor/app.css
    A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
    A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
    A server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  Merge pull request #923 from zanata/ZNTA-2075

feat(ZNTA-2075) story for editor search and replace

  Commit: 365caee7b08f2132d3f67b94ced6dbc1a87bd447
      https://github.com/zanata/zanata-platform/commit/365caee7b08f2132d3f67b94ced6dbc1a87bd447
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java

  Log Message:
  -----------
  fix(ZNTA-2662) save invalid translations as fuzzy (#955)

* fix(ZNTA-2662) save invalid translations as fuzzy
* Add validation tests for TranslationServiceImpl

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

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

  Log Message:
  -----------
  fix: add index.css back to editor entrypoint

  Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed
      https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  fix: concurrent modal type error

  Commit: 0ba3e75ed30b138f75a0b4c5aa8eff80b5519047
      https://github.com/zanata/zanata-platform/commit/0ba3e75ed30b138f75a0b4c5aa8eff80b5519047
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #957 from zanata/react-editor-fix

fix: add index.css back to editor entrypoint

  Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628
      https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  Merge pull request #958 from zanata/fix-conflict-typeerror

fix: concurrent modal type error

  Commit: 61bf27cbdcad43b6da92aba4ba2e96cb061318af
      https://github.com/zanata/zanata-platform/commit/61bf27cbdcad43b6da92aba4ba2e96cb061318af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Fix attribution for DEV mode MT (#959)

  Commit: 552ad145fcf5eb2dd781f76bc949bb594bd62a36
      https://github.com/zanata/zanata-platform/commit/552ad145fcf5eb2dd781f76bc949bb594bd62a36
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx

  Log Message:
  -----------
  feat(ZNTA-2664): Improve UI for MT merge (#956)

* feat(ZNTA-2664): Improve UI for MT merge

* chore: update snapshots

  Commit: 75f762588bd4c089c9256b7753d2d12e772a0d51
      https://github.com/zanata/zanata-platform/commit/75f762588bd4c089c9256b7753d2d12e772a0d51
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  fix(string): Successfuly fix a typo (#961)

  Commit: b8b9890a1b22cf2ec1809ee447cf0e3efff40594
      https://github.com/zanata/zanata-platform/commit/b8b9890a1b22cf2ec1809ee447cf0e3efff40594
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  style: add alerts and additional styling to MT Merge modal

  Commit: 7307aa2bbd0d6d2dad0e440234f2e119b9f6c8ef
      https://github.com/zanata/zanata-platform/commit/7307aa2bbd0d6d2dad0e440234f2e119b9f6c8ef
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

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

  Log Message:
  -----------
  style: fix typo in  MT Merge moda cssl

  Commit: 1fbe3c7ab2752f23ff01ed16b1933bca9cf72a84
      https://github.com/zanata/zanata-platform/commit/1fbe3c7ab2752f23ff01ed16b1933bca9cf72a84
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

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

  Log Message:
  -----------
  style: fix typo in  MT Merge modal css

  Commit: b48d2e5534deb18e25937189ffc41b179e8a37f4
      https://github.com/zanata/zanata-platform/commit/b48d2e5534deb18e25937189ffc41b179e8a37f4
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap

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

  Commit: c2b92e3bbbe6844819b073a408e5a57b8d5efc7a
      https://github.com/zanata/zanata-platform/commit/c2b92e3bbbe6844819b073a408e5a57b8d5efc7a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

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

  Log Message:
  -----------
  fix colour of language codes in MT Merge dropdown

  Commit: 5997654854ccb9dd6670fdde3f496e908be9eb61
      https://github.com/zanata/zanata-platform/commit/5997654854ccb9dd6670fdde3f496e908be9eb61
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    A server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/TransFilterPresenterTest.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/service/GetTransUnitActionContextTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/GetTransUnitActionContext.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/search/FilterConstraints.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/ui/UserConfigHolder.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/EditorTextFlowTarget.java
    A server/services/src/main/java/org/zanata/rest/editor/dto/EditorTranslationStatistics.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/SuggestionDetail.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.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/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M server/services/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.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/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/editor/api/suggestions.js
    M server/zanata-frontend/src/app/editor/app.css
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionSources/SuggestionSources.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionSources/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslations.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/TransSourceTypeIndicator.story.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.css
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/Util.js
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  feat: MT filter and indicator in editor (#951)

* feat: GWT MT filter and indicator

* feat: MT indicator in react editor: TM & history

* refactor: review suggestions

* fix: move hard coded 'MT, Google' to TextFlowSuggestionDetail

* style: Machine Translation status identifier

* fix: new contructor for additional field

* fix: tm detail link for mt icon

* fix: save as rejected error

* style: remove unintended stlying of TransUnit-metaDataErrors

  Commit: 71c3cf898bac6ada450354c90493c476a0ceec90
      https://github.com/zanata/zanata-platform/commit/71c3cf898bac6ada450354c90493c476a0ceec90
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/TranslationHistoryPresenterTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.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/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M server/services/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.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/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java

  Log Message:
  -----------
  Move TranslationSourceType enum to API; remove the class

  Commit: 888409369b4ff75694fd4d2d2510bb663edea161
      https://github.com/zanata/zanata-platform/commit/888409369b4ff75694fd4d2d2510bb663edea161
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java

  Log Message:
  -----------
  Change TransUnitStatus.transSourceType to use enum

  Commit: ce7650b3d40bc4a8a5bc274bfadf523538163c9e
      https://github.com/zanata/zanata-platform/commit/ce7650b3d40bc4a8a5bc274bfadf523538163c9e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #963 from zanata/mt-text

style: add alerts and additional styling to MT Merge modal

  Commit: 98e68bb1c5b3ce6a63fc21280878f47bce65b396
      https://github.com/zanata/zanata-platform/commit/98e68bb1c5b3ce6a63fc21280878f47bce65b396
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js

  Log Message:
  -----------
  feat(ZNTA-2670): Define MT or target lang attr in React Editor  (#965)

* feat: GWT MT filter and indicator

* feat: MT indicator in react editor: TM & history

* refactor: review suggestions

* fix: move hard coded 'MT, Google' to TextFlowSuggestionDetail

* style: Machine Translation status identifier

* fix: new contructor for additional field

* fix: tm detail link for mt icon

* fix: save as rejected error

* style: remove unintended stlying of TransUnit-metaDataErrors

* feat(ZNTA-2670): define mt or target lang attr for translation textarea

* feat: also pass lang attr to SyntaxHighlighter

* chore: update tests

  Commit: 3c05e23550d7c91a2466f6aed1bcbb6beb1c8829
      https://github.com/zanata/zanata-platform/commit/3c05e23550d7c91a2466f6aed1bcbb6beb1c8829
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.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/rest/dto/TransUnitStatusTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/TranslationHistoryPresenterTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.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/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M server/services/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.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/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java

  Log Message:
  -----------
  Merge pull request #960 from zanata/mt-gwt2

refactor: eliminate duplicate TranslationSourceType

  Commit: 1b295643dacea3241a54db8c4036c4989ff2ed21
      https://github.com/zanata/zanata-platform/commit/1b295643dacea3241a54db8c4036c4989ff2ed21
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TextContentsDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css

  Log Message:
  -----------
  fix(ZNTA-2669) use HTML attributes for MT in GWT editor (#964)

* feat: GWT MT filter and indicator

* feat: MT indicator in react editor: TM & history

* refactor: review suggestions

* fix: move hard coded 'MT, Google' to TextFlowSuggestionDetail

* style: Machine Translation status identifier

* fix: new contructor for additional field

* fix: html attr for MT

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

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

  Changed paths:
    M docs/release-notes.md
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    R server/services/src/main/java/org/zanata/adapter/JsonAdapter.java
    A server/services/src/main/java/org/zanata/adapter/JsonAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/resources/messages.properties
    R server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    A server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.kt
    M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    R server/services/src/test/resources/org/zanata/adapter/basicjson.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicatecontent.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateentries.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateids.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

  Log Message:
  -----------
  fix(ZNTA-2581,ZNTA-1731): fix textflow id of uploaded JSON documents (#854)

* fix(ZNTA-2581): recommend po upload
* fix(ZNTA-2581): test po in file project
* fix(ZNTA-2581): test file adapter in gettext project
* fix(ZNTA-2581): check for original file on non-po upload

* fix(ZNTA-2581,ZNTA-1731): fix textflow id of uploaded JSON documents
Use the full path of a JSON object to determine its id. This
disallows standalone/isolated strings to be detected as the
path names will conflict when there are multiple entities,
such as an array of strings.

* fix(ZNTA-2581,ZNTA-1731): fix test
* fix(ZNTA-2581,ZNTA-1731): document potentially breaking change

* fix(ZNTA-2581): use a JSON parser
Use a parser that can handle both arrays and irregular keys,
for more flexibility in JSON documents and translation
sources.

* fix(ZNTA-2581): improve usage of parser and test coverage
* fix(ZNTA-2581): remove usused imports
* fix(ZNTA-2581): clean up duplicated code
* revert Okapi upgrade
* upgrade apache commons-text to 1.4
* fix(ZNTA-2581): improve adapter readability and convert test to Kotlin
* fix(ZNTA-2581): fix actions and UI
* fix(ZNTA-2581): comment, fix wildcard import and write exception

  Commit: 2af76e0957680c884fb2364291e7bdceacd5d8a0
      https://github.com/zanata/zanata-platform/commit/2af76e0957680c884fb2364291e7bdceacd5d8a0
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-2671): skip loop on failed attribution check (#962)

  Commit: 266e7e6e8ddc0b0d3b5bc0682d1571d304c76e92
      https://github.com/zanata/zanata-platform/commit/266e7e6e8ddc0b0d3b5bc0682d1571d304c76e92
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.6.0-rc-1

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

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.6.0-rc-2-SNAPSHOT

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

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  fix: ensure transaction for attribution (#966)

  Commit: 4c3bea535f28e8d46224b09d96f8a9a5f6309efb
      https://github.com/zanata/zanata-platform/commit/4c3bea535f28e8d46224b09d96f8a9a5f6309efb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-20 (Fri, 20 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml

  Log Message:
  -----------
  fix(ZNTA-2680) fix height of project settings languages buttons

  Commit: 6f911eeb3e7f0f4c1f7fce30224adc4ffba67a5c
      https://github.com/zanata/zanata-platform/commit/6f911eeb3e7f0f4c1f7fce30224adc4ffba67a5c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-20 (Fri, 20 Jul 2018)

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

  Log Message:
  -----------
  fix(ZNTA-2676) colour for copytrans modal state buttons

  Commit: 7e82ed42b1eb55637e2ed844e601d7fd34f3ff88
      https://github.com/zanata/zanata-platform/commit/7e82ed42b1eb55637e2ed844e601d7fd34f3ff88
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml

  Log Message:
  -----------
  Merge pull request #971 from zanata/ZNTA-2680

fix(ZNTA-2680) fix height of project settings languages buttons

  Commit: c2825fe2a37b60cb01bed281cd7f3343ca4b12be
      https://github.com/zanata/zanata-platform/commit/c2825fe2a37b60cb01bed281cd7f3343ca4b12be
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml

  Log Message:
  -----------
  Merge branch 'release' into ZNTA-2676

  Commit: 624ce383b30ea44932e37de79465466650d838cb
      https://github.com/zanata/zanata-platform/commit/624ce383b30ea44932e37de79465466650d838cb
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #972 from zanata/ZNTA-2676

fix(ZNTA-2676) colour for copytrans modal state buttons

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

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css

  Log Message:
  -----------
  fix(ZNTA-2679): React Editor status icon and disabled button styles (#968)

* style: remove metaDataErrors class from metaDataMT style

* style: add important to EditorButton highlight style

  Commit: 55b1aa3a7c389fc0692e7ebbf59f2a534586ac56
      https://github.com/zanata/zanata-platform/commit/55b1aa3a7c389fc0692e7ebbf59f2a534586ac56
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    M server/zanata-frontend/pom.xml
    A server/zanata-frontend/src/.babelrc
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/webpack.config.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/AboutPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/scripts/build.js
    M server/zanata-frontend/src/scripts/dev-server.js
    A server/zanata-frontend/src/webpack.common.js
    R server/zanata-frontend/src/webpack.config.js
    A server/zanata-frontend/src/webpack.dev.js
    A server/zanata-frontend/src/webpack.prod.js
    A server/zanata-frontend/src/webpack.story.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  chore(ZNTA-2652): Upgrade Webpack (#949)

* chore(ZNTA-2652): upgrade webpack, replace extract-text-plugin, refactor webpack.config

* feat: use UglifyJsPlugin to minimize JS, OptimizeCSSAssetsPlugin for CSS

* fix: temporarially suppress new webpack warnings

* feat: separate webpack dev and prod configurations

* perf: optimize css assets

* refactor: run copywebpackplugin in prod to build i18n messages

* Add types for Webpack Configuration

* feat: extract webpack.story.js config, upgrade all storybook dependancies

* feat: extract common config, utilize webpack.merge, update pom node version

* refactor: configure webpack optimize.minimizer for sourcemap, css optimize

* chore: comment webpack configuration changes

* fix: upgrade tslint-loader, update module use syntax

* feat: apply eslint, tslint to all builds - including storybook

* refactor: remove redundant draft build, update pom yarn version

* fix: chunkfiles to use name rather than id

* refactor: split CSS chunks by entrypoint

* refactor: CSS chunkGroup names

* fix: disable UglyfyJsPlugin cache to alleviate jenkins memory constraint

* feat: latest webpack release, turn off UglyfyJs parallel build, use chunkhash8

* test: remove frontend.legacy.css from FrontendAssetsTest

* fix: chunkFilename to use cache.css

* fix: split out legacy css

* feat: use chunks function to match entry css chunk names

* refactor: colored log for production build

  Commit: 1475629c9cbe73af25033e6aa5dbe3ad07e02f85
      https://github.com/zanata/zanata-platform/commit/1475629c9cbe73af25033e6aa5dbe3ad07e02f85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

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

  Log Message:
  -----------
  fix: refresh project list on language selection (#974)

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

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

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

  Log Message:
  -----------
  fix(ZNTA-2681): language page sort and search (#976)

  Commit: 2f145cee737ad6653645f0ac1f7abcc6a346df1e
      https://github.com/zanata/zanata-platform/commit/2f145cee737ad6653645f0ac1f7abcc6a346df1e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release-notes): section to configure MT (#970)

* doc(release-notes): section to configure MT

* Change example URL; add 'ignore section'

  Commit: f5eb537146dd1561e4a97e5546b27b6e64408a71
      https://github.com/zanata/zanata-platform/commit/f5eb537146dd1561e4a97e5546b27b6e64408a71
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  fix: glossary details display (#977)

* fix: glossary details display

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

* fix: test

  Commit: 2774c40775a019ce531195db04d8e4b721f2a953
      https://github.com/zanata/zanata-platform/commit/2774c40775a019ce531195db04d8e4b721f2a953
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M Jenkinsfile
    M server/zanata-frontend/src/.gitignore
    A server/zanata-frontend/src/auditjs-whitelist.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Add auditjs (#772)

* Ensure Jenkins runs prod build
* Add auditjs

  Commit: af956f0e9bc4ff5a25c9cbc91554ede123313dd9
      https://github.com/zanata/zanata-platform/commit/af956f0e9bc4ff5a25c9cbc91554ede123313dd9
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  fix(ZNTA-2685) minor editor css fixes (#978)

* fix(ZNTA-2685) height of editor sidebar and spacing between activity tab selector buttons

* fix(ZNTA-2685) update editor snapshot tests

  Commit: 8cdfcc0fdd2bc60c6d90617b4935985e7096fe39
      https://github.com/zanata/zanata-platform/commit/8cdfcc0fdd2bc60c6d90617b4935985e7096fe39
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2677) explore page pagination next button fixed (#975)

* fix(ZNTA-2677) explore page pagination next button fixed

* fix(ZNTA-2677) improve styling of pagination

* fix(ZNTA-2677) improve styling of pagination

  Commit: 0b2e7dfe49c298a806946162b97ab6a1aa722dff
      https://github.com/zanata/zanata-platform/commit/0b2e7dfe49c298a806946162b97ab6a1aa722dff
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    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-languages.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  fix(ZNTA-2674)(ZNTA-2675) ui fixes to project version settings (#969)

* fix(ZNTA-2674)(ZNTA-2675) ui fixes to project version settings

* fix(ZNTA-2674) height of project version language settings buttons

  Commit: bc9785524dec73cfaeadc7d4eab922b606de5ad8
      https://github.com/zanata/zanata-platform/commit/bc9785524dec73cfaeadc7d4eab922b606de5ad8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M client/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  chore(ZNTA-2478): enable ossindex audit to fail build (#973)

* chore: enable ossindex audit to fail build
* Fix dependency bounds

  Commit: 555cbf6ddd13472ac1f857d7a74d6e27d05595b3
      https://github.com/zanata/zanata-platform/commit/555cbf6ddd13472ac1f857d7a74d6e27d05595b3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M .editorconfig
    M .gitignore
    M .mvn/extensions.xml
    M .mvn/maven.config
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.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/TranslatedDocResource.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
    M build-tools/pom.xml
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M build-tools/src/main/resources/zanata-build-tools/detekt.yml
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-cli/pom.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/pom.xml
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.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/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.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
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M client/zanata-client-commands/src/main/resources/prompts.properties
    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/pull/PullCommandTest.java
    M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
    M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
    M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/pom.xml
    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/TraceDebugFilter.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/AccountClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.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/ProjectIterationClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M common/zanata-common-util/pom.xml
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M docs/client/installation/linux-installation.md
    M docs/client/installation/windows-installation.md
    R docs/images/version-translation-settings.png
    M docs/release-notes.md
    M docs/user-guide/documents/upload-documents.md
    R docs/user-guide/review/review-enable.md
    M docs/user-guide/review/translation-review.md
    M docs/user-guide/versions/version-settings.md
    M mkdocs.yml
    M parent/pom.xml
    M pom.xml
    M server/docker/Dockerfile
    R server/docker/conf/zanata-config.cli
    M server/docker/docker-compose.yml
    M server/docker/rundev.sh
    M server/etc/scripts/allocate-jboss-ports
    A server/etc/scripts/configure-app-server.js
    R server/etc/scripts/configureAppServer.js
    A server/etc/scripts/jboss-cli-jjs
    M server/etc/scripts/runJbossCli.groovy
    A server/etc/scripts/tsconfig.json
    A server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java
    M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    A server/functional-test/src/test/resources/liquibase.properties
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TextContentsDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    A server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.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/ComparingPairTest.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/KeyShortcutPresenterTest.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/TransFilterPresenterTest.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/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/service/GetTransUnitActionContextTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/GetTransUnitActionContext.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M 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/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/search/FilterConstraints.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/ui/UserConfigHolder.java
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/ContactAdminAction.java
    M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
    M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
    M server/services/src/main/java/org/zanata/action/HasUserDetail.java
    M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/LoginAction.java
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/RoleAction.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/UserAction.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    R server/services/src/main/java/org/zanata/adapter/JsonAdapter.java
    A server/services/src/main/java/org/zanata/adapter/JsonAdapter.kt
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.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/TextFlowDAO.java
    M server/services/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
    A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/sendEmail.kt
    A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
    A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
    A server/services/src/main/java/org/zanata/file/DocumentStorage.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
    M server/services/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/services/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    M server/services/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M server/services/src/main/java/org/zanata/liquibase/custom/RebuildTMXPlainText.java
    M server/services/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java
    A server/services/src/main/java/org/zanata/log4j/logger.kt
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/EditorTextFlowTarget.java
    A server/services/src/main/java/org/zanata/rest/editor/dto/EditorTranslationStatistics.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/SuggestionDetail.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.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/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/PoUtility.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M server/services/src/main/java/org/zanata/security/SamlAttributes.kt
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/EmailService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/services/src/main/java/org/zanata/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/UserAccountService.java
    A server/services/src/main/java/org/zanata/service/impl/AttributionService.kt
    M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    R server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
    A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/services/src/main/java/org/zanata/util/TranslationUtil.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/ValidationMessages.properties
    M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
    A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/db/db.changelog.xml
    M server/services/src/main/resources/messages.properties
    M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
    M server/services/src/test/java/org/zanata/ZanataJpaTest.java
    M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java
    M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
    A server/services/src/test/java/org/zanata/action/RoleActionTest.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    R server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    A server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.kt
    M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    R server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    A server/services/src/test/java/org/zanata/adapter/TSAdapterTest.kt
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.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/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/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/multipart.kt
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.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/HTextFlowBuilder.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
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.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/raw/ArquillianRest.kt
    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/security/ZanataIdentityTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/service/impl/AttributionServiceTest.kt
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
    R 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/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
    A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/test/DBUnitDataSetRunner.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/java/org/zanata/test/rule/DataSetOperation.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java
    M server/services/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
    M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.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/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/META-INF/persistence.xml
    R server/services/src/test/resources/org/zanata/adapter/basicjson.json
    R server/services/src/test/resources/org/zanata/adapter/basicts.ts
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicatecontent.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateentries.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateids.json
    R server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    R server/services/src/test/resources/org/zanata/adapter/test-ts-comment.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-invalid.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-multiplecontexts.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-plurals.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-translated.ts
    R server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/pom.xml
    A server/zanata-frontend/src/.babelrc
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-editor/webpack.config.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/config.js
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/.stylelintrc
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/Notification.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Notification/index.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/AboutPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/api/suggestions.js
    M server/zanata-frontend/src/app/editor/app.css
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/Dropdown/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.css
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
    A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
    A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
    A server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionSources/SuggestionSources.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionSources/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslations.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/TransSourceTypeIndicator.story.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.css
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    A server/zanata-frontend/src/app/editor/components/Validation/index.css
    A server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/RejectTranslation/index.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    A server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/Util.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.test.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
    M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js
    M server/zanata-frontend/src/app/jsf/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/require-all.test.ts
    A server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    A server/zanata-frontend/src/app/styles/frontend-jsf.less
    A server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-frontend/src/app/styles/legacy.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    M server/zanata-frontend/src/app/utils/FeatureToggles.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
    A server/zanata-frontend/src/app/validators/ValidationMessages.ts
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
    A server/zanata-frontend/src/app/validators/index.ts
    A server/zanata-frontend/src/app/validators/messages/en.json
    A server/zanata-frontend/src/app/validators/messages/fr.json
    A server/zanata-frontend/src/app/validators/messages/index.ts
    A server/zanata-frontend/src/app/validators/messages/ja.json
    A server/zanata-frontend/src/auditjs-whitelist.json
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/scripts/build.js
    M server/zanata-frontend/src/scripts/dev-server.js
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json
    A server/zanata-frontend/src/webpack.common.js
    R server/zanata-frontend/src/webpack.config.js
    A server/zanata-frontend/src/webpack.dev.js
    A server/zanata-frontend/src/webpack.prod.js
    A server/zanata-frontend/src/webpack.story.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M server/zanata-model-test/src/main/java/org/zanata/provider/DBUnitProvider.java
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
    M server/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
    M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    R server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    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/languages-list.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    A server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-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/layout/version/edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    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/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.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/public/info.xhtml
    M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M server/zanata-war/src/main/webapp/version-group/version_group.xhtml
    M server/zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.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/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into remove-solr

  Commit: 93907e2c1ba67f1603f38577a638a046276c2750
      https://github.com/zanata/zanata-platform/commit/93907e2c1ba67f1603f38577a638a046276c2750
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M parent/pom.xml

  Log Message:
  -----------
  Remove audit.ignore for solr

Compare: https://github.com/zanata/zanata-platform/compare/66656407d4df...93907e2c1ba6
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.