[zanata/zanata-server] fa50a8: Refactor query, UI and test

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: fa50a891bc03a86ac5677735d24109ac243dcd75
      https://github.com/zanata/zanata-server/commit/fa50a891bc03a86ac5677735d24109ac243dcd75
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    M zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/main/java/org/zanata/ui/CopyAction.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Refactor query, UI and test


  Commit: 5d1ce6f68ab50f01da3af966d688bf48efee5853
      https://github.com/zanata/zanata-server/commit/5d1ce6f68ab50f01da3af966d688bf48efee5853
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  WIP: implement project selector for merge translation dialog


Compare: https://github.com/zanata/zanata-server/compare/43e9f0736fa4...5d1ce6f68ab5