[zanata/zanata-platform] 9248da: Merge branch 'ZNTA-1865-version-tm-merge' into ZNT...

[GitHub]

  Branch: refs/heads/ZNTA-1865-full
  Home:   https://github.com/zanata/zanata-platform
  Commit: 9248da5758965001d36d178073ef28e48153b08d
      https://github.com/zanata/zanata-platform/commit/9248da5758965001d36d178073ef28e48153b08d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 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 branch 'ZNTA-1865-version-tm-merge' into ZNTA-1865-full


  Commit: 3dd374e2f0a380443ba634c0ee22b39f037634ea
      https://github.com/zanata/zanata-platform/commit/3dd374e2f0a380443ba634c0ee22b39f037634ea
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/common-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionDisplay.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    A server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    A server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/legacy.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    A server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

  Log Message:
  -----------
  Merge branch 'ZNTA-1865-frontend' into ZNTA-1865-full


  Commit: 1d9060373506ca49a401201227681ad76b26f37a
      https://github.com/zanata/zanata-platform/commit/1d9060373506ca49a401201227681ad76b26f37a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

  Log Message:
  -----------
  WIP fix up css conflicts


Compare: https://github.com/zanata/zanata-platform/compare/9248da575896^...1d9060373506