[zanata/zanata-platform] 6d5e57: ZNTA-1865 TM Merge for Version (#404)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 6d5e57450acfed2fa379224b5ef61001c3a39245
      https://github.com/zanata/zanata-platform/commit/6d5e57450acfed2fa379224b5ef61001c3a39245
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/common-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.js
    A server/zanata-frontend/src/frontend/app/actions/version-actions.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    A server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
    A server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js
    A server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/frontend/app/components/index.js
    M server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.css
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/frontend/app/containers/Root.js
    A server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
    A server/zanata-frontend/src/frontend/app/jsf/index.js
    M server/zanata-frontend/src/frontend/app/legacy.js
    M server/zanata-frontend/src/frontend/app/reducers/index.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    A server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M server/zanata-frontend/src/frontend/app/utils/UrlHelper.js
    A server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  ZNTA-1865 TM Merge for Version (#404)

ZNTA-1865 squash merge of PR #404