[zanata/zanata-server] 0d10ec: Implement when 'return to editor' from different p...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 0d10ec69a05c4205ba5c9cae65c405e6e214b193
      https://github.com/zanata/zanata-server/commit/0d10ec69a05c4205ba5c9cae65c405e6e214b193
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Implement when 'return to editor' from different page, modify translation is restore to editor


  Commit: 5176265708394e8b311b2ace22961bf8f3be9ae0
      https://github.com/zanata/zanata-server/commit/5176265708394e8b311b2ace22961bf8f3be9ae0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java

  Log Message:
  -----------
  Move event firing from presenter to ui


  Commit: c6cc2cbd5fe64a6894d51d89eac0266116709bbd
      https://github.com/zanata/zanata-server/commit/c6cc2cbd5fe64a6894d51d89eac0266116709bbd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1006063

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java


  Commit: 886883dcd3262a9aaeda8d5ea7220950bfa440d2
      https://github.com/zanata/zanata-server/commit/886883dcd3262a9aaeda8d5ea7220950bfa440d2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Merge pull request #207 from zanata/rhbz1006063

Implement when 'return to editor' from different page, modify translation is restore to editor


Compare: https://github.com/zanata/zanata-server/compare/45d990711a10...886883dcd326