[zanata/zanata] bb3500: Merge branch 'release' into integration/master

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: bb35002d92fc7e05b80b08581377395b716f927f
      https://github.com/zanata/zanata/commit/bb35002d92fc7e05b80b08581377395b716f927f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java

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


  Commit: 7a0b35a6d17e0ec4795825e11ba4bd087922e5fb
      https://github.com/zanata/zanata/commit/7a0b35a6d17e0ec4795825e11ba4bd087922e5fb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java

  Log Message:
  -----------
  rhbz916830 - False positive in validation warnings, comparing wrong entries


  Commit: cdf750f67a2e54023e77d7e73110e56242103c59
      https://github.com/zanata/zanata/commit/cdf750f67a2e54023e77d7e73110e56242103c59
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java

  Log Message:
  -----------
  fix for https://bugzilla.redhat.com/show_bug.cgi?id=917897#c3


  Commit: 6809d01e118b63546ab9c7b6af22cbf6d5066709
      https://github.com/zanata/zanata/commit/6809d01e118b63546ab9c7b6af22cbf6d5066709
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    A zanata-war/src/main/java/org/zanata/exception/VirusDetectedException.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java

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


  Commit: b1648632f0e63e5723262cdcdddfeb4183b9be2f
      https://github.com/zanata/zanata/commit/b1648632f0e63e5723262cdcdddfeb4183b9be2f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java

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


Compare: https://github.com/zanata/zanata/compare/75fc1f260cec...b1648632f0e6