Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 716af8eb6a51ae6df74350c70256fb3932aec770
      
https://github.com/zanata/zanata-platform/commit/716af8eb6a51ae6df74350c70256fb3932aec770
  Author: Patrick Huang <pahu...@redhat.com>
  Date:   2017-06-12 (Mon, 12 Jun 2017)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    A 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M 
server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M 
server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
    M 
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  ZNTA-1865 - can merge translation from TM


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

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M 
server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M 
server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M 
server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java

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


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

  Changed paths:
    M 
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M 
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M 
server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


  Commit: 617dc43e707542a2ea58138cf3f43c1f8150460a
      
https://github.com/zanata/zanata-platform/commit/617dc43e707542a2ea58138cf3f43c1f8150460a
  Author: Patrick Huang <pahu...@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


Compare: 
https://github.com/zanata/zanata-platform/compare/529fec9bd6f3...617dc43e7075
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to