[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error

[GitHub]

  Branch: refs/heads/react-editor-mt-lang-attr/ZNTA-2670
  Home:   https://github.com/zanata/zanata-platform
  Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed
      https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  fix: concurrent modal type error


  Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628
      https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  Merge pull request #958 from zanata/fix-conflict-typeerror

fix: concurrent modal type error


  Commit: 61bf27cbdcad43b6da92aba4ba2e96cb061318af
      https://github.com/zanata/zanata-platform/commit/61bf27cbdcad43b6da92aba4ba2e96cb061318af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Fix attribution for DEV mode MT (#959)


  Commit: 552ad145fcf5eb2dd781f76bc949bb594bd62a36
      https://github.com/zanata/zanata-platform/commit/552ad145fcf5eb2dd781f76bc949bb594bd62a36
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx

  Log Message:
  -----------
  feat(ZNTA-2664): Improve UI for MT merge (#956)

* feat(ZNTA-2664): Improve UI for MT merge

* chore: update snapshots


  Commit: 75f762588bd4c089c9256b7753d2d12e772a0d51
      https://github.com/zanata/zanata-platform/commit/75f762588bd4c089c9256b7753d2d12e772a0d51
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  fix(string): Successfuly fix a typo (#961)


  Commit: 2def46ed8224e78ef40f8dfc5d0d8d6d61bf4f67
      https://github.com/zanata/zanata-platform/commit/2def46ed8224e78ef40f8dfc5d0d8d6d61bf4f67
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into react-editor-mt-lang-attr/ZNTA-2670


Compare: https://github.com/zanata/zanata-platform/compare/276cbb88b4bb...2def46ed8224
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.