[zanata/zanata-platform] d5853d: fix(ZNTA-1865): Add TM Merge button title to JSF m...

[GitHub]

  Branch: refs/heads/ZNTA-1865-frontend
  Home:   https://github.com/zanata/zanata-platform
  Commit: d5853df7173e2899d57fb7cf00fd25b6abe93868
      https://github.com/zanata/zanata-platform/commit/d5853df7173e2899d57fb7cf00fd25b6abe93868
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix(ZNTA-1865): Add TM Merge button title to JSF messages.properties


  Commit: 8aadf82df83efd6fe6f68f0216d8296c5a65d288
      https://github.com/zanata/zanata-platform/commit/8aadf82df83efd6fe6f68f0216d8296c5a65d288
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

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

  Log Message:
  -----------
  perf(ZNTA-1865): Add timestamp to project request actions

Check timestamp of success objects to determine whether state should be
updated
Modify tests to pass with added timestamp meta


  Commit: 6272f9f9b2efb24d390ab0356eea1dcd98074646
      https://github.com/zanata/zanata-platform/commit/6272f9f9b2efb24d390ab0356eea1dcd98074646
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

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

  Log Message:
  -----------
  fix(ZNTA-1865): Handle project versions with no locales

Show only a notification in the modal if there are no locales for a
project version


  Commit: ef2eb0d425d8662d72cd39db0b995291467495af
      https://github.com/zanata/zanata-platform/commit/ef2eb0d425d8662d72cd39db0b995291467495af
  Author: Earl Floden <efloden at redhat.com>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java

  Log Message:
  -----------
  Merge branch 'ZNTA-1865-frontend' of github.com:zanata/zanata-platform into ZNTA-1865-frontend


Compare: https://github.com/zanata/zanata-platform/compare/beeea47c44b7...ef2eb0d425d8