[zanata/zanata-server] 511ed1: Create modal for merge-trans operations from versi...

[GitHub]

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

  Changed paths:
    A 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/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml

  Log Message:
  -----------
  Create modal for merge-trans operations from version page


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

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/AbstractCopyAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml

  Log Message:
  -----------
  Create loading component for copy actions


Compare: https://github.com/zanata/zanata-server/compare/c05f4e6d1cda...5f2c1a3a1463