[zanata/zanata-platform] ef30f3: feat: include latest username, modified date in co...

[GitHub]

  Branch: refs/heads/editor-concurrent-save/ZNTA-2300
  Home:   https://github.com/zanata/zanata-platform
  Commit: ef30f354607089ef90624dd9a3ab05ae2ed66f4f
      https://github.com/zanata/zanata-platform/commit/ef30f354607089ef90624dd9a3ab05ae2ed66f4f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  feat: include latest username, modified date in conflict response
display in conflict modal UI


  Commit: 0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
      https://github.com/zanata/zanata-platform/commit/0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

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

  Log Message:
  -----------
  refactor: extract conflictData interface


Compare: https://github.com/zanata/zanata-platform/compare/87789a08dddd...0656dd2cb31a
      **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.