[zanata/zanata-platform] 4f1022: feat(ZNTA-2070) create storybook for editor settin...

Wed Jul 12 05:19:51 UTC 2017

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

feat(ZNTA-2070) editor settings options

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

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    A server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
    M server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

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

ZNTA-1865 - can merge translation from TM

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

  Changed paths:
    R LICENSE.LESSER.txt
    R LICENSE.txt
    A client/README.md
    R client/README.txt
    A license-gpl.md
    A license.md
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
    R server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
    M server/zanata-frontend/src/frontend/makefile
    M server/zanata-frontend/src/frontend/package.json

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

Compare: https://github.com/zanata/zanata-platform/compare/201abf5472dd...199c2a91daf9