[zanata/zanata-server] f91365: rhbz1148641 - disable comment when history popup i...

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: f91365d7a1497ca6838e0334dafe546e2a75aa8b
      https://github.com/zanata/zanata-server/commit/f91365d7a1497ca6838e0334dafe546e2a75aa8b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz1148641 - disable comment when history popup is due to concurrent conflict


  Commit: bc173d099f0900eb1d94f500b7a35a7a01b86559
      https://github.com/zanata/zanata-server/commit/bc173d099f0900eb1d94f500b7a35a7a01b86559
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  Merge pull request #601 from zanata/rhbz1148641

rhbz1148641 - disable comment when history popup is due to concurrent conflict


Compare: https://github.com/zanata/zanata-server/compare/0fa6d8509ff8...bc173d099f09