[zanata/zanata] fb450e: rhbz825076 - Proper handling of duplicate text flo...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: fb450e293676285c5a4e33a5925d0a2f12a31a48
      https://github.com/zanata/zanata/commit/fb450e293676285c5a4e33a5925d0a2f12a31a48
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  rhbz825076 - Proper handling of duplicate text flows in copy trans.

Copy trans now handles text flows with duplicate content in the same document while doing copy trans.
Hide a few properties on entities that should not ve visible but were made so by lombok.


  Commit: e67b310787526604a622ea8a5473e6706f5088b2
      https://github.com/zanata/zanata/commit/e67b310787526604a622ea8a5473e6706f5088b2
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


Compare: https://github.com/zanata/zanata/compare/618f5fc...e67b310