[zanata/zanata] 92ef58: Minor text fix.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 92ef583cb3cdc7f42249125714bb41fef96d0480
      https://github.com/zanata/zanata/commit/92ef583cb3cdc7f42249125714bb41fef96d0480
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Minor text fix.


  Commit: 5bcc75e0f8e999f73f7cfc84743e7bc56965615f
      https://github.com/zanata/zanata/commit/5bcc75e0f8e999f73f7cfc84743e7bc56965615f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml

  Log Message:
  -----------
  rhbz860902 - Backport new Copy Trans from master branch.

Also backport unit tests and change auto-copy trans on document push to be an aysnchronously fired. This means the document push will return immediately to the client while copy trans keeps running in the background.


  Commit: 88bcb2ddaeac5564e40c0cec1a0c5ab4037fa9c6
      https://github.com/zanata/zanata/commit/88bcb2ddaeac5564e40c0cec1a0c5ab4037fa9c6
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  rhbz860902 - Add new method to get or create a Text flow target.

Also disable automatic copy trans when pushing a document.


  Commit: a68e74aee86229c6848662ef4b074e68f647be73
      https://github.com/zanata/zanata/commit/a68e74aee86229c6848662ef4b074e68f647be73
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java

  Log Message:
  -----------
  rhbz860902 - Fix test. Add missing component.


  Commit: fb7abb144b8ba2dc7b900cb54546994839519b34
      https://github.com/zanata/zanata/commit/fb7abb144b8ba2dc7b900cb54546994839519b34
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
	zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
	zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
	zanata-war/src/main/resources/messages.properties
	zanata-war/src/main/webapp/iteration/copy_trans.xhtml
	zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
	zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml


Compare: https://github.com/zanata/zanata/compare/65a3c87a84fb...fb7abb144b8b