[zanata/zanata-platform] 2d3ccd: ZNTA-1865 enable merge progress tracking

[GitHub]

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

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    M server/zanata-frontend/src/frontend/app/actions/version-actions.js
    A server/zanata-frontend/src/frontend/app/components/Modal/ProgressModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    M server/zanata-frontend/src/frontend/app/utils/prop-types-util.js

  Log Message:
  -----------
  ZNTA-1865 enable merge progress tracking


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

  Changed paths:
    A server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js

  Log Message:
  -----------
  ZNTA-1865 - refactor merge modal

- extra stateless component for merge option display (used in modal
body)


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

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

  Log Message:
  -----------
  ZNTA-1865 - show progress in the merge modal


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

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/version-action-types.js
    M server/zanata-frontend/src/frontend/app/actions/version-actions.js
    R server/zanata-frontend/src/frontend/app/components/Modal/ProgressModal.js
    M server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
    A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
    M server/zanata-frontend/src/frontend/app/utils/prop-types-util.js

  Log Message:
  -----------
  ZNTA-1865 display progress properly


Compare: https://github.com/zanata/zanata-platform/compare/27571d0bcb5e...a042cec467b2