[zanata/zanata] 17ec94: rhbz812730 - allow TM merge fuzzy text flow and bu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 17ec9492f87775287e71452aac8cf79a3b66aaff
      https://github.com/zanata/zanata/commit/17ec9492f87775287e71452aac8cf79a3b66aaff
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  rhbz812730 - allow TM merge fuzzy text flow and bug fixing


  Commit: 923973c2c6da63829a928439045bbadf1acb0437
      https://github.com/zanata/zanata/commit/923973c2c6da63829a928439045bbadf1acb0437
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-09 (Sun, 09 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java


Compare: https://github.com/zanata/zanata/compare/fc50a8ef075e...923973c2c6da