[zanata/zanata-server] 1193a6: Update TM merge to support option for imported TMs...

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: 1193a6a6b32fdd499239523ecbbb1789e8c38d19
      https://github.com/zanata/zanata-server/commit/1193a6a6b32fdd499239523ecbbb1789e8c38d19
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    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/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    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/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.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:
  -----------
  Update TM merge to support option for imported TMs.