[zanata/zanata-server] daabf1: rhbz965890 add params to source upload UI for exis...

Mon Oct 21 06:50:41 UTC 2013

  Branch: refs/heads/legacy
  Home:   https://github.com/zanata/zanata-server
  Commit: daabf1f0e62269b8b2316cd3734105fb6c5ea94c
      https://github.com/zanata/zanata-server/commit/daabf1f0e62269b8b2316cd3734105fb6c5ea94c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  rhbz965890 add params to source upload UI for existing document

  Commit: e0b05df70770801f71bc22b73d3d810fb62282f3
      https://github.com/zanata/zanata-server/commit/e0b05df70770801f71bc22b73d3d810fb62282f3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/ContentStateConstraints.java

  Log Message:
  -----------
  rhbz953734 - add new class to better support content state filtering

  Commit: 466eab70edf881d7ddc176425ca077647c28a310
      https://github.com/zanata/zanata-server/commit/466eab70edf881d7ddc176425ca077647c28a310
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java

  Log Message:
  -----------
  rhbz953734 - fix unit tests

  Commit: be192c6b9833104c993388e05b1188ba1b9f5104
      https://github.com/zanata/zanata-server/commit/be192c6b9833104c993388e05b1188ba1b9f5104
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.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/TranslationFileServiceImpl.java

  Log Message:
  -----------
  Merge branch 'master' into review-2-rhbz953734

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java

  Commit: ea851f86f40a90d14db0988bdc0a120df91c91cb
      https://github.com/zanata/zanata-server/commit/ea851f86f40a90d14db0988bdc0a120df91c91cb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  rhbz953734 - attempt to fix test

  Commit: 63b40d8573a62bd83363a3b20d4788f8f1b18d3b
      https://github.com/zanata/zanata-server/commit/63b40d8573a62bd83363a3b20d4788f8f1b18d3b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  rhbz953734 - disable failing tests for now

  Commit: 97dd3e54f15db7f60ecf159549b62a09fdd33018
      https://github.com/zanata/zanata-server/commit/97dd3e54f15db7f60ecf159549b62a09fdd33018
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Fix minor UI and project edit page render

  Commit: fab624fbb29c367b4d3a6676379203b6c92de87e
      https://github.com/zanata/zanata-server/commit/fab624fbb29c367b4d3a6676379203b6c92de87e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java

  Log Message:
  -----------
  rhbz953734 - disable test in StatisticsRestTest

  Commit: 99845faed657228d7009aa5bd5ef036aaf2af08f
      https://github.com/zanata/zanata-server/commit/99845faed657228d7009aa5bd5ef036aaf2af08f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  attempt to fix test

  Commit: 2590352b675704f9ace98a5c015480b681fe8de9
      https://github.com/zanata/zanata-server/commit/2590352b675704f9ace98a5c015480b681fe8de9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasTranslationStats.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.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/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStatsResult.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.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/DocumentListPresenterTest.java

  Log Message:
  -----------
  rhbz953734 - fix test after refactor API statistics dto

  Commit: c3502e2e0913d95e86e1dbbff5e27e802d985046
      https://github.com/zanata/zanata-server/commit/c3502e2e0913d95e86e1dbbff5e27e802d985046
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  rhbz953734 - fix test

  Commit: 24197b2681cb5c663afab34ccb33d5b6801fe001
      https://github.com/zanata/zanata-server/commit/24197b2681cb5c663afab34ccb33d5b6801fe001
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/NamedDocument.java
    A zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    A zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    A zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    A zanata-model/src/main/java/org/zanata/model/SourceContents.java
    A zanata-model/src/main/java/org/zanata/model/TargetContents.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/rest/service/ExportAllLocalesStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportSingleLocaleStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/resources/org/zanata/tmx14.dtd

  Log Message:
  -----------
  rhbz960786 Add REST resource which exports translation memory for a project iteration

  Commit: 6fcd4f1aed3b91843ddb6d639649ba0e7c6072ac
      https://github.com/zanata/zanata-server/commit/6fcd4f1aed3b91843ddb6d639649ba0e7c6072ac
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportSingleLocaleStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  rhbz960786 Use LocaleId for SourceContents.getTargetContents()

  Commit: fb114f8092e79307013c07ccf4dbb90e6ee1bfd8
      https://github.com/zanata/zanata-server/commit/fb114f8092e79307013c07ccf4dbb90e6ee1bfd8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-model/src/main/java/org/zanata/model/TargetContents.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportAllLocalesStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportSingleLocaleStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  rhbz960786 Use same strategy whether exporting one or all locales to TMX

  Commit: a265a64501810f58839af61e5ad79e66a51ec2c3
      https://github.com/zanata/zanata-server/commit/a265a64501810f58839af61e5ad79e66a51ec2c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java

  Log Message:
  -----------
  Refactor to deduplicate retrieveAndCheckIteration

  Commit: c7956d882a3835e44168596d98c311d058f17992
      https://github.com/zanata/zanata-server/commit/c7956d882a3835e44168596d98c311d058f17992
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Refactor to deduplicate validateTargetLocale

  Commit: e7f315ded85bc1fba849f093f1e63b97063ad285
      https://github.com/zanata/zanata-server/commit/e7f315ded85bc1fba849f093f1e63b97063ad285
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Rename method

  Commit: 8ac6d10afc1128d647a86ab0e1c5cd9c96c91f11
      https://github.com/zanata/zanata-server/commit/8ac6d10afc1128d647a86ab0e1c5cd9c96c91f11
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java

  Log Message:
  -----------
  Refactor ProjectService, ProjectIterationService, LocaleServiceImpl; Add some null annotations

  Commit: 08df1115ac91ee9ddc9c3aea01dc6337a9e47c15
      https://github.com/zanata/zanata-server/commit/08df1115ac91ee9ddc9c3aea01dc6337a9e47c15
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  Simplify exception handling when validating locales

  Commit: d00835516f584d3d6a13c19514861a1d895c1329
      https://github.com/zanata/zanata-server/commit/d00835516f584d3d6a13c19514861a1d895c1329
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Fix minor css

  Commit: 8420f92f73d3ad1f9f63b2491b8b7ea9e55f4616
      https://github.com/zanata/zanata-server/commit/8420f92f73d3ad1f9f63b2491b8b7ea9e55f4616
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

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

  Log Message:
  -----------
  fix error when creating new version with customise validation list

  Commit: 06098bd14d72585473ef1e9409ea2d96306c8c7e
      https://github.com/zanata/zanata-server/commit/06098bd14d72585473ef1e9409ea2d96306c8c7e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    A zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Extract methods into RestSlugValidator

  Commit: 95f6f18650ea4f7d204a9df20618b4c27a1534de
      https://github.com/zanata/zanata-server/commit/95f6f18650ea4f7d204a9df20618b4c27a1534de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    R zanata-model/src/main/java/org/zanata/model/NamedDocument.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Rename NamedDocument to DocumentWithId, replace getName with getQualifiedDocId

  Commit: 373135d157d902ce7e708ef76d027af14bf431b4
      https://github.com/zanata/zanata-server/commit/373135d157d902ce7e708ef76d027af14bf431b4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java

  Log Message:
  -----------
  Mark getAllTargetContents as @Transient

  Commit: 5f9ccf11ff9b5a3846cbd5bd5d9f23c15f33c1b8
      https://github.com/zanata/zanata-server/commit/5f9ccf11ff9b5a3846cbd5bd5d9f23c15f33c1b8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java

  Log Message:
  -----------
  Clean up for FindBugs

  Commit: 6ea70ea5eae5704dd019dfc25a66510e59c46f30
      https://github.com/zanata/zanata-server/commit/6ea70ea5eae5704dd019dfc25a66510e59c46f30
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java

  Log Message:
  -----------
  Clean up for FindBugs

  Commit: 9cbe3e775307d5a8b536993ea7e82328086e3f13
      https://github.com/zanata/zanata-server/commit/9cbe3e775307d5a8b536993ea7e82328086e3f13
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java

  Log Message:
  -----------
  Mark new methods as @Transient

  Commit: 6bec6145d4b9f8543a8ed4e5a1081ef1f1bb5515
      https://github.com/zanata/zanata-server/commit/6bec6145d4b9f8543a8ed4e5a1081ef1f1bb5515
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix join language team table doesn't gets updated (ajax) when admin join

  Commit: 6d05a6cfae5c54d3a7f3eef56294aedbd3fe8214
      https://github.com/zanata/zanata-server/commit/6d05a6cfae5c54d3a7f3eef56294aedbd3fe8214
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java

  Log Message:
  -----------
  Remove unused injected field

  Commit: 5106d442ddd29a9c7347d221f6c7682f8b336525
      https://github.com/zanata/zanata-server/commit/5106d442ddd29a9c7347d221f6c7682f8b336525
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  fix contact team coordinator - no locale in breadcrumb, cancel button returns error - urlrewrite 47 param 2

  Commit: 60e8fec59655902d2ae6cec7c2757c92de393936
      https://github.com/zanata/zanata-server/commit/60e8fec59655902d2ae6cec7c2757c92de393936
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/package-info.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.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/EmailChangeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    A zanata-war/src/main/java/org/zanata/service/impl/package-info.java

  Log Message:
  -----------
  Moved @AutoCreate to package-info.java to ensure that all components get it

  Commit: 79d2016a5582cd9720bb37e853d6db7ceb8c7f72
      https://github.com/zanata/zanata-server/commit/79d2016a5582cd9720bb37e853d6db7ceb8c7f72
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java

  Log Message:
  -----------
  Make method public again

  Commit: e65841dd1f055021ec0b1ce2cbbad16f08bf38ec
      https://github.com/zanata/zanata-server/commit/e65841dd1f055021ec0b1ce2cbbad16f08bf38ec
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoNonReviewable.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoReviewable.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportNonReviewable.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportReviewable.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/transformer/TargetCommentTransformer.java
    A zanata-war/src/main/java/org/zanata/transformer/TargetTransformer.java
    A zanata-war/src/main/java/org/zanata/transformer/Transformer.java
    M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html

  Log Message:
  -----------
  complete translation merge concordion test case for auto and refactoring

  Commit: 23616af2c630dcc6c396a14e9fa7779b964ab08f
      https://github.com/zanata/zanata-server/commit/23616af2c630dcc6c396a14e9fa7779b964ab08f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html

  Log Message:
  -----------
  written concordion test cases for merge type IMPORT

  Commit: 9bb4ca6eaa7eab3f6a269e8ffdef9d2574b285ff
      https://github.com/zanata/zanata-server/commit/9bb4ca6eaa7eab3f6a269e8ffdef9d2574b285ff
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/transformer/TargetTransformer.java
    M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html

  Log Message:
  -----------
  refactro merge type IMPORT

  Commit: cd673275095b842ecd73ca950af34f4c145ae606
      https://github.com/zanata/zanata-server/commit/cd673275095b842ecd73ca950af34f4c145ae606
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
    A zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeServiceServerNull.html

  Log Message:
  -----------
  add merge service and test for case when server has null target

  Commit: c42c64913963d3650022ae5515cc8341be7298d8
      https://github.com/zanata/zanata-server/commit/c42c64913963d3650022ae5515cc8341be7298d8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  refactor TranslationServiceImpl to use merge service

  Commit: 57684fca33c6c645d34b55e4b7315c106b839cfd
      https://github.com/zanata/zanata-server/commit/57684fca33c6c645d34b55e4b7315c106b839cfd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  promote concordion dep to server and tweek surefire to run junit and testng together

  Commit: cd3ee9e0cf13269cca70a7d9a3ab64dc82144052
      https://github.com/zanata/zanata-server/commit/cd3ee9e0cf13269cca70a7d9a3ab64dc82144052
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java

  Log Message:
  -----------
  fix issues

  Commit: 782a36f314caa9c6218155397aed1cc321817993
      https://github.com/zanata/zanata-server/commit/782a36f314caa9c6218155397aed1cc321817993
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java

  Log Message:
  -----------
  clean up

  Commit: 782ba42957123722642365a9360ddde24019f048
      https://github.com/zanata/zanata-server/commit/782ba42957123722642365a9360ddde24019f048
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java

  Log Message:
  -----------
  rhbz953734 - fix issue save Approved will trigger another implicit save as Translated

  Commit: 8e9e1b5b2580ff5490b21b480f0b39b3ae0941c8
      https://github.com/zanata/zanata-server/commit/8e9e1b5b2580ff5490b21b480f0b39b3ae0941c8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  rhbz953734 - fix style in translation history table

  Commit: 67e4e085c2c00a48e7aa7f144d87cd958a2f7d5f
      https://github.com/zanata/zanata-server/commit/67e4e085c2c00a48e7aa7f144d87cd958a2f7d5f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java

  Log Message:
  -----------
  rhbz953734 - fix issue: jsp can't find setter

  Commit: 17c4c6e16ee295e78c874f2c3d870e0ca18ebec3
      https://github.com/zanata/zanata-server/commit/17c4c6e16ee295e78c874f2c3d870e0ca18ebec3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

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

  Log Message:
  -----------
  fix rebase error

  Commit: cd9108b3dbc3c5433d055d408d4ef49b14fccd5e
      https://github.com/zanata/zanata-server/commit/cd9108b3dbc3c5433d055d408d4ef49b14fccd5e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy

  Log Message:
  -----------
  fix rebase error

  Commit: 1e32fcc22ed0cbcabd44b0f69e160bab9a3b4c61
      https://github.com/zanata/zanata-server/commit/1e32fcc22ed0cbcabd44b0f69e160bab9a3b4c61
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  disable junit test run

  Commit: 3274f00329f2626ca870be06274ea174acc2f8ae
      https://github.com/zanata/zanata-server/commit/3274f00329f2626ca870be06274ea174acc2f8ae
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  rhbz953734 - add tooltip to message filter checkbox

  Commit: ff92199df256aefa46649455b4eb20eb4ac446bc
      https://github.com/zanata/zanata-server/commit/ff92199df256aefa46649455b4eb20eb4ac446bc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java

  Log Message:
  -----------
  rhbz953734 - change document list column

  Commit: bd8f6982d64cfc8a8023c23a1160a2bfa17c1dfc
      https://github.com/zanata/zanata-server/commit/bd8f6982d64cfc8a8023c23a1160a2bfa17c1dfc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  fix test after api change

  Commit: 468b4c9656a01abade2e093793ef8bf4732b08f3
      https://github.com/zanata/zanata-server/commit/468b4c9656a01abade2e093793ef8bf4732b08f3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  fix link to add user in locale team not showing

  Commit: 7dad1102ca291f4477f8758e5cf1a30952a9d47d
      https://github.com/zanata/zanata-server/commit/7dad1102ca291f4477f8758e5cf1a30952a9d47d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix add user into locale team from search result not working

  Commit: 19866b5c52182f1b21716509465e912bed0157d2
      https://github.com/zanata/zanata-server/commit/19866b5c52182f1b21716509465e912bed0157d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix problem with locale members removal

  Commit: e87e71502c20fb09a7f059c48f2cc8fbf65e658b
      https://github.com/zanata/zanata-server/commit/e87e71502c20fb09a7f059c48f2cc8fbf65e658b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Revert "Fix problem with locale members removal"

This reverts commit 19866b5c52182f1b21716509465e912bed0157d2.

  Commit: 264de81bbb550c81840cbaaf9a7d5bee2b4ab1a7
      https://github.com/zanata/zanata-server/commit/264de81bbb550c81840cbaaf9a7d5bee2b4ab1a7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java

  Log Message:
  -----------
  Fix issue with leaving locale group

  Commit: 9890b3f09ac7d1ead0a4c56662877988ac46d3aa
      https://github.com/zanata/zanata-server/commit/9890b3f09ac7d1ead0a4c56662877988ac46d3aa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/IDocumentHistory.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Add getSourceLocaleId to SimpleNamedDocument so that TMXStreamingOutput can get it from each doc

  Commit: 743ed092df9cb46f3546557079c96b8e3f5ab976
      https://github.com/zanata/zanata-server/commit/743ed092df9cb46f3546557079c96b8e3f5ab976
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java

  Log Message:
  -----------
  Write TMX with srclang=*all* (using ThreadLocal workaround)

  Commit: 41416ea022bf2b1665a6612ae09479f5fa93727d
      https://github.com/zanata/zanata-server/commit/41416ea022bf2b1665a6612ae09479f5fa93727d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix urlrewrite for contact and request join language

  Commit: d4f476695396bf3114b2c477fae653457762f6da
      https://github.com/zanata/zanata-server/commit/d4f476695396bf3114b2c477fae653457762f6da
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/exception/ChunkUploadException.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  use exceptions for file upload precondition failure

  Commit: 64e56edcafa6eaea37766ecf45dc1c8bc34fd5bd
      https://github.com/zanata/zanata-server/commit/64e56edcafa6eaea37766ecf45dc1c8bc34fd5bd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  remove redundant parameter for saving upload part

  Commit: 63f2c6aa0e29d4b8b4ae7d4435568e8d4db4cf0a
      https://github.com/zanata/zanata-server/commit/63f2c6aa0e29d4b8b4ae7d4435568e8d4db4cf0a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  split method for saving first upload part

  Commit: 07d5367d25559955824577701e4c4b750835d10e
      https://github.com/zanata/zanata-server/commit/07d5367d25559955824577701e4c4b750835d10e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  split out method for combining upload to temp file

  Commit: b4f3c821c4d576cc06bad4382004b06c4b04328a
      https://github.com/zanata/zanata-server/commit/b4f3c821c4d576cc06bad4382004b06c4b04328a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  split out method to persist temp file from upload

  Commit: a9eb1b79c6a02d80f4b1cefa73e31829b145960d
      https://github.com/zanata/zanata-server/commit/a9eb1b79c6a02d80f4b1cefa73e31829b145960d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  split out method to process adapter file

  Commit: 9ed15e1c498ab9e790d73ac7e346960c07ac25f5
      https://github.com/zanata/zanata-server/commit/9ed15e1c498ab9e790d73ac7e346960c07ac25f5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  add convenience method for parsing pot file

  Commit: c88619dce1fa74f683cf49de9b85e65b17d17ae1
      https://github.com/zanata/zanata-server/commit/c88619dce1fa74f683cf49de9b85e65b17d17ae1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java

  Log Message:
  -----------
  fix NPE when looking up params for a nonexistent document

  Commit: 9fb6b664f636742494c0fd56b781e5088f9a58c0
      https://github.com/zanata/zanata-server/commit/9fb6b664f636742494c0fd56b781e5088f9a58c0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  use clearer control flow for source document upload

  Commit: 770130b0fda81a66cd9625deb1ebf1786378f2b5
      https://github.com/zanata/zanata-server/commit/770130b0fda81a66cd9625deb1ebf1786378f2b5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  remove unused methods

  Commit: 407fac20f17e52c08bd2ec1710e0735c3ed7583e
      https://github.com/zanata/zanata-server/commit/407fac20f17e52c08bd2ec1710e0735c3ed7583e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  handle failed virus scan at higher level

  Commit: d72a461bd4420af594b233aa1e495f109eea3341
      https://github.com/zanata/zanata-server/commit/d72a461bd4420af594b233aa1e495f109eea3341
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

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

  Log Message:
  -----------
  add more specific translation parsing methods to TranslationFileService

  Commit: 8fc58ba451948be5da9d8b8f3c31d6d61d4f4c96
      https://github.com/zanata/zanata-server/commit/8fc58ba451948be5da9d8b8f3c31d6d61d4f4c96
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  refactor translation file upload for readability

  Commit: 3be035177ee033f5df2cec2bde7d9e7589c4ce7b
      https://github.com/zanata/zanata-server/commit/3be035177ee033f5df2cec2bde7d9e7589c4ce7b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  remove unused methods

  Commit: 0dd1c74770fdfe9d522822f162cb3e164c78beef
      https://github.com/zanata/zanata-server/commit/0dd1c74770fdfe9d522822f162cb3e164c78beef
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java

  Log Message:
  -----------
  Mark HDocument.getSourceLocaleId() as @Transient

  Commit: 90ee1ab5860d162cf1c891d6b30cb9ba42beb57e
      https://github.com/zanata/zanata-server/commit/90ee1ab5860d162cf1c891d6b30cb9ba42beb57e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml

  Log Message:
  -----------
  rhbz953734 - fix after api change

  Commit: 72a815b962603d0960009667562518f36caed0f3
      https://github.com/zanata/zanata-server/commit/72a815b962603d0960009667562518f36caed0f3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  rhbz953734 - restrict merge type IMPORT to only project maintainers

  Commit: 05d441d35a2ef66a325676e228807b9cc2f27817
      https://github.com/zanata/zanata-server/commit/05d441d35a2ef66a325676e228807b9cc2f27817
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  rhbz953734 - change review permission to use drools rule

- user with reviewer role and also part of language team can review translation
- project maintainer can review translation

  Commit: aa5daf4e0bdffdaeca54b127739dabb27b729b40
      https://github.com/zanata/zanata-server/commit/aa5daf4e0bdffdaeca54b127739dabb27b729b40
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

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

  Log Message:
  -----------
  rhbz953734 - TranslationService will prevent non-reviwer to save in review state

  Commit: 77d73bb439d27925e7d8b341993288d8d87fb604
      https://github.com/zanata/zanata-server/commit/77d73bb439d27925e7d8b341993288d8d87fb604
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix language team member removal.

After removing a language team member, the page context is lost and subsequent actions on the page fail. Using h:commandButton instead of a4f:commandButton fixes this problem.

  Commit: 9ef96db4802664012d331ab5a9d282d8ea22c3e1
      https://github.com/zanata/zanata-server/commit/9ef96db4802664012d331ab5a9d282d8ea22c3e1
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Use default standard Jboss location.

  Commit: 48d66495265f9582f186b9258b21d88b148ee791
      https://github.com/zanata/zanata-server/commit/48d66495265f9582f186b9258b21d88b148ee791
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  rhbz965890 use upload params if present

  Commit: 62e939b3b5a90e50fd02b667a094385b146f0fdd
      https://github.com/zanata/zanata-server/commit/62e939b3b5a90e50fd02b667a094385b146f0fdd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  re-enable junit test

  Commit: c9ae8e98bcc35176e74a511f0d204e4f107dcdbd
      https://github.com/zanata/zanata-server/commit/c9ae8e98bcc35176e74a511f0d204e4f107dcdbd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Fix edit version button in project page

  Commit: 2af4cc003480e7204e4ce1a5174a356cc514e356
      https://github.com/zanata/zanata-server/commit/2af4cc003480e7204e4ce1a5174a356cc514e356
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix search group popup not working in request group

  Commit: 93c1768a1b479f0c6dbbb1956317d99b328652b3
      https://github.com/zanata/zanata-server/commit/93c1768a1b479f0c6dbbb1956317d99b328652b3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: 7898b624950c2fdbc3420e70be974bba9d083774
      https://github.com/zanata/zanata-server/commit/7898b624950c2fdbc3420e70be974bba9d083774
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Fix css line-height

  Commit: 510da0e38c3680242f773d16918224aeecb1edbe
      https://github.com/zanata/zanata-server/commit/510da0e38c3680242f773d16918224aeecb1edbe
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Disable temporary deployment archive creation.

  Commit: 44514bdc369f09e498f6d342f548f4b43c6d3766
      https://github.com/zanata/zanata-server/commit/44514bdc369f09e498f6d342f548f4b43c6d3766
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml

  Log Message:
  -----------
  fix download files link and css

  Commit: 545f233497d2c1d06006b2f92666428746342a6f
      https://github.com/zanata/zanata-server/commit/545f233497d2c1d06006b2f92666428746342a6f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: 99d0310881bf345e31517ca799363b2c00a60f3f
      https://github.com/zanata/zanata-server/commit/99d0310881bf345e31517ca799363b2c00a60f3f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Add port offset to the arquillian standalone configuration.

  Commit: 399af15cf0361595175204a844c94e9bc2d8064e
      https://github.com/zanata/zanata-server/commit/399af15cf0361595175204a844c94e9bc2d8064e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    A zanata-war/src/test/groovy/org/zanata/ZanataTest.groovy
    A zanata-war/src/test/resources/org/zanata/Zanata.html

  Log Message:
  -----------
  hacky way of generating concordion index page for tests

  Commit: 7995fa7a4e36027c23368754395c60da02b729a3
      https://github.com/zanata/zanata-server/commit/7995fa7a4e36027c23368754395c60da02b729a3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Fix css in group main page

  Commit: 5ac0aca7400709257e76fd6e37da909102d0a845
      https://github.com/zanata/zanata-server/commit/5ac0aca7400709257e76fd6e37da909102d0a845
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: d8895fc21e346619850ad5592749fe3925c452ef
      https://github.com/zanata/zanata-server/commit/d8895fc21e346619850ad5592749fe3925c452ef
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_legend.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  fix copy trans css

  Commit: 363bc42b7044a8bafe728bc2e083112d6e1e6f89
      https://github.com/zanata/zanata-server/commit/363bc42b7044a8bafe728bc2e083112d6e1e6f89
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Fix deprecated 'Rerender' tag

  Commit: b0f1b076323bafed67af0ab0717ae8c316c729bb
      https://github.com/zanata/zanata-server/commit/b0f1b076323bafed67af0ab0717ae8c316c729bb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    A zanata-war/src/main/webapp/account/email_validation.xhtml

  Log Message:
  -----------
  Fix email validation issue

  Commit: 3445428d4344861cc8909f2812a6839833b403af
      https://github.com/zanata/zanata-server/commit/3445428d4344861cc8909f2812a6839833b403af
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  fix filtering via name in manage user, source files, and document

  Commit: abfd759fc13701f82d0c7763c8622c38f056c4f4
      https://github.com/zanata/zanata-server/commit/abfd759fc13701f82d0c7763c8622c38f056c4f4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Add specific management port to arquillian.xml when using port offsets.

  Commit: 64759801036ab3d656c8d1f68a7c27df5a239b70
      https://github.com/zanata/zanata-server/commit/64759801036ab3d656c8d1f68a7c27df5a239b70
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  fix download translation file, download zip file

  Commit: bc1182824bc5208f294e28a0885e9df0b565dc9e
      https://github.com/zanata/zanata-server/commit/bc1182824bc5208f294e28a0885e9df0b565dc9e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: 40f564a3bdb3061ed1882740889ffe44444f5210
      https://github.com/zanata/zanata-server/commit/40f564a3bdb3061ed1882740889ffe44444f5210
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Revert to default jboss location

  Commit: ee2717c5e92fc3bce266ad288499c50b3e3502c2
      https://github.com/zanata/zanata-server/commit/ee2717c5e92fc3bce266ad288499c50b3e3502c2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  fix download source file

  Commit: 731963266aa6d83f13348933e5ddeb9b0f278c93
      https://github.com/zanata/zanata-server/commit/731963266aa6d83f13348933e5ddeb9b0f278c93
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: 0f505a7db690fed37ccc5af85a6599fcba69b45b
      https://github.com/zanata/zanata-server/commit/0f505a7db690fed37ccc5af85a6599fcba69b45b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java

  Log Message:
  -----------
  Fix reindex db

  Commit: 05db3a4ecb224f8b0a132719427c519ac33d1dc4
      https://github.com/zanata/zanata-server/commit/05db3a4ecb224f8b0a132719427c519ac33d1dc4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Change lucene version to 3.5.0

  Commit: 92fbf82ec60e6fdcaeb60dbf2d5d23503e82e9c3
      https://github.com/zanata/zanata-server/commit/92fbf82ec60e6fdcaeb60dbf2d5d23503e82e9c3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Change lucene version to 3.5.0

Problem in general project search: java.lang.VerifyError: class org.hibernate.search.reader.impl.CacheableMultiReader overrides final method incRef.()V

https://forum.hibernate.org/viewtopic.php?p=2454683
https://community.jboss.org/message/790543

  Commit: bc9992b51b97c9d796924e19fa1ede294ccb72bf
      https://github.com/zanata/zanata-server/commit/bc9992b51b97c9d796924e19fa1ede294ccb72bf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata-server into seam230final

  Commit: a992cbf37e0f9d3f6d5449ea209e3d5e07537722
      https://github.com/zanata/zanata-server/commit/a992cbf37e0f9d3f6d5449ea209e3d5e07537722
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  add option to elide duplicate id in okapi adapters

  Commit: b50b68b7c587735ddb81594c958fd1862ed81cf7
      https://github.com/zanata/zanata-server/commit/b50b68b7c587735ddb81594c958fd1862ed81cf7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Fix group filtering

  Commit: 1fee4f286bc6a5ff7e68a16e11d084e8bb33c5c2
      https://github.com/zanata/zanata-server/commit/1fee4f286bc6a5ff7e68a16e11d084e8bb33c5c2
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Fix "Request to join Group" url in version group page.

  Commit: bc0f6e927a5b71ecc257c7ed8cd5e2e8a4f6ac2c
      https://github.com/zanata/zanata-server/commit/bc0f6e927a5b71ecc257c7ed8cd5e2e8a4f6ac2c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  make all okapi adapters elide identical duplicates

  Commit: c6d7236cd7dc9c27ae45e2b6e88c6c2b760ac48f
      https://github.com/zanata/zanata-server/commit/c6d7236cd7dc9c27ae45e2b6e88c6c2b760ac48f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java

  Log Message:
  -----------
  use content hash for idml text flow id

  Commit: f5538110c8f10d28bff3989057c62d6381fd4178
      https://github.com/zanata/zanata-server/commit/f5538110c8f10d28bff3989057c62d6381fd4178
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  fix group filtering

  Commit: 84226e4d8a932685fa278d507aef1c1ca102d4c1
      https://github.com/zanata/zanata-server/commit/84226e4d8a932685fa278d507aef1c1ca102d4c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml

  Log Message:
  -----------
  Fix add new language

  Commit: e93fa406082e6426f02a54fc84b57ccac6190744
      https://github.com/zanata/zanata-server/commit/e93fa406082e6426f02a54fc84b57ccac6190744
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  fix server config page

  Commit: baa10425de679eff50868910da60235b3d58b1dc
      https://github.com/zanata/zanata-server/commit/baa10425de679eff50868910da60235b3d58b1dc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  update javadoc for GenericOkapiFilterAdapter

  Commit: 00766c8d02f1aa8f8af136d0d72eb61612cc32d0
      https://github.com/zanata/zanata-server/commit/00766c8d02f1aa8f8af136d0d72eb61612cc32d0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  update changelog for attention key and adapter params

  Commit: 7d0fdb12c9ed5d4d9b9c9e542846e5593976685f
      https://github.com/zanata/zanata-server/commit/7d0fdb12c9ed5d4d9b9c9e542846e5593976685f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Fix remaining automatic field validations.

Need to add enclose="true" to the s:decorate tags.

  Commit: 9af71f221acab25948fc22987674fa3d1967033f
      https://github.com/zanata/zanata-server/commit/9af71f221acab25948fc22987674fa3d1967033f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  add test for uploading document when not logged in

  Commit: 85cf079e2ac2ec11df776b025d9f486f768d950a
      https://github.com/zanata/zanata-server/commit/85cf079e2ac2ec11df776b025d9f486f768d950a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

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

  Log Message:
  -----------
  add tests for uploading document with missing form parameters

  Commit: b02adefe576ab0a928886f1b65c0fb94dd506df6
      https://github.com/zanata/zanata-server/commit/b02adefe576ab0a928886f1b65c0fb94dd506df6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  do not send hash from server in error message

  Commit: a7f9495cb23dc85f68fa12a69a648f4338bf228a
      https://github.com/zanata/zanata-server/commit/a7f9495cb23dc85f68fa12a69a648f4338bf228a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

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

  Log Message:
  -----------
  add tests for uploading document with invalid type or hash

  Commit: bf71ef545e19313a688190b036058d34803f4a17
      https://github.com/zanata/zanata-server/commit/bf71ef545e19313a688190b036058d34803f4a17
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/seam/AutowireContext.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java

  Log Message:
  -----------
  Fix Seam Autowire issue when handling cycles and non-resolvable components.

Add tests for these scenarios.

  Commit: 200c318daf0a87f827f32387161eab42553eaf88
      https://github.com/zanata/zanata-server/commit/200c318daf0a87f827f32387161eab42553eaf88
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    R zanata-war/src/test/java/org/zanata/seam/AutowireContext.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContextsTest.java

  Log Message:
  -----------
  Introduction of Contexts for Seam Autowire.

Includes unit tests.
Still not integrated into SeamAutowire.

  Commit: c9883ad886ae2f686b64402758cdf4f2abb5e001
      https://github.com/zanata/zanata-server/commit/c9883ad886ae2f686b64402758cdf4f2abb5e001
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml

  Log Message:
  -----------
  More remaining automatic field validations.

Need to add enclose="true" to the s:decorate tags.

  Commit: b2bf79b0ba828d3080b603de0f3f9c08782a0697
      https://github.com/zanata/zanata-server/commit/b2bf79b0ba828d3080b603de0f3f9c08782a0697
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    M zanata-model/src/main/java/org/zanata/model/validator/Url.java
    M zanata-war/src/main/java/org/zanata/action/validator/EmailList.java
    M zanata-war/src/main/java/org/zanata/action/validator/NotDuplicateEmail.java
    A zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Add validation messages property file.

This is to conform to Hibernate Validator's expected file name.

  Commit: 9491888cf4b37d53f8e5b9c8315e4d04ca69d513
      https://github.com/zanata/zanata-server/commit/9491888cf4b37d53f8e5b9c8315e4d04ca69d513
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml

  Log Message:
  -----------
  Enabled validation when creating project, version, group

  Commit: c2b58dfb358cef49a09c146d893e7ec80a8148b7
      https://github.com/zanata/zanata-server/commit/c2b58dfb358cef49a09c146d893e7ec80a8148b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml

  Log Message:
  -----------
  Fix team members link button in language page

  Commit: 565ea8931608a0881e8379ce5dde6deaaffceba0
      https://github.com/zanata/zanata-server/commit/565ea8931608a0881e8379ce5dde6deaaffceba0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/admin/userdetail.xhtml

  Log Message:
  -----------
  fix empty username allowed in user manage

  Commit: 4912d116d89d3a5ea178bc26f39083b561adf1d3
      https://github.com/zanata/zanata-server/commit/4912d116d89d3a5ea178bc26f39083b561adf1d3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/admin/roledetail.xhtml

  Log Message:
  -----------
  Fix empty role name allowed with create/modify role

  Commit: bac0316af13c4fd7309efdd2cddc231ad1af32b8
      https://github.com/zanata/zanata-server/commit/bac0316af13c4fd7309efdd2cddc231ad1af32b8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/resources/css/jsf-skin.css
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Fix css in overall statistics on server

  Commit: 3ab369528e96be2e32abb0c23962e0a1a307256f
      https://github.com/zanata/zanata-server/commit/3ab369528e96be2e32abb0c23962e0a1a307256f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

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

  Log Message:
  -----------
  Remove console logging from test

  Commit: bdc783fda29de3ea9f13462d7ea09fc8be796bd4
      https://github.com/zanata/zanata-server/commit/bdc783fda29de3ea9f13462d7ea09fc8be796bd4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-model/pom.xml

  Log Message:
  -----------
  Add querydsl (disabled)

  Commit: 697992a2afc00ffabae0a2c23018883ad94f6dfa
      https://github.com/zanata/zanata-server/commit/697992a2afc00ffabae0a2c23018883ad94f6dfa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  fix ajax tag action to listener

  Commit: 12091369a83a88986d2d4a4594977aaec7ea8295
      https://github.com/zanata/zanata-server/commit/12091369a83a88986d2d4a4594977aaec7ea8295
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix ajax checkbox functionality.

  Commit: 7a08edd7721c1469a0e753fa54f464e8ba437e82
      https://github.com/zanata/zanata-server/commit/7a08edd7721c1469a0e753fa54f464e8ba437e82
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/css/jsf-skin.css
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
	zanata-war/src/main/webapp/language/language.xhtml

  Commit: d52973dcb7eca3f291e62cd54396743ae4934435
      https://github.com/zanata/zanata-server/commit/d52973dcb7eca3f291e62cd54396743ae4934435
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    A zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/package-info.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  rhbz 960786 Export translation memory as TMX (all, project, or iteration)

Change TMX generation to iterate over SourceContents/TextFlows instead of documents.
Add TextFlowStreamDAO to iterate through all HTextFlows (and their Targets) efficiently.
Add action links to export TMX from the web UI.
Remove some instances of eager loading which don't play nicely with mysql resultset streaming.
Check for statements executed while streaming ResultSet is active (breaks mysql).

  Commit: 3692f46ae368fc4867326cf2cea10b8b3e83df64
      https://github.com/zanata/zanata-server/commit/3692f46ae368fc4867326cf2cea10b8b3e83df64
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/test/groovy/org/zanata/ZanataTest.groovy
    A zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContextsTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java
    A zanata-war/src/test/resources/org/zanata/Zanata.html

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

  Commit: fd7cbf88dfbb5c94a4e2f3337b279f0ebf4b3f54
      https://github.com/zanata/zanata-server/commit/fd7cbf88dfbb5c94a4e2f3337b279f0ebf4b3f54
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml

  Log Message:
  -----------
  Fix problem with JSF ajax and onbeforesubmit.

On previous JSF versions, onbeforesubmit was able to cancel the request and revert all fields to their original state. Not so much in Richfaces 4, where the reversal has to be done manually.

  Commit: 47143a2816bbb31ae7b2e7926872e26837737943
      https://github.com/zanata/zanata-server/commit/47143a2816bbb31ae7b2e7926872e26837737943
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  rhbz 960786 Check for null characters when generating TMX

  Commit: 929483f3e2c65bf6587fba4bfcd3abeb15a17fb6
      https://github.com/zanata/zanata-server/commit/929483f3e2c65bf6587fba4bfcd3abeb15a17fb6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Disabled orm.xml in non-container persistence.xml \n To disable automatic entity security check

  Commit: 4edb0a342d10962c57ad1964fb3c3a49a49a500d
      https://github.com/zanata/zanata-server/commit/4edb0a342d10962c57ad1964fb3c3a49a49a500d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

  Log Message:
  -----------
  Change from em=null to em.close to close entity manager

  Commit: 81a8a9f745b3a484e016844187fc8dd56150a7ba
      https://github.com/zanata/zanata-server/commit/81a8a9f745b3a484e016844187fc8dd56150a7ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java

  Log Message:
  -----------
  Use exception type in tests instead of exception message

  Commit: 5132c08353d913ce4c175ae2c5f3711194df49e1
      https://github.com/zanata/zanata-server/commit/5132c08353d913ce4c175ae2c5f3711194df49e1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge remote branch 'origin/integration/master' into integration/master

  Commit: b3d1adde6b4992cc44d4b729b7bba740edd04671
      https://github.com/zanata/zanata-server/commit/b3d1adde6b4992cc44d4b729b7bba740edd04671
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java

  Log Message:
  -----------
  Disable tests which break in some environments

  Commit: 6516333d9b901908f683b0699a963e942ca28155
      https://github.com/zanata/zanata-server/commit/6516333d9b901908f683b0699a963e942ca28155
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  Add mock config helper to file service tests

  Commit: 7b5654158f8080cf9fa6131904d3d49c1ebcba65
      https://github.com/zanata/zanata-server/commit/7b5654158f8080cf9fa6131904d3d49c1ebcba65
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  rhbz965890 add tests for upload parameters being used

  Commit: 095139ee117800f93f9075d59919275606c09692
      https://github.com/zanata/zanata-server/commit/095139ee117800f93f9075d59919275606c09692
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  rhbz965890 add test for upload parameters being stored

  Commit: 19ac06ef104090a4e23c9a7340468680e6a0703e
      https://github.com/zanata/zanata-server/commit/19ac06ef104090a4e23c9a7340468680e6a0703e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  rhbz965890 add test that empty parameters do not clobber stored parameters

  Commit: 47030e002e3c444de0e406eb6ec4856438c2b0cf
      https://github.com/zanata/zanata-server/commit/47030e002e3c444de0e406eb6ec4856438c2b0cf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade groovy to 2.0.7

  Commit: 306b5d03d0fff16aa4ae0bf2d62d2acda9bf82a9
      https://github.com/zanata/zanata-server/commit/306b5d03d0fff16aa4ae0bf2d62d2acda9bf82a9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    M zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    M zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Add constructor logging for unclosed ResultSets

  Commit: f68d07c86abe0172d7834f7aacda82c7d2ffe483
      https://github.com/zanata/zanata-server/commit/f68d07c86abe0172d7834f7aacda82c7d2ffe483
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IDocumentHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    A zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    A zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    A zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    A zanata-model/src/main/java/org/zanata/model/SourceContents.java
    A zanata-model/src/main/java/org/zanata/model/TargetContents.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/eclipse/launch/webtrans-dummy.launch
    M zanata-war/eclipse/launch/webtrans-jboss.launch
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/dao/package-info.java
    A zanata-war/src/main/java/org/zanata/exception/ChunkUploadException.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    A zanata-war/src/main/java/org/zanata/rest/service/package-info.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.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/EmailChangeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.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/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    A zanata-war/src/main/java/org/zanata/service/impl/package-info.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/transformer/TargetCommentTransformer.java
    A zanata-war/src/main/java/org/zanata/transformer/TargetTransformer.java
    A zanata-war/src/main/java/org/zanata/transformer/Transformer.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/CheckStateHasChangedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/RefreshPageEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasTranslationStats.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NavOptionRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourceContentWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.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/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/NeedsRefresh.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/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetStatusCountHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStatsResult.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetStatusCount.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetStatusCountResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NavOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/ContentStateConstraints.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/Finds.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.0.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_legend.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    A zanata-war/src/test/groovy/org/zanata/ZanataTest.groovy
    A zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    A zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    A zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireContextsTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    A zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.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/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetStatusCountHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    A zanata-war/src/test/resources/org/zanata/Zanata.html
    A zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
    A zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeServiceServerNull.html
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    A zanata-war/src/test/resources/org/zanata/tmx14.dtd
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into seam230final

Conflicts:
	pom.xml
	zanata-model/src/main/java/org/zanata/model/HDocument.java
	zanata-model/src/main/java/org/zanata/model/HProject.java
	zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
	zanata-model/src/main/java/org/zanata/model/HTextFlow.java
	zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
	zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
	zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java

  Commit: 8c66043a2ec15ed8e8f3d6380f35a40a17c0260a
      https://github.com/zanata/zanata-server/commit/8c66043a2ec15ed8e8f3d6380f35a40a17c0260a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add dependency exclusion on okapi libs.

There is a build-log4j dependency on the okapi libs that causes a conflict with EAP 6's libraries.

  Commit: 00a660e62a92019e246d8de0da0751f93224c1a6
      https://github.com/zanata/zanata-server/commit/00a660e62a92019e246d8de0da0751f93224c1a6
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java

  Log Message:
  -----------
  Take new content states into account when preparing stats.

  Commit: 9765bebed383e8a1228a1cd61ea4d0d94e3e870a
      https://github.com/zanata/zanata-server/commit/9765bebed383e8a1228a1cd61ea4d0d94e3e870a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java

  Log Message:
  -----------
  Ensure test cleans up its ScrollableResults

  Commit: 4f721b3efbb0ab73d8ceda4a736f8f4f355c60b3
      https://github.com/zanata/zanata-server/commit/4f721b3efbb0ab73d8ceda4a736f8f4f355c60b3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    M zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    M zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into seam230final

  Commit: e938e725dbb67860f105ea553b0c271c36a453d3
      https://github.com/zanata/zanata-server/commit/e938e725dbb67860f105ea553b0c271c36a453d3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/util/CloseableIterator.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContextsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Reenable tests, create closeable iterator, remove duplicate surefire execution, fix FileService test.

  Commit: a2584fe604633a312f37028e32d3d989a000edf1
      https://github.com/zanata/zanata-server/commit/a2584fe604633a312f37028e32d3d989a000edf1
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  Add property for hibernate search index file location.

  Commit: 1eaaac97b5d75f1d38177c89b932f9e2034c1e43
      https://github.com/zanata/zanata-server/commit/1eaaac97b5d75f1d38177c89b932f9e2034c1e43
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/jsf-skin.css

  Log Message:
  -----------
  Change deprecated simpleTooglePanel to collapsiblePanel

  Commit: 07e77910fe8622f700822fb2b9e25ab87371a970
      https://github.com/zanata/zanata-server/commit/07e77910fe8622f700822fb2b9e25ab87371a970
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  fix cancel action when 'cancel' is selected in Confirmation dialog for export to TMX url

  Commit: b9ae67f7a8488dc50e78cdd63225f1e8f37fe8d4
      https://github.com/zanata/zanata-server/commit/b9ae67f7a8488dc50e78cdd63225f1e8f37fe8d4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Fix urlrewrite on all TMX export link

  Commit: dde3ff678f50f39e22fd0ca06df194d0a276cda5
      https://github.com/zanata/zanata-server/commit/dde3ff678f50f39e22fd0ca06df194d0a276cda5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  change single-language TMX export link to use icon

  Commit: e3b0ec02943a33f22371cb9d877d64b367caee1d
      https://github.com/zanata/zanata-server/commit/e3b0ec02943a33f22371cb9d877d64b367caee1d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Add color change when hover over documents/export tmx on version page

  Commit: b2086db5ab77d0eb22b07a97310594f6a4f00b63
      https://github.com/zanata/zanata-server/commit/b2086db5ab77d0eb22b07a97310594f6a4f00b63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/validator/UrlValidator.java

  Log Message:
  -----------
  Fix url validator to return valid with empty string

  Commit: fcd0703974dee7f334630ff71d327d06b5e8088b
      https://github.com/zanata/zanata-server/commit/fcd0703974dee7f334630ff71d327d06b5e8088b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/resources/as7module/sun/module.xml
    A functional-test/src/test/resources/as7module/zanata/module.xml
    A functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/conf/standalone_as711.xml
    A functional-test/src/test/resources/conf/standalone_eap.xml
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  cargo working with h2 trigger disabled

  Commit: eb845af11cd25a2ff2d7c4d17fc2278db35d4243
      https://github.com/zanata/zanata-server/commit/eb845af11cd25a2ff2d7c4d17fc2278db35d4243
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/test/resources/jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  added profile to build war supports h2 database

  Commit: 95ee7322e4f6a0ae41b6fd3ba717eb57c4144509
      https://github.com/zanata/zanata-server/commit/95ee7322e4f6a0ae41b6fd3ba717eb57c4144509
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    R functional-test/src/test/resources/conf/login-config.xml
    R functional-test/src/test/resources/conf/standalone_as711.xml
    R functional-test/src/test/resources/conf/standalone_eap.xml
    A functional-test/src/test/resources/readme.txt

  Log Message:
  -----------
  clean up a bit

  Commit: a0c7cd89e089c85c752ca3b400b15e0f4d54973d
      https://github.com/zanata/zanata-server/commit/a0c7cd89e089c85c752ca3b400b15e0f4d54973d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  enable separate war name for h2

  Commit: 32a9f08d55289ad155acbc79d51eb8eb72db884b
      https://github.com/zanata/zanata-server/commit/32a9f08d55289ad155acbc79d51eb8eb72db884b
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsRawCompatibilityITCase.java

  Log Message:
  -----------
  Remove yaml provider from jboss-deployment explicitly.

Its presence causes Yaml to be used for Accept: */* media types.

  Commit: bdd64e3e53e656bc515971f00488c0a6a1cfd2c2
      https://github.com/zanata/zanata-server/commit/bdd64e3e53e656bc515971f00488c0a6a1cfd2c2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Downgrade client version to most recent release, instead of SNAPSHOT (no changes)

  Commit: 45fdb69b7a4ad19d80cae28df323b0307ff896e4
      https://github.com/zanata/zanata-server/commit/45fdb69b7a4ad19d80cae28df323b0307ff896e4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  this seems to fix the broken test locally

  Commit: f675f0551c0afa320bc4b99fb2ba5748f06da163
      https://github.com/zanata/zanata-server/commit/f675f0551c0afa320bc4b99fb2ba5748f06da163
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml
    M zanata-war/src/test/resources/jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  Exclude Resteasy's Yaml provider from the app's module dependencies.

This because when the Yaml provider is present, it will be selected as the default provider for */* requests.

  Commit: 0c4e75fb7fcf3914d8a8ebc6a5716bae735e2c9a
      https://github.com/zanata/zanata-server/commit/0c4e75fb7fcf3914d8a8ebc6a5716bae735e2c9a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/resources/as7module/sun/module.xml
    A functional-test/src/test/resources/as7module/zanata/module.xml
    R functional-test/src/test/resources/conf/login-config.xml
    A functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    A functional-test/src/test/resources/readme.txt
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml
    A zanata-war/src/test/resources/jboss/WEB-INF/jboss-deployment-structure.xml

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

  Commit: fe8a124c41260dbc7eafb5019245132f5118f703
      https://github.com/zanata/zanata-server/commit/fe8a124c41260dbc7eafb5019245132f5118f703
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/RestTest.java

  Log Message:
  -----------
  Upgrade to latest client version for Rest Tests.

  Commit: a69f545716f27858369e435dcb2618ffa397eec4
      https://github.com/zanata/zanata-server/commit/a69f545716f27858369e435dcb2618ffa397eec4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java

  Log Message:
  -----------
  upgrade hibernate version to match what's in EAP6

- had to disable close connection in JPA test to make tests work. Looks like the closed connection is still hanging around in hibernate session and being used.

  Commit: 70d7fc1d7f290ef2c332b5a71af036f8786df79a
      https://github.com/zanata/zanata-server/commit/70d7fc1d7f290ef2c332b5a71af036f8786df79a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
    M functional-test/src/test/resources/conf/zanata.properties
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

  Log Message:
  -----------
  Fix tests

- try to close connection in afterMethod for JPA test
- fix functional test setup

  Commit: 04676d4fdc667d5621c55b4972d4b48bb6cc072a
      https://github.com/zanata/zanata-server/commit/04676d4fdc667d5621c55b4972d4b48bb6cc072a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    A zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    A zanata-war/src/main/java/org/zanata/validation/ZanataCaptcha.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Fix captcha message in seam 2.3

  Commit: 486abc6c1f7923b978469ca95b295df33c522760
      https://github.com/zanata/zanata-server/commit/486abc6c1f7923b978469ca95b295df33c522760
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
    M functional-test/src/test/resources/conf/zanata.properties
    M pom.xml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsRawCompatibilityITCase.java

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

  Commit: bb42b8fbfe783e1edbc7ed890314b85366bd3576
      https://github.com/zanata/zanata-server/commit/bb42b8fbfe783e1edbc7ed890314b85366bd3576
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java

  Log Message:
  -----------
  fix re-send activation email link page

  Commit: 5d66478435668b165ff7e34fe5354c81f302b738
      https://github.com/zanata/zanata-server/commit/5d66478435668b165ff7e34fe5354c81f302b738
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  fix password change page - mandatory old password field

  Commit: 40f6c9204ede60294a9679d85fdeac99148a6426
      https://github.com/zanata/zanata-server/commit/40f6c9204ede60294a9679d85fdeac99148a6426
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/SignInPage.java

  Log Message:
  -----------
  fix functional test

  Commit: 98a91c679bb0698585d8ab8d03f8250b7af8976a
      https://github.com/zanata/zanata-server/commit/98a91c679bb0698585d8ab8d03f8250b7af8976a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    A zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java

  Log Message:
  -----------
  Revert to Arquillian Seam 2 extension 1.0.0.Alpha2

Add a listener to trigger the right events for the Arquillian Seam2 extension to work together with the Suite extension.

  Commit: 4eedfb6bedd0aee575369b3dac3ee874993ed78d
      https://github.com/zanata/zanata-server/commit/4eedfb6bedd0aee575369b3dac3ee874993ed78d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
    M functional-test/src/test/resources/conf/zanata.properties
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    A zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    A zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    A zanata-war/src/main/java/org/zanata/validation/ZanataCaptcha.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

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

  Commit: e08be14379503d2b37fa4395f7b0d207391aa5dd
      https://github.com/zanata/zanata-server/commit/e08be14379503d2b37fa4395f7b0d207391aa5dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update api, client and common to 3.0.0

  Commit: 79d861a5ac710e993cc0f0ecdc90cf44fb1df675
      https://github.com/zanata/zanata-server/commit/79d861a5ac710e993cc0f0ecdc90cf44fb1df675
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.0-alpha-1

  Commit: 370e972b9cd746612ca2e8436740820116215e1c
      https://github.com/zanata/zanata-server/commit/370e972b9cd746612ca2e8436740820116215e1c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 4da298a0e58b4216fb8193abff4ae162a4c6e32a
      https://github.com/zanata/zanata-server/commit/4da298a0e58b4216fb8193abff4ae162a4c6e32a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  fix manage user page in admin section

  Commit: 4e7c5ac57c7a797f91aa5ab701fb996e7aaecbc7
      https://github.com/zanata/zanata-server/commit/4e7c5ac57c7a797f91aa5ab701fb996e7aaecbc7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    A zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java

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

  Commit: c2e3ecdbbb183b682fd0ad2d4ef5b96c1ae9c592
      https://github.com/zanata/zanata-server/commit/c2e3ecdbbb183b682fd0ad2d4ef5b96c1ae9c592
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

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

  Log Message:
  -----------
  Change wordings in admin stats page

  Commit: a2e3e5927a2e20b0d433c357ecfad7563da87595
      https://github.com/zanata/zanata-server/commit/a2e3e5927a2e20b0d433c357ecfad7563da87595
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  add id to element

  Commit: 0807fe3d9b7104dfe475f468d4d6ee7421f911e5
      https://github.com/zanata/zanata-server/commit/0807fe3d9b7104dfe475f468d4d6ee7421f911e5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  switch to chrome driver and make version group test pass

  Commit: 92201b506b43e1e1595a7f01bfb10ee95edf5072
      https://github.com/zanata/zanata-server/commit/92201b506b43e1e1595a7f01bfb10ee95edf5072
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  add id to element

  Commit: fd78414d2a822bd712f228cdbc63c52db19c6355
      https://github.com/zanata/zanata-server/commit/fd78414d2a822bd712f228cdbc63c52db19c6355
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java

  Log Message:
  -----------
  fixed functional test

  Commit: 278cec72fd3784f175b3548c1245fe09d45d26f7
      https://github.com/zanata/zanata-server/commit/278cec72fd3784f175b3548c1245fe09d45d26f7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  change back to use firefox

  Commit: c6277e3bc06fa5286051685eff0b4d05793ff836
      https://github.com/zanata/zanata-server/commit/c6277e3bc06fa5286051685eff0b4d05793ff836
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

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

  Log Message:
  -----------
  use plural in admin stats page

  Commit: a04f4a42589abb945b39aeba7dafc8425152cad1
      https://github.com/zanata/zanata-server/commit/a04f4a42589abb945b39aeba7dafc8425152cad1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  make webdriver type customiseable

  Commit: 1fa43434792ea056f8a19c57f1e0d22ebce7def7
      https://github.com/zanata/zanata-server/commit/1fa43434792ea056f8a19c57f1e0d22ebce7def7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Fix on duplicate display of 'download all files' link

  Commit: 1ffa566597fcfe1aa5c5e615e03ed46f6670de87
      https://github.com/zanata/zanata-server/commit/1ffa566597fcfe1aa5c5e615e03ed46f6670de87
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  added chrome web driver support

  Commit: 63cbf997550bc40554df39f05b30088ac0145bb0
      https://github.com/zanata/zanata-server/commit/63cbf997550bc40554df39f05b30088ac0145bb0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Fix bug in https://bugzilla.redhat.com/show_bug.cgi?id=975286

fix underlining problem, url rendered wrongly with slug with *.* using s:link, changing to h:outputLink

  Commit: 7665641680ccb553c385b2518cf820681c36a77f
      https://github.com/zanata/zanata-server/commit/7665641680ccb553c385b2518cf820681c36a77f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties

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

  Commit: 01aab64e9290d32abac8f6267d6972a3e063029b
      https://github.com/zanata/zanata-server/commit/01aab64e9290d32abac8f6267d6972a3e063029b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  customisable chrome driver

  Commit: b2942c6440c31823e3ae2938ab5443c62089290e
      https://github.com/zanata/zanata-server/commit/b2942c6440c31823e3ae2938ab5443c62089290e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  rhbz974909 - Upgrade version of hibernate-search to 4.3.0.Final

This is the only version that is tested against hibernate 4.2.0.Final which is the version we are running against.

  Commit: c4a8c1664cebb98db40a9ca21ca3f142f6143bc9
      https://github.com/zanata/zanata-server/commit/c4a8c1664cebb98db40a9ca21ca3f142f6143bc9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/test/java/org/zanata/feature/ManualRunHelper.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    A functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    A functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    R functional-test/src/test/resources/create_database.sql

  Log Message:
  -----------
  create JUnit rule to reset database before each test suite

  Commit: eaea73cc882e367d6c048215fb7370eddd1e7720
      https://github.com/zanata/zanata-server/commit/eaea73cc882e367d6c048215fb7370eddd1e7720
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

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

  Log Message:
  -----------
  update ja UI translations

  Commit: 19b1f51807431f286c8b9098839116c6b0d0dbf4
      https://github.com/zanata/zanata-server/commit/19b1f51807431f286c8b9098839116c6b0d0dbf4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata.xml

  Log Message:
  -----------
  add zh-Hant-TW UI translations

  Commit: 68495f33f60a6db8c6dec662746e2122450b2b91
      https://github.com/zanata/zanata-server/commit/68495f33f60a6db8c6dec662746e2122450b2b91
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    A zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  add uk UI translations

  Commit: 720bfae8bc9e943d6d9d06c88e0fd2a016e0a87b
      https://github.com/zanata/zanata-server/commit/720bfae8bc9e943d6d9d06c88e0fd2a016e0a87b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Replace EAP6 icon with zanata icon in editor

  Commit: 6796e5c9d936f99eb73d6944c2e3dc563b54ec6c
      https://github.com/zanata/zanata-server/commit/6796e5c9d936f99eb73d6944c2e3dc563b54ec6c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml

  Log Message:
  -----------
  fix search field layout in editor

  Commit: d3ce562cc5ded05baa75fa9f638233b035825fe7
      https://github.com/zanata/zanata-server/commit/d3ce562cc5ded05baa75fa9f638233b035825fe7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java

  Log Message:
  -----------
  reset database after by default

  Commit: da6c72babd89a7c186965ec1dc0ba6056609340b
      https://github.com/zanata/zanata-server/commit/da6c72babd89a7c186965ec1dc0ba6056609340b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

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

  Log Message:
  -----------
  Fix version group search query to ignore empty search string

Ignore empty search string in version group search from version page 'Request to join group' rather than returning all available groups

  Commit: a2f0c2f955384840f82eca2ee4ed8ced7f603eaf
      https://github.com/zanata/zanata-server/commit/a2f0c2f955384840f82eca2ee4ed8ced7f603eaf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java

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

  Commit: 3eb69592986c4597868cba44238aeb0805f22228
      https://github.com/zanata/zanata-server/commit/3eb69592986c4597868cba44238aeb0805f22228
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java

  Log Message:
  -----------
  rewrite util functions to be more aware of stale element exception generally found with JSF table

  Commit: 976a5559c248ccb5b96c18be82b902797db6cc6c
      https://github.com/zanata/zanata-server/commit/976a5559c248ccb5b96c18be82b902797db6cc6c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java

  Log Message:
  -----------
  Fix ptoject/version search query to ignore empty search string

Ignore empty search string for project/version from version group page

  Commit: 48772d34bf94ac4b4513f43326a5e3a1de2aa21b
      https://github.com/zanata/zanata-server/commit/48772d34bf94ac4b4513f43326a5e3a1de2aa21b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java

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

  Commit: 53cf3794489cd8688ed9cc10e8997621583559ee
      https://github.com/zanata/zanata-server/commit/53cf3794489cd8688ed9cc10e8997621583559ee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  add id to element

  Commit: 13cc734447ee0a063dc530558dbd9999db5c0d54
      https://github.com/zanata/zanata-server/commit/13cc734447ee0a063dc530558dbd9999db5c0d54
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java

  Log Message:
  -----------
  fix page object

  Commit: c7c553d0414759dd77820b47ef14897420738dce
      https://github.com/zanata/zanata-server/commit/c7c553d0414759dd77820b47ef14897420738dce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update git url from ...zanata to ...zanata-server

  Commit: 61fd718c3d5f69b17cb5ba8e8987c638d8ddf76f
      https://github.com/zanata/zanata-server/commit/61fd718c3d5f69b17cb5ba8e8987c638d8ddf76f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java

  Log Message:
  -----------
  Upgrade to latest version of compatibility api.

  Commit: c3785c26f2af3e6899a043e68a7f7b1860b07720
      https://github.com/zanata/zanata-server/commit/c3785c26f2af3e6899a043e68a7f7b1860b07720
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsRawCompatibilityITCase.java

  Log Message:
  -----------
  Add correct compatibility tests for the Stats service.

Both raw and java client tests are included.

  Commit: cdb8e82753bc2a4200307d8efcdcd5787ebb2447
      https://github.com/zanata/zanata-server/commit/cdb8e82753bc2a4200307d8efcdcd5787ebb2447
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    A zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/compat/VersionRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/AccountCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/AccountRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/ProjectCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/ProjectIterationCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/ProjectIterationRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/ProjectRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/TranslationsCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/TranslationsRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/VersionCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_3/VersionRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/AccountCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/AccountRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/ProjectCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/ProjectIterationCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/ProjectIterationRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/ProjectRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/TranslationsCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/TranslationsRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/VersionCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/VersionRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/AccountCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/AccountRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/ProjectCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/ProjectIterationCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/ProjectIterationRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/ProjectRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/VersionRawCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsCompatibilityITCase.java
    R zanata-war/src/test/java/org/zanata/rest/compat/v2_3_0/StatisticsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Reduce compatibility tests to the previous version of the currently used API only.

The compatibility tests have been unified to only test against the immediately previous version of the zanata API. This will guarantee that any changes to the API will be kept compatible with the immediately preceding client.

  Commit: a1296ec96d2048848f40165fd78fa36a0e796e31
      https://github.com/zanata/zanata-server/commit/a1296ec96d2048848f40165fd78fa36a0e796e31
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #3 from zanata/update-git-url

Update git url from ...zanata to ...zanata-server

  Commit: c46837e4052799d32dea3a226da6bb2c52cbafb3
      https://github.com/zanata/zanata-server/commit/c46837e4052799d32dea3a226da6bb2c52cbafb3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java

  Log Message:
  -----------
  Use new version of zanata-common-api.

The new recision uses double values for translation stats percentages instead of ints.

  Commit: 6181bd136d2cae5fbf584b8744c03f8273e114b7
      https://github.com/zanata/zanata-server/commit/6181bd136d2cae5fbf584b8744c03f8273e114b7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    A functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  Change ResetDatabaseRule to use properties and refactor pages

- refactor WebElementUtil around methods dealing with table. Use wait until to avoid stale element exception
- ResetDatabaseRule now uses properties for backup script. This way if we run individual test in IDE, it will guarantee only initial database snapshot is included in the backup script.

  Commit: 1adc7de8ecdd2889ba237513ab5c206a9c712793
      https://github.com/zanata/zanata-server/commit/1adc7de8ecdd2889ba237513ab5c206a9c712793
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java

  Log Message:
  -----------
  attempt to fix build

  Commit: b5429740c54d7094ef5a8f18e449bc89638e1560
      https://github.com/zanata/zanata-server/commit/b5429740c54d7094ef5a8f18e449bc89638e1560
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java

  Log Message:
  -----------
  attempt to fix test in jenkins

  Commit: 808821281ee36350667f7a6171f2314b2eba8244
      https://github.com/zanata/zanata-server/commit/808821281ee36350667f7a6171f2314b2eba8244
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml

  Log Message:
  -----------
  fix jsp page after api change

  Commit: 9cfa7e4bab401c0727c01257f925b1e7857592ff
      https://github.com/zanata/zanata-server/commit/9cfa7e4bab401c0727c01257f925b1e7857592ff
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java

  Log Message:
  -----------
  attempt to fix functional test

  Commit: 41b0651d290ba61841a478df6ce8ca128d1049bc
      https://github.com/zanata/zanata-server/commit/41b0651d290ba61841a478df6ce8ca128d1049bc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  add control to disable reset database rule

  Commit: f8f81559027b629e443aee1eadb1590b5d06fb33
      https://github.com/zanata/zanata-server/commit/f8f81559027b629e443aee1eadb1590b5d06fb33
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Add arquillian.jboss.home property to the integration-test phase.

This property must be specify when running integration tests or else the build will fail. It indicates the location of the JBoss server to use with arquillian.

  Commit: b60e5d14eeeaabdb67ee6d5a06950603ceeee700
      https://github.com/zanata/zanata-server/commit/b60e5d14eeeaabdb67ee6d5a06950603ceeee700
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A .travis.yml

  Log Message:
  -----------
  Tell Travis we want Java

  Commit: e5500f420aff3e9ceb7ed322f371dfc76625a20e
      https://github.com/zanata/zanata-server/commit/e5500f420aff3e9ceb7ed322f371dfc76625a20e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Disable GWT compilation by Travis

  Commit: 967f67ed35e5bb632e9b70f3d43b67526b0c9ced
      https://github.com/zanata/zanata-server/commit/967f67ed35e5bb632e9b70f3d43b67526b0c9ced
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java

  Log Message:
  -----------
  add hook in editor for user scripts to register callbacks for trans-unit updated events

  Commit: edfb632bdccaba90f0d4bca92ace9e91e710d020
      https://github.com/zanata/zanata-server/commit/edfb632bdccaba90f0d4bca92ace9e91e710d020
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java

  Log Message:
  -----------
  Fix NavigationMessages to match with messages in editor options

  Commit: ea2150e790057920af8ca711ed0a1e49fbc747cd
      https://github.com/zanata/zanata-server/commit/ea2150e790057920af8ca711ed0a1e49fbc747cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java

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

  Commit: d379eb29c7507ae9fae79cb713ecc0728bd83c13
      https://github.com/zanata/zanata-server/commit/d379eb29c7507ae9fae79cb713ecc0728bd83c13
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/config/ConfigurationStore.java
    A zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    A zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    A zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java
    M zanata-war/src/test/resources/arquillian/standalone.xml
    A zanata-war/src/test/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml

  Log Message:
  -----------
  Add database and jndi configuration stores.

These will be integrated under the ApplicationConfiguration class in a future revision to pull configuration elements from different sources.

  Commit: 1ca17341e9351f6ed7a2cc441e919e98ed3444ca
      https://github.com/zanata/zanata-server/commit/1ca17341e9351f6ed7a2cc441e919e98ed3444ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Prevent Enforcer from failing the build for missing arquillian.jboss.home property

  Commit: 1fe2ce395efbf3a43e11d2c3842baf5268185640
      https://github.com/zanata/zanata-server/commit/1fe2ce395efbf3a43e11d2c3842baf5268185640
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml

  Log Message:
  -----------
  Remove the internal login panel when validating a kerberos account.

The internal login panel will no longer be visibile after validating an account (via email) on a kerberos authenticated system.

  Commit: aba980218fca919149fc91ad91b0a6dd6cc1b52d
      https://github.com/zanata/zanata-server/commit/aba980218fca919149fc91ad91b0a6dd6cc1b52d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

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

  Log Message:
  -----------
  Fix error message for invalid username input: https://bugzilla.redhat.com/show_bug.cgi?id=977595

  Commit: e7a35cffadde35590be09e90fa217f18a3c070b4
      https://github.com/zanata/zanata-server/commit/e7a35cffadde35590be09e90fa217f18a3c070b4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml

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

  Commit: f0aeb3232a06efaf2384cd0420d7fd9cf5783867
      https://github.com/zanata/zanata-server/commit/f0aeb3232a06efaf2384cd0420d7fd9cf5783867
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/sample-projects/glossary/fr.po
    A functional-test/sample-projects/glossary/pom.xml
    A functional-test/sample-projects/glossary/zanata.xml
    M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/zanata-autotest.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-admin.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-translator.ini

  Log Message:
  -----------
  basic glossary test

  Commit: d79b95d619a829a6a5b1d27f704c0b2e066d9183
      https://github.com/zanata/zanata-server/commit/d79b95d619a829a6a5b1d27f704c0b2e066d9183
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    A functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java

  Log Message:
  -----------
  TCMS test case 147311

- add script to reset database with basic data in it. i.e. a few languages and translator as member and about fedora project created.
- refactor ClientPushWorkflow for better reuse
- introduce BasicWorkFlow to go directly to a url
- add Editor page object
- add functional test for testing glossary push

  Commit: eb629169333b0cc56ba88cf7d9db6b7e5c120790
      https://github.com/zanata/zanata-server/commit/eb629169333b0cc56ba88cf7d9db6b7e5c120790
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    A functional-test/src/test/resources/create_glossarist_user.sql
    A functional-test/src/test/resources/zanata-user-config/zanata-glossarist.ini

  Log Message:
  -----------
  added glossarist user and rewrite test

  Commit: 294b324323f73de603ac24ad288cb906e68ee20a
      https://github.com/zanata/zanata-server/commit/294b324323f73de603ac24ad288cb906e68ee20a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A functional-test/sample-projects/glossary/compendium_fr.po
    A functional-test/sample-projects/glossary/compendium_fr_invalid.po
    R functional-test/sample-projects/glossary/fr.po
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html

  Log Message:
  -----------
  automate tcms 147311

  Commit: e6967f8a5bc324fb23f76eef710a200973e37627
      https://github.com/zanata/zanata-server/commit/e6967f8a5bc324fb23f76eef710a200973e37627
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A functional-test/sample-projects/glossary/compendium.csv
    A functional-test/sample-projects/glossary/compendium_invalid.csv
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html

  Log Message:
  -----------
  TCMS test case 170111

  Commit: e66cc0cbf132157cc4ad8c9873104e958801afc3
      https://github.com/zanata/zanata-server/commit/e66cc0cbf132157cc4ad8c9873104e958801afc3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html

  Log Message:
  -----------
  TCMS test case 167901

  Commit: 836d38f6179feefc86e66ff8cd3d251a2863eaed
      https://github.com/zanata/zanata-server/commit/836d38f6179feefc86e66ff8cd3d251a2863eaed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    A functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html

  Log Message:
  -----------
  TCMS test case 167886

  Commit: 429dbc584d3dcb084787ff9d673f1ba29bc2769f
      https://github.com/zanata/zanata-server/commit/429dbc584d3dcb084787ff9d673f1ba29bc2769f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  fix issues: user manager jsf page not rendering email column correctly

  Commit: fa93a263f1acef1347ba09f65f716cc33ce7a7ad
      https://github.com/zanata/zanata-server/commit/fa93a263f1acef1347ba09f65f716cc33ce7a7ad
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  fix security rule for glossary delete check

  Commit: 25831825389d84a6f4dac4cba026d8d03a067284
      https://github.com/zanata/zanata-server/commit/25831825389d84a6f4dac4cba026d8d03a067284
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryDelete.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/zanata-user-config/zanata-glossaryadmin.ini
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java

  Log Message:
  -----------
  TCMS test case 167899

  Commit: 4777ede01fa596c0868b42983d4bd43d105eeaca
      https://github.com/zanata/zanata-server/commit/4777ede01fa596c0868b42983d4bd43d105eeaca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java

  Log Message:
  -----------
  refactor DocumentsViewPage and test

  Commit: ce467c32852c6fd30cd75aa16a503cfffe835d23
      https://github.com/zanata/zanata-server/commit/ce467c32852c6fd30cd75aa16a503cfffe835d23
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  Improve the functional tests for groups

Add some detailed system tests.
Make the concordion output more wordy.
Fix some minor issues in test framework.

  Commit: 6d8c4a5792fc6f2b14e3354f3fce59d2db617b26
      https://github.com/zanata/zanata-server/commit/6d8c4a5792fc6f2b14e3354f3fce59d2db617b26
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Implement detail username validation message: https://bugzilla.redhat.com/show_bug.cgi?id=977595#c2

  Commit: 2d57167fe86d3872c9174d60a1eb5490ce440e98
      https://github.com/zanata/zanata-server/commit/2d57167fe86d3872c9174d60a1eb5490ce440e98
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/sample-projects/glossary/compendium.csv
    A functional-test/sample-projects/glossary/compendium_fr.po
    A functional-test/sample-projects/glossary/compendium_fr_invalid.po
    A functional-test/sample-projects/glossary/compendium_invalid.csv
    A functional-test/sample-projects/glossary/pom.xml
    A functional-test/sample-projects/glossary/zanata.xml
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    A functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryDelete.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    A functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/create_glossarist_user.sql
    R functional-test/src/test/resources/zanata-autotest.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-admin.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-glossarist.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-glossaryadmin.ini
    A functional-test/src/test/resources/zanata-user-config/zanata-translator.ini
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

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

  Commit: ed74a327c2b749098260f7e47614c5a1264dfe01
      https://github.com/zanata/zanata-server/commit/ed74a327c2b749098260f7e47614c5a1264dfe01
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  Merge pull request #5 from zanata/group-functionaltests

Improve the functional tests for groups

  Commit: 7edaf27fa3c8bae09774e4f2e15d82fea052085f
      https://github.com/zanata/zanata-server/commit/7edaf27fa3c8bae09774e4f2e15d82fea052085f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java

  Log Message:
  -----------
  clean up

  Commit: b48bb81983108dcf406b12d5b4105118198bfa06
      https://github.com/zanata/zanata-server/commit/b48bb81983108dcf406b12d5b4105118198bfa06
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java

  Log Message:
  -----------
  added wait for database reset

  Commit: a8c9e5d9b46f9b979380e8024c7d739e1d3a5716
      https://github.com/zanata/zanata-server/commit/a8c9e5d9b46f9b979380e8024c7d739e1d3a5716
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_admin_user.sql
    R functional-test/src/test/resources/create_glossarist_user.sql
    M functional-test/src/test/resources/create_translator_user.sql

  Log Message:
  -----------
  remove personal email from test data script

  Commit: 1fa63ac769f24ffbe0ed33131898d34c2cf511b7
      https://github.com/zanata/zanata-server/commit/1fa63ac769f24ffbe0ed33131898d34c2cf511b7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  add test order to failsafe and refactor VersionGroupsPage obsolete toggle

  Commit: ce7928c72b5d8aa164396da2274bf87430796bce
      https://github.com/zanata/zanata-server/commit/ce7928c72b5d8aa164396da2274bf87430796bce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Add -q option for mvn in Travis

  Commit: 48dcaf682e68fe3e3ed8a51202a13cc1781afb28
      https://github.com/zanata/zanata-server/commit/48dcaf682e68fe3e3ed8a51202a13cc1781afb28
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  Test cases for changing a user name and password

Basic tests for username and password change via Administration.
Added ids for several elements for WebDriver testing.

  Commit: 0a0b38348591ba7bb26c732544876614ef7ea05c
      https://github.com/zanata/zanata-server/commit/0a0b38348591ba7bb26c732544876614ef7ea05c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/validation/Captcha.java
    M zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    M zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    R zanata-war/src/main/java/org/zanata/validation/ZanataCaptcha.java

  Log Message:
  -----------
  Refactor and improve comments for custom captcha classes

  Commit: 0d68b7e9099db350b4e14e5b6168b34aef571bed
      https://github.com/zanata/zanata-server/commit/0d68b7e9099db350b4e14e5b6168b34aef571bed
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/validation/Captcha.java
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java

  Log Message:
  -----------
  Rename custom captcha classes to indicate that they are patched versions

  Commit: 8f987d8f577173404045c8d33cbfdc3d3d20fec6
      https://github.com/zanata/zanata-server/commit/8f987d8f577173404045c8d33cbfdc3d3d20fec6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html

  Log Message:
  -----------
  Remove/cleanup code in ManageUser test case

Remove Lombok references and Empty database config.
Shift html text a bit to be indicated in test step.
Use generic Map in dec.
Add suite to run actually run the tests in CI.

  Commit: 44ca5a36f3b78ec4852d5376099f920d130ca83d
      https://github.com/zanata/zanata-server/commit/44ca5a36f3b78ec4852d5376099f920d130ca83d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
    R zanata-war/src/main/java/org/zanata/validation/ZanataCaptcha.java

  Log Message:
  -----------
  Merge pull request #7 from zanata/damason-refactor-captcha

Refactor and improve comments for custom captcha classes

  Commit: 611b97ec493dc918f82a65fcf9ca9d545a7ae171
      https://github.com/zanata/zanata-server/commit/611b97ec493dc918f82a65fcf9ca9d545a7ae171
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java

  Log Message:
  -----------
  Work in progress, editor filtering for reviewed translation: https://bugzilla.redhat.com/show_bug.cgi?id=978656

  Commit: 02f5d3686fae11257f7ff92a999421ec2da7f42a
      https://github.com/zanata/zanata-server/commit/02f5d3686fae11257f7ff92a999421ec2da7f42a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Log Message:
  -----------
  Specify type parameters when constructing generic hashmap in ManageUserAccountPage

    This prevents a superfluous warning.

  Commit: 892eb433e8e0cd15e90ac094644279afd40eed9c
      https://github.com/zanata/zanata-server/commit/892eb433e8e0cd15e90ac094644279afd40eed9c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  try to reduce random test failure

- configure surefire and failsafe to run test in alphabetical order so that tests are run in same order on jenkins and local box
- add clear database operation in one of the random failing test class

  Commit: 9f2ad6c2ab557aa56a3a91bc7d6bf71b111dd873
      https://github.com/zanata/zanata-server/commit/9f2ad6c2ab557aa56a3a91bc7d6bf71b111dd873
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    R zanata-war/src/test/resources/jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  remove conditional build in zanata-war

  Commit: 5f23ce59598086edc423201ab905d802865f37f6
      https://github.com/zanata/zanata-server/commit/5f23ce59598086edc423201ab905d802865f37f6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponse.java
    R zanata-war/src/main/java/org/zanata/validation/CaptchaResponseValidator.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
    A zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
    R zanata-war/src/main/java/org/zanata/validation/ZanataCaptcha.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz978656

  Commit: 18fdacf999c3ad7a23ae64639c63c72412f0c8d0
      https://github.com/zanata/zanata-server/commit/18fdacf999c3ad7a23ae64639c63c72412f0c8d0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    R zanata-war/src/test/resources/jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  Merge pull request #10 from zanata/fix-build

Fix test execution order and remove conditional build

  Commit: 6b0f69a7c8ffab65cbaa208e5a0262476c3516c6
      https://github.com/zanata/zanata-server/commit/6b0f69a7c8ffab65cbaa208e5a0262476c3516c6
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  Merge pull request #6 from zanata/admin-usermanage-tests

Test cases for changing a user name and password

  Commit: 17f35d6c0a3f480d56aa0a83a906d2e7d2e9c778
      https://github.com/zanata/zanata-server/commit/17f35d6c0a3f480d56aa0a83a906d2e7d2e9c778
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java

  Log Message:
  -----------
  Work in progress, editor filtering for reviewed translation: https://bugzilla.redhat.com/show_bug.cgi?id=978656

  Commit: bcb1abbdd45ba7c82fc02763cf1b2679a83254ac
      https://github.com/zanata/zanata-server/commit/bcb1abbdd45ba7c82fc02763cf1b2679a83254ac
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    A zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java

  Log Message:
  -----------
  rhbz 979285 Scan uploaded files for viruses using ClamAV

  Commit: 14972511cb92db3f607eccde1c77748e6eb5b172
      https://github.com/zanata/zanata-server/commit/14972511cb92db3f607eccde1c77748e6eb5b172
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java

  Log Message:
  -----------
  Ensure that file is readable by clamd

  Commit: 5037830af62063bbb889f1bfec4971026400ca75
      https://github.com/zanata/zanata-server/commit/5037830af62063bbb889f1bfec4971026400ca75
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java

  Log Message:
  -----------
  Integrate configuration stores into main Application Configuration component.

Add tests to check for empty config values.
Cache empty values instead of refetching them (until the store is reset).

  Commit: 10a0de51a5cbb7f46673d1ad4ef5eb1c68f8016e
      https://github.com/zanata/zanata-server/commit/10a0de51a5cbb7f46673d1ad4ef5eb1c68f8016e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  Add JNDI settings to the functional-tests module.

  Commit: 0e2c9c0675c8c603581e7da40ab1aa45ef616e10
      https://github.com/zanata/zanata-server/commit/0e2c9c0675c8c603581e7da40ab1aa45ef616e10
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    R zanata-war/src/main/java/org/zanata/config/ConfigurationStore.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java

  Log Message:
  -----------
  Code Review

Remove the public ConfigurationStore interface and methods.
Update functional tests' standalone.xml file.

  Commit: a0fee2ae982a4bad978c08c4ab6d881060d8e240
      https://github.com/zanata/zanata-server/commit/a0fee2ae982a4bad978c08c4ab6d881060d8e240
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    A zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    A zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java
    M zanata-war/src/test/resources/arquillian/standalone.xml
    A zanata-war/src/test/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #12 from zanata/jndi-settings

Use JNDI bindings to configure Zanata instead of zanata.properties.

  Commit: 341d14bb440763d8a4597aca27c3387482951f23
      https://github.com/zanata/zanata-server/commit/341d14bb440763d8a4597aca27c3387482951f23
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Change destination for standalone.xml  in arquillian tests.

  Commit: b8e6ba0b5bf09f799b1a6dfa9ca31e1d904d73b2
      https://github.com/zanata/zanata-server/commit/b8e6ba0b5bf09f799b1a6dfa9ca31e1d904d73b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-06-30 (Sun, 30 Jun 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #13 from zanata/pom-fix

Change destination for standalone.xml  in arquillian tests.

  Commit: e1990d405c592d763784157ad81610799c9102f7
      https://github.com/zanata/zanata-server/commit/e1990d405c592d763784157ad81610799c9102f7
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Fix server startup error.

When booting up, the Zanata server performs validation checks on the lucene index directory (if one is provided). When this index is not yet created, this validation will fail. This directory is now being created jsut for validation purposes, and lucene will use it afterwards.

  Commit: 2e80daca7fe71765384336e302bf1286c3f907a7
      https://github.com/zanata/zanata-server/commit/2e80daca7fe71765384336e302bf1286c3f907a7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge pull request #14 from zanata/test-fix

Fix server startup error.

  Commit: c456de543efcaf8d60262d8046a6bda9b146bed3
      https://github.com/zanata/zanata-server/commit/c456de543efcaf8d60262d8046a6bda9b146bed3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    M zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java

  Log Message:
  -----------
  rhbz 979285 Code review changes; use clamdscan --stream

  Commit: 4f1dfe35bed84a2c80d163ed5d6e2f707d3b429b
      https://github.com/zanata/zanata-server/commit/4f1dfe35bed84a2c80d163ed5d6e2f707d3b429b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedConnectionProvider.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Always enable WrappedConnectionProvider, but disabled for MySQL connections

This allows zanata.war to be run against H2 for testing purposes
(functional tests), but still check for potential problems with MySQL
streaming ResultSets.

  Commit: 28816a25f3b275d4941e974c50bf29265e1dfded
      https://github.com/zanata/zanata-server/commit/28816a25f3b275d4941e974c50bf29265e1dfded
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml

  Log Message:
  -----------
  rhbz980346 add short descriptions on project type selectors

  Commit: b2c55dbd72940c980ec6eac60a7b2d92530ea586
      https://github.com/zanata/zanata-server/commit/b2c55dbd72940c980ec6eac60a7b2d92530ea586
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  rhbz980346 update changelog

  Commit: fc3b744920d5b853e3ef239505c029cfe2709763
      https://github.com/zanata/zanata-server/commit/fc3b744920d5b853e3ef239505c029cfe2709763
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml

  Log Message:
  -----------
  Merge pull request #16 from zanata/project-type-contextual-help

rhbz980346 add short descriptions on project type selectors

  Commit: 6edc23ab6d04d1f36f519205097949e73648d6d5
      https://github.com/zanata/zanata-server/commit/6edc23ab6d04d1f36f519205097949e73648d6d5
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    R zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml

  Log Message:
  -----------
  Unify prod and test jboss-deployment-structure.xml

  Commit: b47b48bc57fe23266aeff88f9c8a8d4559463600
      https://github.com/zanata/zanata-server/commit/b47b48bc57fe23266aeff88f9c8a8d4559463600
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    R zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml

  Log Message:
  -----------
  Merge pull request #17 from zanata/jndi-updates

Unify prod and test jboss-deployment-structure.xml

  Commit: 7562cdd0dacc2b7055b537d08ff5ea146d9bd768
      https://github.com/zanata/zanata-server/commit/7562cdd0dacc2b7055b537d08ff5ea146d9bd768
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Fix missing jboss-deployment-structure.xml file from Arquillian artifact.

  Commit: f266fb529e7e3a60306810e72d9c3ae6cf5123de
      https://github.com/zanata/zanata-server/commit/f266fb529e7e3a60306810e72d9c3ae6cf5123de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Merge pull request #18 from zanata/jndi-updates

Fix missing jboss-deployment-structure.xml file from Arquillian artifact...

  Commit: e42089d9affe6a83c3ffe858bf9acd6d45e93dbe
      https://github.com/zanata/zanata-server/commit/e42089d9affe6a83c3ffe858bf9acd6d45e93dbe
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    A zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java

  Log Message:
  -----------
  Merge pull request #11 from zanata/rhbz979285

rhbz 979285 Scan uploaded files for viruses using ClamAV

  Commit: d88072ca5750360ceb88d89b9f021e1d65c664b5
      https://github.com/zanata/zanata-server/commit/d88072ca5750360ceb88d89b9f021e1d65c664b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java

  Log Message:
  -----------
  Simplify code a little

  Commit: 4a72540e07d0960e6923f11ba07213ebce906af2
      https://github.com/zanata/zanata-server/commit/4a72540e07d0960e6923f11ba07213ebce906af2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java

  Log Message:
  -----------
  More stylistic cleanup

  Commit: 9b8e61efa23420464d0737a7356a70a665beba7d
      https://github.com/zanata/zanata-server/commit/9b8e61efa23420464d0737a7356a70a665beba7d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Editor filtering for reviewed translation: https://bugzilla.redhat.com/show_bug.cgi?id=978656

  Commit: 50da19fb7ee90218e614c2458920efd854819d18
      https://github.com/zanata/zanata-server/commit/50da19fb7ee90218e614c2458920efd854819d18
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java

  Log Message:
  -----------
  Merge pull request #20 from zanata/rhbz979285

More stylistic cleanup

  Commit: 6c1650570cc88b0a089d5567bec88e90f465e58e
      https://github.com/zanata/zanata-server/commit/6c1650570cc88b0a089d5567bec88e90f465e58e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/test/resources/as7module/zanata/module.xml
    M functional-test/src/test/resources/conf/standalone.xml
    R functional-test/src/test/resources/conf/zanata.properties
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    R zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java

  Log Message:
  -----------
  fix functional test and login module after jndi change

  Commit: c71899db810fb93a8345d606034db8ddfa9f0173
      https://github.com/zanata/zanata-server/commit/c71899db810fb93a8345d606034db8ddfa9f0173
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java

  Log Message:
  -----------
  remove jboss jndi dependency

  Commit: 7d46737f1c08102aed7638e381827c2d014a93f9
      https://github.com/zanata/zanata-server/commit/7d46737f1c08102aed7638e381827c2d014a93f9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  Rename method names, refactor buildContentStateCondition to take FilterContraints

  Commit: cb71f138dfd2a39ec716ea08ce0bf907263b704c
      https://github.com/zanata/zanata-server/commit/cb71f138dfd2a39ec716ea08ce0bf907263b704c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  Fix broken unit test

  Commit: e19ec834e9faaf9a037716631d1387835ca715a1
      https://github.com/zanata/zanata-server/commit/e19ec834e9faaf9a037716631d1387835ca715a1
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/HasSlug.java
    A zanata-model/src/main/java/org/zanata/model/SlugContainer.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Create entities for Translation memory.

Also add a mixin-like strategy for hibernate entities.

  Commit: 423fb8d90a8260d1764ecd6e5b7fb936e8ed9271
      https://github.com/zanata/zanata-server/commit/423fb8d90a8260d1764ecd6e5b7fb936e8ed9271
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    R zanata-war/src/main/java/org/zanata/database/WrappedConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Split WrappedConnectionProvider to handle Driver/DataSource configurations

  Commit: 7fc9e67b643aab74726fd9bed1ea9f949067d8de
      https://github.com/zanata/zanata-server/commit/7fc9e67b643aab74726fd9bed1ea9f949067d8de
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/test/resources/as7module/zanata/module.xml
    M functional-test/src/test/resources/conf/standalone.xml
    R functional-test/src/test/resources/conf/zanata.properties
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    R zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java

  Log Message:
  -----------
  Merge pull request #22 from zanata/fix-functional-test

fix functional test and login module after jndi change

  Commit: 483bbb00986e0d4194cd6bcc43c0713182e73580
      https://github.com/zanata/zanata-server/commit/483bbb00986e0d4194cd6bcc43c0713182e73580
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java

  Log Message:
  -----------
  Merge pull request #21 from zanata/rhbz978656

As a translator, I want to filter reviewed states separately in the editor

  Commit: 872bf9d0c74fe00148d26d8f70fddcd01afd9505
      https://github.com/zanata/zanata-server/commit/872bf9d0c74fe00148d26d8f70fddcd01afd9505
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/test/resources/as7module/zanata/module.xml
    M functional-test/src/test/resources/conf/standalone.xml
    R functional-test/src/test/resources/conf/zanata.properties
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    R zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java

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

  Commit: 64bd70b08d9a9e813e336087a1b992078f65fd13
      https://github.com/zanata/zanata-server/commit/64bd70b08d9a9e813e336087a1b992078f65fd13
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java

  Log Message:
  -----------
  Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: d8b47890eab1f7b09bada0b67a18a6a1d089e155
      https://github.com/zanata/zanata-server/commit/d8b47890eab1f7b09bada0b67a18a6a1d089e155
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    R zanata-model/src/main/java/org/zanata/model/HasSlug.java
    A zanata-model/src/main/java/org/zanata/model/HasStatus.java
    R zanata-model/src/main/java/org/zanata/model/SlugContainer.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Finish TransMemory object mappings.

Move the entity status outside the SlugEntityBase entity and into the specific classes that use it. Add an interface HasStatus in its place.

  Commit: 0d2eae2ba5df31ca8f7457d9c8dab3ac68b1d3c4
      https://github.com/zanata/zanata-server/commit/0d2eae2ba5df31ca8f7457d9c8dab3ac68b1d3c4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    M zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    M zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    M zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Fix proxies to implement all interfaces from superclasses

  Commit: 9e434add8465c973e29ff2eb2dd47dd97554f3db
      https://github.com/zanata/zanata-server/commit/9e434add8465c973e29ff2eb2dd47dd97554f3db
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Only rebuild Groovy classes on full Eclipse build

  Commit: 65689d4eaaa6b882b12e1121f18ce2ada45cfa30
      https://github.com/zanata/zanata-server/commit/65689d4eaaa6b882b12e1121f18ce2ada45cfa30
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java

  Log Message:
  -----------
  map project types to option text in functional tests

  Commit: aaf451d1210a9890aeb90d64610e73c145abfeb7
      https://github.com/zanata/zanata-server/commit/aaf451d1210a9890aeb90d64610e73c145abfeb7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Clean up poms by removing obsolete sections

  Commit: e48a8acf389fe76b12fb50d930e426c346602572
      https://github.com/zanata/zanata-server/commit/e48a8acf389fe76b12fb50d930e426c346602572
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    R zanata-war/src/main/resources-dev/components.properties

  Log Message:
  -----------
  Remove obsolete directory

  Commit: c9d12ebb33116c1a9ab01ab1806aee2d43080106
      https://github.com/zanata/zanata-server/commit/c9d12ebb33116c1a9ab01ab1806aee2d43080106
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml

  Log Message:
  -----------
  Remove another obsolete section from pom

  Commit: 7a0589c3afb7f943504769cf5f58230bd8599d4a
      https://github.com/zanata/zanata-server/commit/7a0589c3afb7f943504769cf5f58230bd8599d4a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/pom.xml
    R functional-test/src/test/resources/as7module/zanata/module.xml
    M functional-test/src/test/resources/conf/standalone.xml
    R functional-test/src/test/resources/conf/zanata.properties
    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/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    R zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    R zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml

  Log Message:
  -----------
  Merge branch 'pom-cleanup' into wrappedconnections

  Commit: 883926b218654dc7fc387edd278a6938a9387c24
      https://github.com/zanata/zanata-server/commit/883926b218654dc7fc387edd278a6938a9387c24
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
   Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: 3935e658e2fcfad0a31904f10a68704dc0a1f3cc
      https://github.com/zanata/zanata-server/commit/3935e658e2fcfad0a31904f10a68704dc0a1f3cc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java

  Log Message:
  -----------
  Merge pull request #24 from zanata/fix-project-type-test

map project types to option text in functional tests

  Commit: 2cc56395908ffc7ccdab6c187435d353c5b8e915
      https://github.com/zanata/zanata-server/commit/2cc56395908ffc7ccdab6c187435d353c5b8e915
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
   Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: 61d0c53482cb58372f2c38f6fcd2f00538fe9672
      https://github.com/zanata/zanata-server/commit/61d0c53482cb58372f2c38f6fcd2f00538fe9672
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ProxyUtil.java

  Log Message:
  -----------
  Fix ClassLoader issue when running inside app server

  Commit: c541bc3dbbdc4f8189cdcab5c83bad8fb9a66cf2
      https://github.com/zanata/zanata-server/commit/c541bc3dbbdc4f8189cdcab5c83bad8fb9a66cf2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    M zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    M zanata-war/src/main/java/org/zanata/database/StatementWrapper.java

  Log Message:
  -----------
  Fix ResultSet/Statement inconsistency which triggers warning HHH000387

See https://hibernate.atlassian.net/browse/HHH-8210

  Commit: 3c06305a2c1163ccd1b904a054c1f64be9e2534c
      https://github.com/zanata/zanata-server/commit/3c06305a2c1163ccd1b904a054c1f64be9e2534c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Disable debugging in arquillian.xml again

  Commit: b4b3913adb78124ad16fef40564fafb74f9960bf
      https://github.com/zanata/zanata-server/commit/b4b3913adb78124ad16fef40564fafb74f9960bf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #23 from zanata/fix-eclipse

Only rebuild Groovy classes on full Eclipse build

  Commit: 887708a9e3520f628bb3354a7aa9f999926c5d7f
      https://github.com/zanata/zanata-server/commit/887708a9e3520f628bb3354a7aa9f999926c5d7f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java

  Log Message:
  -----------
  remove unused imports, injections and annotations

  Commit: 943d32bb4e86b98451a7977c5707a0d014fd798d
      https://github.com/zanata/zanata-server/commit/943d32bb4e86b98451a7977c5707a0d014fd798d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/search/ActiveStates.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java

  Log Message:
  -----------
  Extract builder and states class from FilterConstraints

  Commit: dd5806758b5a20725c035f1ab0051b8c32ad5837
      https://github.com/zanata/zanata-server/commit/dd5806758b5a20725c035f1ab0051b8c32ad5837
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java

  Log Message:
  -----------
  Use ActiveStates in search and navigation actions

  Commit: 2abfe51676dc9b155feb95aee5cbd9fcf367f420
      https://github.com/zanata/zanata-server/commit/2abfe51676dc9b155feb95aee5cbd9fcf367f420
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M pom.xml

  Log Message:
  -----------
  set client version in test

  Commit: 29ea2e5dfe7a041aac139acd41955f96be47c75f
      https://github.com/zanata/zanata-server/commit/29ea2e5dfe7a041aac139acd41955f96be47c75f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  split TextFlowDAOTest.canBuildContentStateQuery() into more atomic tests

  Commit: bafb111ef171b8a6efcb6bd5772931f08c818537
      https://github.com/zanata/zanata-server/commit/bafb111ef171b8a6efcb6bd5772931f08c818537
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M pom.xml

  Log Message:
  -----------
  Merge pull request #27 from zanata/fix-functional-test

Set zanata client version to use latest snapshot

  Commit: 60ae8a847380d0386a3ab2d42523a0fd578df654
      https://github.com/zanata/zanata-server/commit/60ae8a847380d0386a3ab2d42523a0fd578df654
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  split TextFlowDAOTest.canGetTextFlowsByStatus into more atomic tests

  Commit: af83b0e9be5a9241a041df2eef3f9bf3cff9fca6
      https://github.com/zanata/zanata-server/commit/af83b0e9be5a9241a041df2eef3f9bf3cff9fca6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join.xhtml

  Log Message:
  -----------
  Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: 18cef6f7f643957f40943e23a05f13b2b9155269
      https://github.com/zanata/zanata-server/commit/18cef6f7f643957f40943e23a05f13b2b9155269
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java

  Log Message:
  -----------
  Revert FilterConstraints includeStates(ActiveStates) to old behaviour

    Old behaviour was to flip all states to on in the case that they
    were all off. The change should only be temporary since it is
    surprising - some changes to the code for the editor are necessary
    before this can be made more sensible.

  Commit: 20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
      https://github.com/zanata/zanata-server/commit/20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Initial revision of a TMX parser.

  Commit: 1cbcf3bc6cbc3dbbe66e37dd7607da8e4420e9a0
      https://github.com/zanata/zanata-server/commit/1cbcf3bc6cbc3dbbe66e37dd7607da8e4420e9a0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  disable mysterious breaking test in TextFlowDAOTest

  Commit: f84710ee56d3710b9970ed6cb4e6272ea13b2f96
      https://github.com/zanata/zanata-server/commit/f84710ee56d3710b9970ed6cb4e6272ea13b2f96
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge pull request #26 from zanata/wrappedconnections

Always enable WrappedConnectionProvider, but disabled for MySQL

  Commit: ba6eb0096e7f71ee9152165de9f8041a30cc99ca
      https://github.com/zanata/zanata-server/commit/ba6eb0096e7f71ee9152165de9f8041a30cc99ca
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java

  Log Message:
  -----------
  protect some wrapped builder calls from automatic formatting

  Commit: f6eda7ba4c17c442871a469148d702af47cf031a
      https://github.com/zanata/zanata-server/commit/f6eda7ba4c17c442871a469148d702af47cf031a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Implemented email request to join language team with roles

  Commit: 71737c471686e1a61963eabb20910d93c1e87f87
      https://github.com/zanata/zanata-server/commit/71737c471686e1a61963eabb20910d93c1e87f87
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  Remove 'has error' filter out of 'complete' filtering option

  Commit: d54d12d821b3d00600fae6d542927ef4fc5cb177
      https://github.com/zanata/zanata-server/commit/d54d12d821b3d00600fae6d542927ef4fc5cb177
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Add metadata to the Translation Memory entities.

  Commit: c65bb7c0e9662293db38a78a0e88f144f7e87917
      https://github.com/zanata/zanata-server/commit/c65bb7c0e9662293db38a78a0e88f144f7e87917
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  Merge pull request #29 from zanata/FilterStatesUI

Remove 'has error' filter out of 'complete' filtering option

  Commit: eb25d69be61ebb32a856ad50af6cd2117fabee65
      https://github.com/zanata/zanata-server/commit/eb25d69be61ebb32a856ad50af6cd2117fabee65
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_update_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml

  Log Message:
  -----------
  Work in progress: enhanced reviewer implementation: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: d06f5984eaa1a956f60726aefe29e670dde50dc2
      https://github.com/zanata/zanata-server/commit/d06f5984eaa1a956f60726aefe29e670dde50dc2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  clear database before starting TextFlowDAOTest

  Commit: 03e6f634b4057b763142ba2eab0ae53876963cb5
      https://github.com/zanata/zanata-server/commit/03e6f634b4057b763142ba2eab0ae53876963cb5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge branch 'master' into refactor-filterconstraints

  Commit: 77c573b08fdf29408be5249fa5234caafa5a05cb
      https://github.com/zanata/zanata-server/commit/77c573b08fdf29408be5249fa5234caafa5a05cb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_update_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml

  Log Message:
  -----------
   Implemented email request to join language team with roles

  Commit: 0bad9feb50c94fe490cecb4c909b104875c57b3d
      https://github.com/zanata/zanata-server/commit/0bad9feb50c94fe490cecb4c909b104875c57b3d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  User Registration tests

Currently, successful registration testing is blocked by Captcha validation.
Includes register page, and testcases for field validation on usernames and
email RFC2822 compliance.
Basic validation for password matching and Captcha rejection.

  Commit: 96d8f0598490355aeb518daafd8895fceaa413f8
      https://github.com/zanata/zanata-server/commit/96d8f0598490355aeb518daafd8895fceaa413f8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/RFC2822.java

  Log Message:
  -----------
  Better description of the RFC2822 class

The description was lacking / inaccurate.

  Commit: a034279807e4ed0b1fe4bdddb005800141aa3d3b
      https://github.com/zanata/zanata-server/commit/a034279807e4ed0b1fe4bdddb005800141aa3d3b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Implement rules in workspace for reviewer role: https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: 33e5375531661c64bfdf396606287491bee40e0e
      https://github.com/zanata/zanata-server/commit/33e5375531661c64bfdf396606287491bee40e0e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/search/ActiveStates.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java

  Log Message:
  -----------
  Rename ActiveStates to ContentStateGroup, rename methods and move to gwt shared.

    Move to gwt includes a few minor changes to allow gwt-rpc serialization.

  Commit: 6af192792c53b9c323419d85762c1a7b80d6da34
      https://github.com/zanata/zanata-server/commit/6af192792c53b9c323419d85762c1a7b80d6da34
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Fix unit test for new restrictions in workspace

  Commit: 5b96ca4ceba12f6670df275dc2775900614d4b92
      https://github.com/zanata/zanata-server/commit/5b96ca4ceba12f6670df275dc2775900614d4b92
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

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

  Commit: b75e3966fcf3d9f33d7495853889d054b4d342e1
      https://github.com/zanata/zanata-server/commit/b75e3966fcf3d9f33d7495853889d054b4d342e1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  prevent TextFlowDAO from conflating states in queries

  Commit: 5317a11c0465fa365a88fb103824311142d5bc45
      https://github.com/zanata/zanata-server/commit/5317a11c0465fa365a88fb103824311142d5bc45
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Log Message:
  -----------
  Fix SlugEntityBaseTest

  Commit: 02bbea7391b2188ae1ad9749671ffeb97f09c441
      https://github.com/zanata/zanata-server/commit/02bbea7391b2188ae1ad9749671ffeb97f09c441
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

  Commit: 39c1da832c98d284be3ca41f1c2b8ca80f7761d6
      https://github.com/zanata/zanata-server/commit/39c1da832c98d284be3ca41f1c2b8ca80f7761d6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  fix syntax error in inline css in TransFilterView.ui.xml

    This error was leading to several lines of warnings in the gwt build.

  Commit: 4fdac3a03b05694cefe0eb227e561eefce8f7558
      https://github.com/zanata/zanata-server/commit/4fdac3a03b05694cefe0eb227e561eefce8f7558
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  Merge pull request #32 from zanata/transfilterview-minor-fix

Fix syntax error in inline css in TransFilterView.ui.xml

  Commit: 102325c4cb24b8189a728376a6abfc28036726fd
      https://github.com/zanata/zanata-server/commit/102325c4cb24b8189a728376a6abfc28036726fd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Add plain text content field to Trans unit variants/

This is to make sure we can store and index a plain text version of the possibly formatted tmx segment string.

  Commit: f71b38466f3218e3e78fabbd9ce5a756a72e20cf
      https://github.com/zanata/zanata-server/commit/f71b38466f3218e3e78fabbd9ce5a756a72e20cf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  refactor filter state checkbox update code for readability

  Commit: 8590ec58fc3566bb2af4b7b0b509dbba6b204597
      https://github.com/zanata/zanata-server/commit/8590ec58fc3566bb2af4b7b0b509dbba6b204597
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  Merge pull request #33 from zanata/nicer-checkbox-update

Refactor filter state checkbox update code for readability

  Commit: fe9691c874b0ba31fed84d92c9a7854aa5bc25e3
      https://github.com/zanata/zanata-server/commit/fe9691c874b0ba31fed84d92c9a7854aa5bc25e3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/RFC2822NegativeTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RFC2822PositiveTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java

  Log Message:
  -----------
  Make RFC2822 and username tests use Theories rather than loops

Control functions (for, if, etc) in tests are bad. The (experimental) Therories
class looks to handle data based tests quite elegantly.
Move username and email validation to separate classes to test.
Also, fix minor bug in GlossaryTestSuite (database reset rules) and
give the Register tests a waitFor for the fields/errors to become visible,
to prevent element stale / not found problems.

  Commit: 06a0a6ab2a716fdc0a6abfb3c780d7d36ea93e9f
      https://github.com/zanata/zanata-server/commit/06a0a6ab2a716fdc0a6abfb3c780d7d36ea93e9f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_translator_user.sql
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Fix functional test for https://bugzilla.redhat.com/show_bug.cgi?id=981067

  Commit: 2724c49dff05091130c30bcee7b816eaedabd369
      https://github.com/zanata/zanata-server/commit/2724c49dff05091130c30bcee7b816eaedabd369
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java

  Log Message:
  -----------
  make editor request all states when no states checked in UI

  Commit: 9750d84815107bb47b7de625527f4c18061ba84f
      https://github.com/zanata/zanata-server/commit/9750d84815107bb47b7de625527f4c18061ba84f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java

  Log Message:
  -----------
  Fix some issues found in findBugs

  Commit: 4313e1ebd607ee59897f8ea16d57ea332fb905ba
      https://github.com/zanata/zanata-server/commit/4313e1ebd607ee59897f8ea16d57ea332fb905ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd

  Log Message:
  -----------
  Move TMX DTD

  Commit: 150f46468edb3829e1988f1da4a66c55c073e416
      https://github.com/zanata/zanata-server/commit/150f46468edb3829e1988f1da4a66c55c073e416
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  rhbz983370 show indeterminate state for parent filter checkboxes when some children checked

  Commit: 87dfb6d16ba3189045a5490f5000c8c99ee8a9f6
      https://github.com/zanata/zanata-server/commit/87dfb6d16ba3189045a5490f5000c8c99ee8a9f6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  rhbz983370 rename parent checkboxes for clarity

  Commit: 9b9cfeaf9495a86da341c901380ebf589505c6c3
      https://github.com/zanata/zanata-server/commit/9b9cfeaf9495a86da341c901380ebf589505c6c3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  use standard state order for items repeated for each state

  Commit: 6c0eea5f11bf6b8e602ef170d4fd63c3d3033ca2
      https://github.com/zanata/zanata-server/commit/6c0eea5f11bf6b8e602ef170d4fd63c3d3033ca2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml

  Log Message:
  -----------
  Merge pull request #36 from zanata/indeterminate-checkboxes

Indeterminate states for parent filter checkboxes

  Commit: 87eb390704d66cf8d68aa22d32abb48c10e70877
      https://github.com/zanata/zanata-server/commit/87eb390704d66cf8d68aa22d32abb48c10e70877
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java

  Log Message:
  -----------
  Update to latest parent pom

  Commit: 528142f0c4ee9ce5d98c05e1e74dba57edb21a93
      https://github.com/zanata/zanata-server/commit/528142f0c4ee9ce5d98c05e1e74dba57edb21a93
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java

  Log Message:
  -----------
  Add findbugs annotations

  Commit: fd60b69ca0934cceef9f37e7f5dd6ce7b680d67a
      https://github.com/zanata/zanata-server/commit/fd60b69ca0934cceef9f37e7f5dd6ce7b680d67a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  rhbz983370 show correct parent checkbox state on page refresh/reload

  Commit: c4676c36ecbd97311e985b14696a667c46b0bb09
      https://github.com/zanata/zanata-server/commit/c4676c36ecbd97311e985b14696a667c46b0bb09
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java

  Log Message:
  -----------
  Merge pull request #35 from zanata/findBugfixes

Fix some issues found in findBugs

  Commit: 1b105daf741513770a0d217248e47a18e449e991
      https://github.com/zanata/zanata-server/commit/1b105daf741513770a0d217248e47a18e449e991
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 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/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java

  Log Message:
  -----------
  Merge pull request #37 from zanata/parent13

Update to latest parent pom; add findbugs annotations

  Commit: b4192a10783083118e741bd26aa01c39eaa89b3d
      https://github.com/zanata/zanata-server/commit/b4192a10783083118e741bd26aa01c39eaa89b3d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java

  Log Message:
  -----------
  Merge pull request #38 from zanata/indeterminate-checkboxes

Show correct parent checkbox state on page refresh/reload

  Commit: 452292d588b55dba6f66e8b80e8604c44337f6df
      https://github.com/zanata/zanata-server/commit/452292d588b55dba6f66e8b80e8604c44337f6df
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update to latest parent pom and add xom dependency

  Commit: 906d47d7d328a8bc50ba3ce517872479606017ee
      https://github.com/zanata/zanata-server/commit/906d47d7d328a8bc50ba3ce517872479606017ee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz978666 - add database table and liquibase change log for review translation comment

  Commit: f07c6426c39e1c3fbfbb554e1918447229db8383
      https://github.com/zanata/zanata-server/commit/f07c6426c39e1c3fbfbb554e1918447229db8383
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserComment.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java

  Log Message:
  -----------
  rhbz978666 - update TransUnit to indicate comment existance

  Commit: 643c7c233ab570d35d3638ee3bcf1d72fa3e7bf4
      https://github.com/zanata/zanata-server/commit/643c7c233ab570d35d3638ee3bcf1d72fa3e7bf4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  rhbz978666 - UI and tests

- add review comment rpc
- get review comments rpc
- review comment gwt MVP
- change to TransUnit
- change to editor buttons display
- annotate a few areas that have technical debt (hibernate performance related)

  Commit: de9f9f2e6c66c29b705e18a902175456d658c86a
      https://github.com/zanata/zanata-server/commit/de9f9f2e6c66c29b705e18a902175456d658c86a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java

  Log Message:
  -----------
  Tech Debt: eager load text flow targets when we intended to access them

  Commit: 30a65f3adef2ec731f112d08610d5a3a2143eaf1
      https://github.com/zanata/zanata-server/commit/30a65f3adef2ec731f112d08610d5a3a2143eaf1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java

  Log Message:
  -----------
  rename methods after refactor

  Commit: 5bf3c8a9315d46afa7ba3938cf64808eea28ff0f
      https://github.com/zanata/zanata-server/commit/5bf3c8a9315d46afa7ba3938cf64808eea28ff0f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java

  Log Message:
  -----------
  revert optimization change

this is too big a refactoring and should do in its own pull request

  Commit: 65bd09cf2614484a32e92fbe0d4ab31fe643d7dd
      https://github.com/zanata/zanata-server/commit/65bd09cf2614484a32e92fbe0d4ab31fe643d7dd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml

  Log Message:
  -----------
  rhbz978666 - add comment indicator

  Commit: 3fbc6adde7ae59f2bdf354f5a3c62705df3f05c6
      https://github.com/zanata/zanata-server/commit/3fbc6adde7ae59f2bdf354f5a3c62705df3f05c6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - add comment indicator

  Commit: 08d2414acfb5d8e5f752a7951f228236245234f6
      https://github.com/zanata/zanata-server/commit/08d2414acfb5d8e5f752a7951f228236245234f6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  minor clean up

  Commit: 1744a5abe854af58f236fad8da0630e1ce9c04af
      https://github.com/zanata/zanata-server/commit/1744a5abe854af58f236fad8da0630e1ce9c04af
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  rhbz978666 - comment change is broadcasted thru event service

  Commit: bad1cdb7699a92fd2b277040accde55d5470e524
      https://github.com/zanata/zanata-server/commit/bad1cdb7699a92fd2b277040accde55d5470e524
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java

  Log Message:
  -----------
  minor - reformat comment

  Commit: a02e784e16db946bb0f6d2133c40827dd1b02bcc
      https://github.com/zanata/zanata-server/commit/a02e784e16db946bb0f6d2133c40827dd1b02bcc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - style comments made against old translation

  Commit: ec4db57ec73fa8d9274be1b992acdc6a73159a7f
      https://github.com/zanata/zanata-server/commit/ec4db57ec73fa8d9274be1b992acdc6a73159a7f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  rhbz978666 - minor query improvement

  Commit: 1a93c5a7873be09c8d1a8f4f6ded2f4cc7722e67
      https://github.com/zanata/zanata-server/commit/1a93c5a7873be09c8d1a8f4f6ded2f4cc7722e67
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml

  Log Message:
  -----------
  minor ui change

  Commit: cf74cd1eec569e77164b0b398be02d4c4c93b34a
      https://github.com/zanata/zanata-server/commit/cf74cd1eec569e77164b0b398be02d4c4c93b34a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java

  Log Message:
  -----------
  rhbz978666 - remove unused methods

  Commit: fa6a9e2fe66b7349f7128d4a59e830fcf5cafa3b
      https://github.com/zanata/zanata-server/commit/fa6a9e2fe66b7349f7128d4a59e830fcf5cafa3b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java

  Log Message:
  -----------
  rhbz978666 - remove natural id annotation

  Commit: 3f56cb52d25c20d84bd8a71c309c44bcd9a39c5c
      https://github.com/zanata/zanata-server/commit/3f56cb52d25c20d84bd8a71c309c44bcd9a39c5c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java

  Log Message:
  -----------
  rhbz978666 - use lombok for entity

  Commit: 7a846b5693e0cbda70137a0e189c777196012f55
      https://github.com/zanata/zanata-server/commit/7a846b5693e0cbda70137a0e189c777196012f55
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  list classes in persistence.xml in alphabetical order

  Commit: 8436bd248150d83e2bd41df3d21a580b4f154918
      https://github.com/zanata/zanata-server/commit/8436bd248150d83e2bd41df3d21a580b4f154918
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java

  Log Message:
  -----------
  prevent server returning all states when none are requested

  Commit: 65824b2234bcffde82e7871bc0b5ef6bc3fb4943
      https://github.com/zanata/zanata-server/commit/65824b2234bcffde82e7871bc0b5ef6bc3fb4943
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  prevent TextFlowDAO returning all states when none are requested

  Commit: 6ed1bc3bfaa59a03c8afc93a23ae8525afaced0d
      https://github.com/zanata/zanata-server/commit/6ed1bc3bfaa59a03c8afc93a23ae8525afaced0d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge pull request #19 from zanata/user-comments

Translation review comment

  Commit: c910766ab3f6c79cdd48581001f135af4680ac1b
      https://github.com/zanata/zanata-server/commit/c910766ab3f6c79cdd48581001f135af4680ac1b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java

  Log Message:
  -----------
  move rule for requesting all states when none are checked into context class

  Commit: 85d0ee8c50bd9337964c6bcdf1872e62c3ef5ac9
      https://github.com/zanata/zanata-server/commit/85d0ee8c50bd9337964c6bcdf1872e62c3ef5ac9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  fix liquibase changelong for mysql

  Commit: daf834bbcc0198afe53497fcb0cf102534b01bc8
      https://github.com/zanata/zanata-server/commit/daf834bbcc0198afe53497fcb0cf102534b01bc8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java

  Log Message:
  -----------
  Fix dateTime formatter util

  Commit: df9ddc2b46e98be99f484563d398172b5e57aef0
      https://github.com/zanata/zanata-server/commit/df9ddc2b46e98be99f484563d398172b5e57aef0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java

  Log Message:
  -----------
  Merge pull request #42 from zanata/fixDateTimeFormatter

Fix dateTime formatter in DateUtil

  Commit: bc8c0ad2fac25948f6b1b076a30ca09a3c832ad1
      https://github.com/zanata/zanata-server/commit/bc8c0ad2fac25948f6b1b076a30ca09a3c832ad1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  Merge pull request #41 from zanata/fix-changelog-mysql

fix liquibase changelog for mysql

  Commit: 189970abf372f47227c43e38466d7bd7da16dacf
      https://github.com/zanata/zanata-server/commit/189970abf372f47227c43e38466d7bd7da16dacf
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    R functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RFC2822NegativeTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RFC2822PositiveTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  Improve the RFC2822 files to be more descriptive and clean

Split email addresses into valid and non-valid.
Use an enum for the address entries.
Improve docs.

  Commit: 10d1f864e753f49b567265b7812af58b08db11fc
      https://github.com/zanata/zanata-server/commit/10d1f864e753f49b567265b7812af58b08db11fc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.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/ui/EditorButtonsWidget.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Refactor some coding as per suggested

  Commit: c90317f8b59fec2ce7ca605c4c5cc1d01c4e55c1
      https://github.com/zanata/zanata-server/commit/c90317f8b59fec2ce7ca605c4c5cc1d01c4e55c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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

Conflicts:
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Commit: f25b57037a8914536cedaedc2fec6dc58a9be433
      https://github.com/zanata/zanata-server/commit/f25b57037a8914536cedaedc2fec6dc58a9be433
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java

  Log Message:
  -----------
  Fix null pointer exception

  Commit: 41783d7964577c0dd65728ff14553c7a378b1bc4
      https://github.com/zanata/zanata-server/commit/41783d7964577c0dd65728ff14553c7a378b1bc4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java

  Log Message:
  -----------
  Fix some line length and function calls

Function calls (specifically new BasicWorkFlow) replaced.
Wrapped some long lines.

  Commit: 62087a3b64ab7c020a40133df7281dc7edd74051
      https://github.com/zanata/zanata-server/commit/62087a3b64ab7c020a40133df7281dc7edd74051
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  Disable modify translation for reviewer using keyboard shortcut

  Commit: 21604a5ea4f39cc5ccfd237232a0624b81a522cc
      https://github.com/zanata/zanata-server/commit/21604a5ea4f39cc5ccfd237232a0624b81a522cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #28 from zanata/refactor-filterconstraints

Refactor FilterConstraints

  Commit: ce224e3f9345c1812f6a239499d274971bd1eea1
      https://github.com/zanata/zanata-server/commit/ce224e3f9345c1812f6a239499d274971bd1eea1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml

  Log Message:
  -----------
  fix paging bug in editor: https://bugzilla.redhat.com/show_bug.cgi?id=983786

  Commit: f1b38b07b1342d9b70073294a8d10cb98eed71ad
      https://github.com/zanata/zanata-server/commit/f1b38b07b1342d9b70073294a8d10cb98eed71ad
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  Merge pull request #43 from zanata/flip-filters-in-editor

Re-created: moves all logic to the server for requesting all states when no checkboxes are checked.

  Commit: d19c1baadefb013674c2f5cd1ae96f0ecf8930eb
      https://github.com/zanata/zanata-server/commit/d19c1baadefb013674c2f5cd1ae96f0ecf8930eb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml

  Log Message:
  -----------
  Merge pull request #44 from zanata/rhbz983786

fix paging bug in editor: https://bugzilla.redhat.com/show_bug.cgi?id=983786

  Commit: 08e23c34622bcee76dec10313663e9fc3cabcd89
      https://github.com/zanata/zanata-server/commit/08e23c34622bcee76dec10313663e9fc3cabcd89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java

  Log Message:
  -----------
  Allow creationDate and lastChanged to be set explicitly

  Commit: 13d53e52d8f92574dcab91aef9f0014145954349
      https://github.com/zanata/zanata-server/commit/13d53e52d8f92574dcab91aef9f0014145954349
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  rhbz980658 rearrange source upload method to prepare for better structuring

  Commit: 0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
      https://github.com/zanata/zanata-server/commit/0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add Rest service and draft web pages to upload translation memories.

  Commit: 8e2de9642b527fe60829a40f7a861e77dcd1ed48
      https://github.com/zanata/zanata-server/commit/8e2de9642b527fe60829a40f7a861e77dcd1ed48
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/tm-import' into tm-import

Conflicts:
	zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Commit: 4329ae39717748e9de6890ee1b7d508d43baab92
      https://github.com/zanata/zanata-server/commit/4329ae39717748e9de6890ee1b7d508d43baab92
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java

  Log Message:
  -----------
  Use lombok's @Data instead of @Setter and @Getter.

Reduce the size of our entity code even further.

  Commit: 869f0c3630eb7543a033fd654a7feeba1a739a17
      https://github.com/zanata/zanata-server/commit/869f0c3630eb7543a033fd654a7feeba1a739a17
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M pom.xml
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Switch TMXParser to ElementBuilder; Change TM metadata to use Json

  Commit: b9325322bd00c36a903ce2aab1a715ffdaf13aaf
      https://github.com/zanata/zanata-server/commit/b9325322bd00c36a903ce2aab1a715ffdaf13aaf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  rhbz980658 add GlobalDocumentId with tests

  Commit: cf34ad4c102e9a29f141675880e0af761f41735b
      https://github.com/zanata/zanata-server/commit/cf34ad4c102e9a29f141675880e0af761f41735b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
	zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Commit: 475e13cf75aa9b24c1a5cea83fb87f60f0b09817
      https://github.com/zanata/zanata-server/commit/475e13cf75aa9b24c1a5cea83fb87f60f0b09817
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
	zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
	zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java

  Commit: b91f789236997c759fd88f81c8ee8168ed18f771
      https://github.com/zanata/zanata-server/commit/b91f789236997c759fd88f81c8ee8168ed18f771
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Correct tests and change UI messages.

  Commit: d12578e212b8c492405a12c84d538d30da7b43b2
      https://github.com/zanata/zanata-server/commit/d12578e212b8c492405a12c84d538d30da7b43b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java

  Log Message:
  -----------
  Fix compilation error

  Commit: b8841539c28ba260c907f0d09e5c8dec0c1ada32
      https://github.com/zanata/zanata-server/commit/b8841539c28ba260c907f0d09e5c8dec0c1ada32
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update xom version for server

  Commit: c9ae42d9f2e259b61030e8df0f6b9bc27cfa2ba1
      https://github.com/zanata/zanata-server/commit/c9ae42d9f2e259b61030e8df0f6b9bc27cfa2ba1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  Update formatter rules, particularly: Never join already wrapped lines

  Commit: 3174b234ab15bcf4a15b27640744d1a88d98e9a4
      https://github.com/zanata/zanata-server/commit/3174b234ab15bcf4a15b27640744d1a88d98e9a4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373

  Commit: a7cc1e3aede8b7428fabc31ccd2947c5ebff07a9
      https://github.com/zanata/zanata-server/commit/a7cc1e3aede8b7428fabc31ccd2947c5ebff07a9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java

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

  Commit: 82b30b24705cef251b6e68450774966981eafb29
      https://github.com/zanata/zanata-server/commit/82b30b24705cef251b6e68450774966981eafb29
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java

  Log Message:
  -----------
  Refactor as per suggested by professional code auditor

  Commit: 014cb2d6450178df95662818311c9aebe58d1216
      https://github.com/zanata/zanata-server/commit/014cb2d6450178df95662818311c9aebe58d1216
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  refactor as per suggested

  Commit: 6358ba5e1220739c79a6ff060eba730a7dc85775
      https://github.com/zanata/zanata-server/commit/6358ba5e1220739c79a6ff060eba730a7dc85775
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml

  Log Message:
  -----------
  Refactor as per requested

  Commit: 6b3899d482212b0306fb410f1c26a359ae59f05d
      https://github.com/zanata/zanata-server/commit/6b3899d482212b0306fb410f1c26a359ae59f05d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  Fix drools rule with new method name

  Commit: c8fdd3819ca0a71bae816bb1ba874f110f398444
      https://github.com/zanata/zanata-server/commit/c8fdd3819ca0a71bae816bb1ba874f110f398444
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java

  Log Message:
  -----------
  rhbz983373 - de-reference obsolete variable when context change

  Commit: 927db71ba400871a8d913e9cf60f384a5b8f7d2d
      https://github.com/zanata/zanata-server/commit/927db71ba400871a8d913e9cf60f384a5b8f7d2d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #45 from zanata/update-xom

Update xom version for server

  Commit: 3259a71ab580cb2a6ce3d8a4a7043f679ee93150
      https://github.com/zanata/zanata-server/commit/3259a71ab580cb2a6ce3d8a4a7043f679ee93150
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Merge pull request #47 from zanata/rhbz983373-2

Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373

  Commit: 80a361221c1915bc3314692d9dbc148ef24315e2
      https://github.com/zanata/zanata-server/commit/80a361221c1915bc3314692d9dbc148ef24315e2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge commit '927db71ba400871a8d913e9cf60f384a5b8f7d2d' into HEAD

  Commit: bf195b65f9fcdca5c1ed8ce527a749b6e0736f70
      https://github.com/zanata/zanata-server/commit/bf195b65f9fcdca5c1ed8ce527a749b6e0736f70
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Merge pull request #31 from zanata/register-functional-tests

User Registration tests

  Commit: bc81b3eac8c2856a68331198b4d3b035d7a483b7
      https://github.com/zanata/zanata-server/commit/bc81b3eac8c2856a68331198b4d3b035d7a483b7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Merge commit 'bf195b65f9fcdca5c1ed8ce527a749b6e0736f70' into HEAD

  Commit: 2daf865ee2228f10d344d8b8a7ffa04be84f1959
      https://github.com/zanata/zanata-server/commit/2daf865ee2228f10d344d8b8a7ffa04be84f1959
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  Allow the use of different displays for functional test

Using the DISPLAY variable allows a less "obnoxious" running of
tests in an Xserver, preventing popup windows and accidental
interaction with a running test environment.

  Commit: 49e1ee4df6a4a98a1dd6ab0bdd433665691d6144
      https://github.com/zanata/zanata-server/commit/49e1ee4df6a4a98a1dd6ab0bdd433665691d6144
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Log Message:
  -----------
  add wait until logic around dynamic field

  Commit: de43f0cad800db9e115b57f7e2fb32e400bcac22
      https://github.com/zanata/zanata-server/commit/de43f0cad800db9e115b57f7e2fb32e400bcac22
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  strip trailing whitespace and tabs

  Commit: 35dc682a178d8fe7c210380eb9d500ee1c47f9ec
      https://github.com/zanata/zanata-server/commit/35dc682a178d8fe7c210380eb9d500ee1c47f9ec
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html

  Log Message:
  -----------
  remove apparent accidental paste

  Commit: 32123ed8ea58732493ead21b3362ca1039dff617
      https://github.com/zanata/zanata-server/commit/32123ed8ea58732493ead21b3362ca1039dff617
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Log Message:
  -----------
  revert ManageUserAccountPage methods to prevent instability in Chrome

  Commit: 9760474a27ecec86f6fedacf7b0d425762212c1d
      https://github.com/zanata/zanata-server/commit/9760474a27ecec86f6fedacf7b0d425762212c1d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java

  Log Message:
  -----------
  Extract TransUnitPersister

  Commit: 8b1e14d64a8f0e77e1d6f1a92b8d84cd4aa694e8
      https://github.com/zanata/zanata-server/commit/8b1e14d64a8f0e77e1d6f1a92b8d84cd4aa694e8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  Merge pull request #48 from zanata/run-xnest

Allow the use of different displays for functional test

  Commit: 0a84eb5b6dd9dbe9037b17ea651c88fe4ec7e8bd
      https://github.com/zanata/zanata-server/commit/0a84eb5b6dd9dbe9037b17ea651c88fe4ec7e8bd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Log Message:
  -----------
  Merge pull request #50 from zanata/fix-functional-test

add wait until logic around dynamic field

  Commit: 602d3d7f1cc436a18a2dd3abb3a9054871ebdea4
      https://github.com/zanata/zanata-server/commit/602d3d7f1cc436a18a2dd3abb3a9054871ebdea4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into refactor-file-storage

  Commit: 5e14a3aa273ab88da92585b25ca37b8eb2c12a78
      https://github.com/zanata/zanata-server/commit/5e14a3aa273ab88da92585b25ca37b8eb2c12a78
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  move virus scan exception handling to lower level

  Commit: 1cc81e267aafd4d2d419b3cccc17fc80f53af319
      https://github.com/zanata/zanata-server/commit/1cc81e267aafd4d2d419b3cccc17fc80f53af319
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  move source upload authorization exception handling to lower level

  Commit: 34969b3a997db7cdfebb28c2d677c0223eac175c
      https://github.com/zanata/zanata-server/commit/34969b3a997db7cdfebb28c2d677c0223eac175c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  sort eclipse formatting rules to enhance future diffs

  Commit: 72079ed37970b7dbb6e8b62d3701d0933fc03d9e
      https://github.com/zanata/zanata-server/commit/72079ed37970b7dbb6e8b62d3701d0933fc03d9e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  Merge pull request #46 from zanata/modified-formatter

Update formatter rules, particularly: Never join already wrapped lines

  Commit: 8fa963db059beebc9ec37088ba17c88825b5e34f
      https://github.com/zanata/zanata-server/commit/8fa963db059beebc9ec37088ba17c88825b5e34f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  remove obsolete throws declaration

  Commit: 6e92450179a66558218cce97fc32b2e455172c01
      https://github.com/zanata/zanata-server/commit/6e92450179a66558218cce97fc32b2e455172c01
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  Extract methods for source and target document upload.

    This is a preliminary step in moving this code into separate classes.

  Commit: 447bc0960c984188a110890d391a3a06b73bb3bb
      https://github.com/zanata/zanata-server/commit/447bc0960c984188a110890d391a3a06b73bb3bb
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.isNewDocument static (mikado method)

  Commit: 1c9ccda72b242b6baa25b47001cc1fd36a7aa019
      https://github.com/zanata/zanata-server/commit/1c9ccda72b242b6baa25b47001cc1fd36a7aa019
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.sourceUploadSuccessResponse static (mikado method)

  Commit: b4f1a974bf563a0ad6a21b772142b36a2a508334
      https://github.com/zanata/zanata-server/commit/b4f1a974bf563a0ad6a21b772142b36a2a508334
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.getInputStream static (mikado method)

  Commit: cc628afc49511a9c2eaf4e68fa258f8a2dac658f
      https://github.com/zanata/zanata-server/commit/cc628afc49511a9c2eaf4e68fa258f8a2dac658f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.combineToTempFile static (mikado method)

  Commit: a1f58b7d8c2983b853976a081a6bc3b78f7bf21f
      https://github.com/zanata/zanata-server/commit/a1f58b7d8c2983b853976a081a6bc3b78f7bf21f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.combineToTempFileAndDeleteUploadRecord static (mikado method)

  Commit: 44cebb1fab7e5ef541156e433f7ec007ccf4377d
      https://github.com/zanata/zanata-server/commit/44cebb1fab7e5ef541156e433f7ec007ccf4377d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.persistTempFileFromUpload static (mikado method)

  Commit: 8c1533f23a786cda2d7b5c02f5c00cd24590f95b
      https://github.com/zanata/zanata-server/commit/8c1533f23a786cda2d7b5c02f5c00cd24590f95b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.isDocumentUploadAllowed and .checkValidSourceUploadType static (mikado method)

  Commit: 8aa96f2eb3f6c31f2d188a1b4e9f9130debc3ec5
      https://github.com/zanata/zanata-server/commit/8aa96f2eb3f6c31f2d188a1b4e9f9130debc3ec5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkSourceUploadAllowed static (mikado method)

  Commit: 739237b9e718b074613c4b031873e0c458bcb5fd
      https://github.com/zanata/zanata-server/commit/739237b9e718b074613c4b031873e0c458bcb5fd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.retrieveUploadObject static (mikado method)

  Commit: f0ad299dc7e2ae35a8f2e8d6a598d2571bb753e8
      https://github.com/zanata/zanata-server/commit/f0ad299dc7e2ae35a8f2e8d6a598d2571bb753e8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkUploadPreconditions static (mikado method)

  Commit: c18b33a6de49a1fc4ac0b42b1711d98ef61657a8
      https://github.com/zanata/zanata-server/commit/c18b33a6de49a1fc4ac0b42b1711d98ef61657a8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java

  Log Message:
  -----------
  Introduce Categories to the functional tests

Categories can be used for sanely filtering test execution.
The Categories of functional tests are:
1. Basic Acceptance Test
2. Detailed Test
3. Concordion Test

Execution of the categories is similar to before, but instead now the
top level suite file can be used, eg.
-Dinclude.test.patterns="**/DetailedTestSuite.java

  Commit: 8406c41a726b0692459bdc9f655f5ae2922f0331
      https://github.com/zanata/zanata-server/commit/8406c41a726b0692459bdc9f655f5ae2922f0331
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkSourceUploadPreconditions static (mikado method)

  Commit: de288bfa552dc5d62661d26a969d0cabcae8d78b
      https://github.com/zanata/zanata-server/commit/de288bfa552dc5d62661d26a969d0cabcae8d78b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.saveUploadPart static (mikado method)

  Commit: b985a9222cb3540860cc1199c739addfd3e23789
      https://github.com/zanata/zanata-server/commit/b985a9222cb3540860cc1199c739addfd3e23789
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.parsePotFile static (mikado method)

  Commit: 521a30e300763ebcc4160cda6b93e3c9091df3d8
      https://github.com/zanata/zanata-server/commit/521a30e300763ebcc4160cda6b93e3c9091df3d8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Commit: ddb3a3b72db48ad8426ccfbcc2617890121345b9
      https://github.com/zanata/zanata-server/commit/ddb3a3b72db48ad8426ccfbcc2617890121345b9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  refactor code as suggested

  Commit: 0eda6426fcbc5090f9f602e8d174ee41224c13cd
      https://github.com/zanata/zanata-server/commit/0eda6426fcbc5090f9f602e8d174ee41224c13cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz981067' of github.com:zanata/zanata-server into rhbz981067

  Commit: e55c1f3dc631690afa3bee74928293170d02274e
      https://github.com/zanata/zanata-server/commit/e55c1f3dc631690afa3bee74928293170d02274e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java

  Log Message:
  -----------
  Fix functional test

  Commit: 486144e5772faa1cd77b0870140ae1859060dc63
      https://github.com/zanata/zanata-server/commit/486144e5772faa1cd77b0870140ae1859060dc63
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.processAdapterFile static (mikado method)

  Commit: 8d767c24f325ca0509c85208eac9c5a11a3f259c
      https://github.com/zanata/zanata-server/commit/8d767c24f325ca0509c85208eac9c5a11a3f259c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.tryUploadSourceFile static (mikado method)

  Commit: 2be2f12986216e380572104b4d3c8d7ab4c9bc79
      https://github.com/zanata/zanata-server/commit/2be2f12986216e380572104b4d3c8d7ab4c9bc79
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  move all source upload methods from FileService to new DocumentUpload (mikado method)

  Commit: 01fd646c05d1a0ce1991ab0fe80dcbb1e00016d2
      https://github.com/zanata/zanata-server/commit/01fd646c05d1a0ce1991ab0fe80dcbb1e00016d2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make tryUploadSourceFile an instance method (mikado method)

  Commit: 363ff91efd20f4ad6e687d119f09090ef6110599
      https://github.com/zanata/zanata-server/commit/363ff91efd20f4ad6e687d119f09090ef6110599
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make helper arguments for source upload into instance fields (mikado method)

  Commit: 4512ce78209fe6e41abc6ca226d3d0521d9351d4
      https://github.com/zanata/zanata-server/commit/4512ce78209fe6e41abc6ca226d3d0521d9351d4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java

  Log Message:
  -----------
  make source upload helper methods private (mikado method)

  Commit: 425a3251d701dee9d047e539946e7c6bdca8b5df
      https://github.com/zanata/zanata-server/commit/425a3251d701dee9d047e539946e7c6bdca8b5df
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  move source upload and helper methods to subclass (mikado method)

  Commit: 48bf83b8cc2d6296fd58ef710d90ba7c50412a7d
      https://github.com/zanata/zanata-server/commit/48bf83b8cc2d6296fd58ef710d90ba7c50412a7d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  use instance helpers in source upload methods (mikado method)

  Commit: 63695e26e3ee9d165180817f87ef4b29c7943663
      https://github.com/zanata/zanata-server/commit/63695e26e3ee9d165180817f87ef4b29c7943663
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Finish TM persistence from an imported file.

Rename Trans Memory rest service to include the word 'Resource' (in line with our other rest services).

  Commit: 683faa22cb1a4007aae0b43840dc83914f9be776
      https://github.com/zanata/zanata-server/commit/683faa22cb1a4007aae0b43840dc83914f9be776
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    M zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java

  Log Message:
  -----------
  Move all knowledge of the storage model for TMX attributes into TMXMetadataHelper

  Commit: b46e6e66bb6957f262ea2917da41763f2ca74a8f
      https://github.com/zanata/zanata-server/commit/b46e6e66bb6957f262ea2917da41763f2ca74a8f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  use composite id object for all source upload methods (mikado method)

  Commit: cddc233baf8d441f5b30ec6a99417ad2da920e25
      https://github.com/zanata/zanata-server/commit/cddc233baf8d441f5b30ec6a99417ad2da920e25
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkDocumentExists static (mikado method)

  Commit: c2213fb90e2fe7209f7ff5a4cc9c1fd31ab1e8ba
      https://github.com/zanata/zanata-server/commit/c2213fb90e2fe7209f7ff5a4cc9c1fd31ab1e8ba
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkValidTranslationUploadType static (mikado method)

  Commit: fc4c7c71b1db4aa826e1b674fe4b7fccf8b07664
      https://github.com/zanata/zanata-server/commit/fc4c7c71b1db4aa826e1b674fe4b7fccf8b07664
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkTranslationUploadPrecondiditons static (mikado method)

  Commit: 6ca82d5e9c0a002a72adaac65270fa7cc300100b
      https://github.com/zanata/zanata-server/commit/6ca82d5e9c0a002a72adaac65270fa7cc300100b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.findHLocale static (mikado method)

  Commit: 46a472ca684cacd3c030e5f7d8570b27c8830d0a
      https://github.com/zanata/zanata-server/commit/46a472ca684cacd3c030e5f7d8570b27c8830d0a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.isTranslationUploadAllowed static (mikado method)

  Commit: 3e6f8997269e763f1dff0b4a464d1473a62b8e48
      https://github.com/zanata/zanata-server/commit/3e6f8997269e763f1dff0b4a464d1473a62b8e48
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.checkTranslationUploadAllowed static (mikado method)

  Commit: 860b096aa99c071a2627db850c6dccbaae8c599a
      https://github.com/zanata/zanata-server/commit/860b096aa99c071a2627db850c6dccbaae8c599a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.newExtensions static (mikado method)

  Commit: 72e2055cb0aeba812fe7555aa30be5c9760dec41
      https://github.com/zanata/zanata-server/commit/72e2055cb0aeba812fe7555aa30be5c9760dec41
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.mergeTypeFromString static (mikado method)

  Commit: 789477c48d37adbe368dd84e82115a99bf1ad302
      https://github.com/zanata/zanata-server/commit/789477c48d37adbe368dd84e82115a99bf1ad302
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.transUploadResponse and helper static (mikado method)

  Commit: 2cac2c18f97e4953677f3384f3335eaf55afd96a
      https://github.com/zanata/zanata-server/commit/2cac2c18f97e4953677f3384f3335eaf55afd96a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make FileService.tryUploadTranslationFile static (mikado method)

  Commit: 06ad0612718d1404e95340bbe95ca76c9a805ad4
      https://github.com/zanata/zanata-server/commit/06ad0612718d1404e95340bbe95ca76c9a805ad4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java

  Log Message:
  -----------
  Fix problem where approve/reject changes states the editor row (color)

  Commit: ca4027a4fb8bf72aa09cb1ca492be149dbaf59e7
      https://github.com/zanata/zanata-server/commit/ca4027a4fb8bf72aa09cb1ca492be149dbaf59e7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java

  Log Message:
  -----------
  Rename variables name

  Commit: 14772769034d3003f5d65ba1077e8a554cbc51a0
      https://github.com/zanata/zanata-server/commit/14772769034d3003f5d65ba1077e8a554cbc51a0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  move all translation upload methods from FileService to new TranslationDocumentUpload (mikado method)

  Commit: 106cf414c872f4648b73d7c435603f1daeffdc56
      https://github.com/zanata/zanata-server/commit/106cf414c872f4648b73d7c435603f1daeffdc56
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make tryUploadTranslationFile an instance method (mikado method)

  Commit: ce90deb6a544b37bf1dfe372a274582b968891c0
      https://github.com/zanata/zanata-server/commit/ce90deb6a544b37bf1dfe372a274582b968891c0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  make helper arguments to translation upload into instance fields (mikado method)

  Commit: 0d7bc9ebd7211a3fdd0d6e9eb963bd98086743dd
      https://github.com/zanata/zanata-server/commit/0d7bc9ebd7211a3fdd0d6e9eb963bd98086743dd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  make translation upload helper methods private (mikado method)

  Commit: 01d0f7a037807a0096591b4333a6db48c83b0ec5
      https://github.com/zanata/zanata-server/commit/01d0f7a037807a0096591b4333a6db48c83b0ec5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java

  Log Message:
  -----------
  protect shared upload helper methods (mikado method)

  Commit: b9fd4b42a936b506bacf743c9769bc645fa5801c
      https://github.com/zanata/zanata-server/commit/b9fd4b42a936b506bacf743c9769bc645fa5801c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  use instance helpers for TranslationDocumentUpload methods (mikado method)

  Commit: 02762da1ba4344e2aaa95a6d46fcc420b67c8a16
      https://github.com/zanata/zanata-server/commit/02762da1ba4344e2aaa95a6d46fcc420b67c8a16
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  use instance helpers for DocumentUpload methods (mikado method)

  Commit: aed0cf5243cf44c582a2c6fbc5648606033eac38
      https://github.com/zanata/zanata-server/commit/aed0cf5243cf44c582a2c6fbc5648606033eac38
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  use composite id object for all translation upload methods (mikado method)

  Commit: d3f24c9e896e0346a133b329a0c5d924e35d57fd
      https://github.com/zanata/zanata-server/commit/d3f24c9e896e0346a133b329a0c5d924e35d57fd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java

  Log Message:
  -----------
  use consistent naming in GlobalDocumentId

  Commit: 2e8d40a3bf02254ab7a44d82828e752f6a1cb6b8
      https://github.com/zanata/zanata-server/commit/2e8d40a3bf02254ab7a44d82828e752f6a1cb6b8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java

  Log Message:
  -----------
  Merge pull request #52 from zanata/functest-categories

Introduce Categories to the functional tests

  Commit: c700438ad082616892b36740bd0ecd0ce741ed62
      https://github.com/zanata/zanata-server/commit/c700438ad082616892b36740bd0ecd0ce741ed62
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java

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

Conflicts:
	functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java

  Commit: 9021a37923c20f38bbb10d7efe6c3df3585e9b1b
      https://github.com/zanata/zanata-server/commit/9021a37923c20f38bbb10d7efe6c3df3585e9b1b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  Merge pull request #51 from zanata/refactor-file-storage

A few preliminary changes to preparing FileService to use new backend

  Commit: 1fc5a53d7d2ab228bc3ea822044d8a381988e752
      https://github.com/zanata/zanata-server/commit/1fc5a53d7d2ab228bc3ea822044d8a381988e752
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_translator_user.sql
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/security.drl
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  Merge pull request #34 from zanata/rhbz981067

New reviewer role per locale

  Commit: 5c19bd2a33114228cad3d03ce2d2eaffbac4962e
      https://github.com/zanata/zanata-server/commit/5c19bd2a33114228cad3d03ce2d2eaffbac4962e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

  Log Message:
  -----------
  Refactor pager widget

  Commit: 83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
      https://github.com/zanata/zanata-server/commit/83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
	zanata-war/src/main/java/org/zanata/tmx/TMXParser.java

  Commit: cb1ede979a9ff43eb1ce33a976f2ae67fab6ede9
      https://github.com/zanata/zanata-server/commit/cb1ede979a9ff43eb1ce33a976f2ae67fab6ede9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Remove for loops and conditions in tests.

For loops and if conditions are sub-optimal in tests, for both
stability and readability. Removed and replaced with Theory run
features.
Though this adds some time to the detailed tests, it's more correct.

  Commit: cbd2656b15a26ba3ef46b181bb7a4a0e9f57e439
      https://github.com/zanata/zanata-server/commit/cbd2656b15a26ba3ef46b181bb7a4a0e9f57e439
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java

  Log Message:
  -----------
  Fix AddLanguageTest.java

Broken in previous commit.

  Commit: df00dc1cab4e993a5f0d98cf84faacb8f60f6381
      https://github.com/zanata/zanata-server/commit/df00dc1cab4e993a5f0d98cf84faacb8f60f6381
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Merge pull request #53 from zanata/for-loops-in-tests-are-bad

Remove for loops and conditions in tests.

  Commit: 9a821546ecdc874bc7e320109ab406b97e0169be
      https://github.com/zanata/zanata-server/commit/9a821546ecdc874bc7e320109ab406b97e0169be
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/file/DocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java

  Log Message:
  -----------
  change document upload classes to services

  Commit: efcdf5c950319d414456168db4750deed3a2c6c7
      https://github.com/zanata/zanata-server/commit/efcdf5c950319d414456168db4750deed3a2c6c7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  remove unnecessary warning suppression

  Commit: d20f7044d86d80241f4ee716130ce731dd5942ba
      https://github.com/zanata/zanata-server/commit/d20f7044d86d80241f4ee716130ce731dd5942ba
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

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

  Log Message:
  -----------
  remove extra logging that was accidentally checked in

  Commit: 720a687f412b65bd60ba50d0d3c1754648959538
      https://github.com/zanata/zanata-server/commit/720a687f412b65bd60ba50d0d3c1754648959538
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

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

  Log Message:
  -----------
  remove excessive comment

  Commit: bc8876888199f5fbdb4932c175b81cb8fefcbd3e
      https://github.com/zanata/zanata-server/commit/bc8876888199f5fbdb4932c175b81cb8fefcbd3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983782

  Commit: 3c24f9848af4fe836d3d4adc680a1afee6942cf4
      https://github.com/zanata/zanata-server/commit/3c24f9848af4fe836d3d4adc680a1afee6942cf4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  TMX Upload working from web.

Also refactor the hibernate mappings for some of the TM related entities.

  Commit: 5033267dbb871e2008c01332f7176f3ac086b77f
      https://github.com/zanata/zanata-server/commit/5033267dbb871e2008c01332f7176f3ac086b77f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Refactor code

  Commit: 0c820b4700f0793b3b77612162c24e7d4be13174
      https://github.com/zanata/zanata-server/commit/0c820b4700f0793b3b77612162c24e7d4be13174
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/main/resources/org/zanata/webtrans/public/style.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - prove of concept works

  Commit: 5bffb1cc4a989a10702e3290ae01a08769929834
      https://github.com/zanata/zanata-server/commit/5bffb1cc4a989a10702e3290ae01a08769929834
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - enable add comment in history view

  Commit: ff2a03d626a51a212cb97601bd682376a82883a4
      https://github.com/zanata/zanata-server/commit/ff2a03d626a51a212cb97601bd682376a82883a4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java

  Log Message:
  -----------
  rhbz978666 - bring back copy into editor function

  Commit: 9fd7fb722e549ecbfeecf17ad7173973d7b152d4
      https://github.com/zanata/zanata-server/commit/9fd7fb722e549ecbfeecf17ad7173973d7b152d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - bring back compare

  Commit: 74264e1378b5e63f2e96defd4bcbf9292c0078cf
      https://github.com/zanata/zanata-server/commit/74264e1378b5e63f2e96defd4bcbf9292c0078cf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz978666 - retrofit test

  Commit: 4e6b358983d3c7ea148cb66a8fa16d5ee32a920a
      https://github.com/zanata/zanata-server/commit/4e6b358983d3c7ea148cb66a8fa16d5ee32a920a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz978666 - change span to anchor

  Commit: 9a3d92c5628c6e173c4d61fb3fcc15b26dc1b4bb
      https://github.com/zanata/zanata-server/commit/9a3d92c5628c6e173c4d61fb3fcc15b26dc1b4bb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

  Log Message:
  -----------
  rhbz978666 - remove old implementation

  Commit: 6ce9e24f56799eae252bff79dc1a197523ab1cb3
      https://github.com/zanata/zanata-server/commit/6ce9e24f56799eae252bff79dc1a197523ab1cb3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    R zanata-war/src/main/resources/org/zanata/webtrans/public/style.css

  Log Message:
  -----------
  rhbz978666 - apply new style

  Commit: 4ff622cefceb2cd20d6f80eac6175687cfc2763c
      https://github.com/zanata/zanata-server/commit/4ff622cefceb2cd20d6f80eac6175687cfc2763c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

  Log Message:
  -----------
  rhbz978666 - localize some strings and some styles change

  Commit: 7707c7453a467867f7073f736d6b77cbca36c39f
      https://github.com/zanata/zanata-server/commit/7707c7453a467867f7073f736d6b77cbca36c39f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java

  Log Message:
  -----------
  add javadoc

  Commit: ef89bd4393f141b1f220b84cc118974b056ca08d
      https://github.com/zanata/zanata-server/commit/ef89bd4393f141b1f220b84cc118974b056ca08d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java

  Log Message:
  -----------
  delete unused classes

  Commit: 3f8de9a8174a7463d049c1291cab42a315bfd12e
      https://github.com/zanata/zanata-server/commit/3f8de9a8174a7463d049c1291cab42a315bfd12e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java

  Log Message:
  -----------
  fix another possible stale element exception area

  Commit: fbdcc1e1dc5bcea89c1b97ec71202dad17779611
      https://github.com/zanata/zanata-server/commit/fbdcc1e1dc5bcea89c1b97ec71202dad17779611
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java

  Log Message:
  -----------
  rename method

  Commit: 7348ca386da321325700f8192508c53982b6ea63
      https://github.com/zanata/zanata-server/commit/7348ca386da321325700f8192508c53982b6ea63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  work in progress: dashboard

  Commit: 934fc68bc7998e2b177c66ad7e2fb87d59210178
      https://github.com/zanata/zanata-server/commit/934fc68bc7998e2b177c66ad7e2fb87d59210178
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    A zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress: creating new template for dashboard

  Commit: 5dd23a0dda5eb98058b13b7b9c794e8d2c8f1947
      https://github.com/zanata/zanata-server/commit/5dd23a0dda5eb98058b13b7b9c794e8d2c8f1947
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java

  Log Message:
  -----------
  Refactor of code

  Commit: b83d22e3673c4bcd5d0343ca6e9a4b2e2efe2c8b
      https://github.com/zanata/zanata-server/commit/b83d22e3673c4bcd5d0343ca6e9a4b2e2efe2c8b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java

  Log Message:
  -----------
  Apply formatter to changed files due to unreadability

  Commit: 11c81ee15765607c829ccfb0afcc7fabb55bd1d1
      https://github.com/zanata/zanata-server/commit/11c81ee15765607c829ccfb0afcc7fabb55bd1d1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  refactor validity checking for file upload to increase readability

  Commit: 7d6a74961e910e13bd90a8a9d7f5dd6ff6a61141
      https://github.com/zanata/zanata-server/commit/7d6a74961e910e13bd90a8a9d7f5dd6ff6a61141
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  fix explode profile for EAP6

  Commit: 72955f3cdb045c4e3a6b6369d06b7698ffbfc72a
      https://github.com/zanata/zanata-server/commit/72955f3cdb045c4e3a6b6369d06b7698ffbfc72a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java

  Log Message:
  -----------
  Merge pull request #57 from zanata/fix-stale-element

fix another possible stale element exception area

  Commit: 17f2ea94775840d9ff80c116c2968b519954a1cd
      https://github.com/zanata/zanata-server/commit/17f2ea94775840d9ff80c116c2968b519954a1cd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    R zanata-war/src/etc/jboss-service-snippet.xml

  Log Message:
  -----------
  delete unused file

  Commit: 882247ac5aef1db9712fb63331c7e563563e0ffc
      https://github.com/zanata/zanata-server/commit/882247ac5aef1db9712fb63331c7e563563e0ffc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  fix ping time out

  Commit: 7892bbddeb9549d54eac3a8839a3ba98c736d12a
      https://github.com/zanata/zanata-server/commit/7892bbddeb9549d54eac3a8839a3ba98c736d12a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress

  Commit: 3799cdebe9d5cf6286308cc9a12cb68db4b655e2
      https://github.com/zanata/zanata-server/commit/3799cdebe9d5cf6286308cc9a12cb68db4b655e2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Fix line too long

  Commit: 3d2ffd085be6a551a85455957e817dfa4e0e25db
      https://github.com/zanata/zanata-server/commit/3d2ffd085be6a551a85455957e817dfa4e0e25db
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    R zanata-war/src/etc/jboss-service-snippet.xml

  Log Message:
  -----------
  Merge pull request #58 from zanata/fix-explode-profile

fix explode profile for EAP6

  Commit: f5a6a099f577d9abf88818a51eceb1b920c58ca2
      https://github.com/zanata/zanata-server/commit/f5a6a099f577d9abf88818a51eceb1b920c58ca2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_translator_user.sql
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/jboss-service-snippet.xml
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/security.drl
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into move-file-storage

  Commit: 6096ea78139f27273903bfc5feceaeb93e0115e1
      https://github.com/zanata/zanata-server/commit/6096ea78139f27273903bfc5feceaeb93e0115e1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java

  Log Message:
  -----------
  wrap long lines

  Commit: 6778a6217e64261725800f1f46230bc6dd80e0eb
      https://github.com/zanata/zanata-server/commit/6778a6217e64261725800f1f46230bc6dd80e0eb
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

  Log Message:
  -----------
  Merge pull request #54 from zanata/new-ui

New translation history UI

  Commit: 0e26920c3a3108576a2f2ed6ee54e52ebb18ed25
      https://github.com/zanata/zanata-server/commit/0e26920c3a3108576a2f2ed6ee54e52ebb18ed25
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Merge pull request #56 from zanata/rhbz983782

Filtering that drops the last page causes unexpected behaviour

  Commit: cb3811cbd2df35f7897f88bbc9b855509d75eb95
      https://github.com/zanata/zanata-server/commit/cb3811cbd2df35f7897f88bbc9b855509d75eb95
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Refactor TM model.

Trans unit variants are now independent for each Translation unit.
Block the UI while an upload is going on.
Add a "clear" option to clear all the contents of a Translation memory.

  Commit: 64b72e8d6fb9df000bc483f9e6f92b5693275faa
      https://github.com/zanata/zanata-server/commit/64b72e8d6fb9df000bc483f9e6f92b5693275faa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
    A zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress: dashboard - activities

  Commit: f56cfda33ac0733b3dc89760da76c73e1c830b76
      https://github.com/zanata/zanata-server/commit/f56cfda33ac0733b3dc89760da76c73e1c830b76
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java

  Log Message:
  -----------
  use guava for null or empty strings

  Commit: e48634bb6a94dbb313aa745e3ea24b3920f638e0
      https://github.com/zanata/zanata-server/commit/e48634bb6a94dbb313aa745e3ea24b3920f638e0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  use guava joiner for warning concatenation

  Commit: 9848834653b3c8b513711751716c67abed454598
      https://github.com/zanata/zanata-server/commit/9848834653b3c8b513711751716c67abed454598
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java

  Log Message:
  -----------
  add TODOs for tasks in DocumentUploadUtil

  Commit: e49a38f3e2e147f1ccc0c6cd3151ff60f941b6c9
      https://github.com/zanata/zanata-server/commit/e49a38f3e2e147f1ccc0c6cd3151ff60f941b6c9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  add TODOs for classes that require unit tests

  Commit: 735e06dd75d88492247990ae2d8a86cb1dd2427e
      https://github.com/zanata/zanata-server/commit/735e06dd75d88492247990ae2d8a86cb1dd2427e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  change to deploy war file

  Commit: e134a5f44313f323c267173a7553f7a445166c72
      https://github.com/zanata/zanata-server/commit/e134a5f44313f323c267173a7553f7a445166c72
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx

  Log Message:
  -----------
  Merge existing TUs when importing a TMX file.

This means that existing TUs will be replaced with new ones as long as their unique id is the same. Otherwise, the new TUs will just get appended to the existing ones.
Add smaller tmx test files.

  Commit: f223bce8b1646926cf6412aef281fa7fa99922dd
      https://github.com/zanata/zanata-server/commit/f223bce8b1646926cf6412aef281fa7fa99922dd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    A zanata-war/src/main/webapp/WEB-INF/layout/piwik.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
    M zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml

  Log Message:
  -----------
  Work in progress: extract piwik, assign id for links

  Commit: f564263443753f47e5a37de63fec6eb23b27f9bb
      https://github.com/zanata/zanata-server/commit/f564263443753f47e5a37de63fec6eb23b27f9bb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml

  Log Message:
  -----------
  Change fav icon

  Commit: dfa54e6c78b8c42c40d2e4622437b0236c1474b7
      https://github.com/zanata/zanata-server/commit/dfa54e6c78b8c42c40d2e4622437b0236c1474b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/piwik.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
    R zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
    R zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml

  Log Message:
  -----------
  Move templates files into template folder

  Commit: c1a6b3d0f47f363b83a73072a235985e431836e0
      https://github.com/zanata/zanata-server/commit/c1a6b3d0f47f363b83a73072a235985e431836e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Move templates files into template folder

  Commit: dd62c7af818d97d6fa21e80c31f1df5828ef8495
      https://github.com/zanata/zanata-server/commit/dd62c7af818d97d6fa21e80c31f1df5828ef8495
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml

  Log Message:
  -----------
  Work in progress: new css

  Commit: ca3d002a694d4f58014b1bbf1fae7d8cd27aee95
      https://github.com/zanata/zanata-server/commit/ca3d002a694d4f58014b1bbf1fae7d8cd27aee95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-20 (Sat, 20 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress: dashboard

  Commit: 115aa79e6cadb0f6af29f63aa7fd59ded7fd8785
      https://github.com/zanata/zanata-server/commit/115aa79e6cadb0f6af29f63aa7fd59ded7fd8785
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Work in progress: dashboard-maintainedProjects

  Commit: d2c8231da3cfb6ebe634751bea9b527c05c0dac6
      https://github.com/zanata/zanata-server/commit/d2c8231da3cfb6ebe634751bea9b527c05c0dac6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  change to use ant-run for AS7 redeploy

  Commit: 9993d5c7ad221a0cc672c0408d01016234ee0bdf
      https://github.com/zanata/zanata-server/commit/9993d5c7ad221a0cc672c0408d01016234ee0bdf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java

  Log Message:
  -----------
  Merge pull request #55 from zanata/move-file-storage

Move code for file uploads to separate services.

  Commit: 345ac9580dc3e24c021156c8dc9dd87186b351d1
      https://github.com/zanata/zanata-server/commit/345ac9580dc3e24c021156c8dc9dd87186b351d1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  add new profile to handle static content replacement

  Commit: d4c6611720dc9ce41598e35ca62127004f771b6a
      https://github.com/zanata/zanata-server/commit/d4c6611720dc9ce41598e35ca62127004f771b6a
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #59 from zanata/explode-profile

change the way we redeploy to AS7

  Commit: 250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
      https://github.com/zanata/zanata-server/commit/250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add security to new Translation Memory Rest services.

Fix some UI issues.

  Commit: a9be4c35a570466d7a2045cde89662943cf8a379
      https://github.com/zanata/zanata-server/commit/a9be4c35a570466d7a2045cde89662943cf8a379
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  rhbz980658 separate blob creation into separate methods

  Commit: 82271ba62297385e4b786a0b95449557c2a54236
      https://github.com/zanata/zanata-server/commit/82271ba62297385e4b786a0b95449557c2a54236
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  rhbz980658 move blob methods to separate services

  Commit: 8f83014600d6eec47d19613f6d7f00958b5b6dba
      https://github.com/zanata/zanata-server/commit/8f83014600d6eec47d19613f6d7f00958b5b6dba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  rhbz986145 Check for IO error after each write

  Commit: 4d1bc992d652d66eff9114319420b80a89d4c743
      https://github.com/zanata/zanata-server/commit/4d1bc992d652d66eff9114319420b80a89d4c743
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Implement redirection to dashboard when logged in, maintained projects in dashboard, and new css template for all pages

  Commit: d2e2c56efe15d3b45c039010996cf009579d0cee
      https://github.com/zanata/zanata-server/commit/d2e2c56efe15d3b45c039010996cf009579d0cee
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml

  Log Message:
  -----------
  Change favicon

  Commit: 184dfa488385d80fb56c587ea94be902205e2c37
      https://github.com/zanata/zanata-server/commit/184dfa488385d80fb56c587ea94be902205e2c37
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.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/TranslationFileServiceImpl.java

  Log Message:
  -----------
  rhbz980658 move code that accesses blobs into blob services

  Commit: 44d2c2381ae4dad609604aff24931b1fb4870bfd
      https://github.com/zanata/zanata-server/commit/44d2c2381ae4dad609604aff24931b1fb4870bfd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java

  Log Message:
  -----------
  Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/okapi/issues/detail?id=342

  Commit: fc53a02a1fb953e488086c3f20e765b70d2a8288
      https://github.com/zanata/zanata-server/commit/fc53a02a1fb953e488086c3f20e765b70d2a8288
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml

  Log Message:
  -----------
  Work in progress: new style for editor

  Commit: 7573ad7b39eeb5fab7422a95f77f8610f0db7a1f
      https://github.com/zanata/zanata-server/commit/7573ad7b39eeb5fab7422a95f77f8610f0db7a1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M zanata-war/pom.xml
    R zanata-war/src/etc/jboss-service-snippet.xml
    A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

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

Conflicts:
	zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Commit: 6b66c90de43b7ff08d99e5f0e7a23002001ba38b
      https://github.com/zanata/zanata-server/commit/6b66c90de43b7ff08d99e5f0e7a23002001ba38b
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  Merge pull request #61 from zanata/rhbz986145

rhbz986145 Check for IO error after each write

  Commit: aa5f15ef4796c064da335ca3457c07051a75a8d1
      https://github.com/zanata/zanata-server/commit/aa5f15ef4796c064da335ca3457c07051a75a8d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix reviewer role checked issue: https://bugzilla.redhat.com/show_bug.cgi?id=986722

  Commit: 916c899d0359240f2aadf429ba12936b4273557c
      https://github.com/zanata/zanata-server/commit/916c899d0359240f2aadf429ba12936b4273557c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java

  Log Message:
  -----------
  Merge pull request #62 from zanata/okapi-0.22

Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/o...

  Commit: 0d3615ae2ecde89c82c742a3bf2e41c3652baa98
      https://github.com/zanata/zanata-server/commit/0d3615ae2ecde89c82c742a3bf2e41c3652baa98
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Merge pull request #63 from zanata/rhbz986722

Fix user checked as reviewer even they are not: https://bugzilla.redhat.com/show_bug.cgi?id=986722

  Commit: 21e18195a1cd04c5341c391558898a96f158888f
      https://github.com/zanata/zanata-server/commit/21e18195a1cd04c5341c391558898a96f158888f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Add in missing tag for application xhtml

  Commit: a3b82381da490891e9b0fc87eac97a8fec878dc1
      https://github.com/zanata/zanata-server/commit/a3b82381da490891e9b0fc87eac97a8fec878dc1
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css

  Log Message:
  -----------
  link color etc in standard.css

  Commit: 4ce648562432fed27a83a51373ccb0011810858f
      https://github.com/zanata/zanata-server/commit/4ce648562432fed27a83a51373ccb0011810858f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/HActivities.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  work in progress: create entity for activities

  Commit: 3ee0e5f200fa345c11a792e225356c2839caa4a9
      https://github.com/zanata/zanata-server/commit/3ee0e5f200fa345c11a792e225356c2839caa4a9
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
  Add in missing tag for application xhtml

  Commit: 450f1ee2ba92cfe000572cdbe200756cf65afe21
      https://github.com/zanata/zanata-server/commit/450f1ee2ba92cfe000572cdbe200756cf65afe21
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/model/HActivities.java
    A zanata-model/src/main/java/org/zanata/model/HPersonActivities.java
    A zanata-war/src/main/java/org/zanata/dao/PersonActivitiesDAO.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  work in progress: create entity for activities

  Commit: e3e51e6bee8fa18b50a417b283af99d43a374bca
      https://github.com/zanata/zanata-server/commit/e3e51e6bee8fa18b50a417b283af99d43a374bca
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Fix up dropdown in dashboard, include jquery and javascript for menu

  Commit: 150d9a280793e4c6c984f585a319323c17982691
      https://github.com/zanata/zanata-server/commit/150d9a280793e4c6c984f585a319323c17982691
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
  Fix up dropdown in dashboard, include jquery and javascript for menu

  Commit: 9414b3b773933ff31f7c473b57f730ba9dfb3c24
      https://github.com/zanata/zanata-server/commit/9414b3b773933ff31f7c473b57f730ba9dfb3c24
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  rhbz986785 Ensure that each <tu> has a srclang

  Commit: f8eb6a9b0d4cb18567927d3fb7fa54eea910d1d3
      https://github.com/zanata/zanata-server/commit/f8eb6a9b0d4cb18567927d3fb7fa54eea910d1d3
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Remove zanata.css

  Commit: e26a10dbf3de3e541eab304dc2c75b35dfe5a731
      https://github.com/zanata/zanata-server/commit/e26a10dbf3de3e541eab304dc2c75b35dfe5a731
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Exclude xml-apis

  Commit: f018dcd8747e749b19b38b925860a523f070b45f
      https://github.com/zanata/zanata-server/commit/f018dcd8747e749b19b38b925860a523f070b45f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

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

  Log Message:
  -----------
  Fix path for TMX DTD

  Commit: 81583983d079566b5f6b0c18c7c028e4aef59c77
      https://github.com/zanata/zanata-server/commit/81583983d079566b5f6b0c18c7c028e4aef59c77
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Merge pull request #65 from zanata/rhbz986785

rhbz986785 Ensure that each <tu> has a srclang

  Commit: 6d9029bbc649dcf23ab08de8d49aef75feeb8bf7
      https://github.com/zanata/zanata-server/commit/6d9029bbc649dcf23ab08de8d49aef75feeb8bf7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  rhbz980658 update GetDocumentListHandler to use moved hasPersistedDocument method

  Commit: 851f5ee9439ca2ea238b549499690801ad301ba3
      https://github.com/zanata/zanata-server/commit/851f5ee9439ca2ea238b549499690801ad301ba3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Partially implement getTranslationMemory (WIP)

  Commit: bc60a13a78414aa18be8d2b25f802b25c999fdaf
      https://github.com/zanata/zanata-server/commit/bc60a13a78414aa18be8d2b25f802b25c999fdaf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_translator_user.sql
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/jboss-service-snippet.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    A zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	pom.xml
	zanata-model/pom.xml
	zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
	zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
	zanata-war/src/main/webapp/WEB-INF/pages.xml
	zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Commit: 4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
      https://github.com/zanata/zanata-server/commit/4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  Fix compilation problem

  Commit: b72ade418e643742fd321db5bdbab02d724c605b
      https://github.com/zanata/zanata-server/commit/b72ade418e643742fd321db5bdbab02d724c605b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/PersonActivitiesDAO.java
    A zanata-war/src/main/java/org/zanata/service/UserActivitiesService.java
    A zanata-war/src/main/java/org/zanata/service/impl/UserActivitiesServiceImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Work in progress: user activities

  Commit: e612c087a6a6a802ede79ea199a7361259821cc3
      https://github.com/zanata/zanata-server/commit/e612c087a6a6a802ede79ea199a7361259821cc3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java

  Log Message:
  -----------
  Cache projectVersion and project

  Commit: f13f2b5ea69a73a9be7d119c85e9c721849f07e6
      https://github.com/zanata/zanata-server/commit/f13f2b5ea69a73a9be7d119c85e9c721849f07e6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz982916 - force comment on reject

  Commit: 4211ab38e51e51dad7bd29324b842931b25dd1a4
      https://github.com/zanata/zanata-server/commit/4211ab38e51e51dad7bd29324b842931b25dd1a4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java

  Log Message:
  -----------
  rhbz978666 - fix comment change triggering concurrent edit warning

  Commit: bae49776b0661310807eb92f1367b366dc234173
      https://github.com/zanata/zanata-server/commit/bae49776b0661310807eb92f1367b366dc234173
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  add equals and hashcode to GlobalDocumentId

  Commit: 37074d22a947c606ed22a1b42ce783c33d97fc72
      https://github.com/zanata/zanata-server/commit/37074d22a947c606ed22a1b42ce783c33d97fc72
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  rhbz978666 - prevent blank comment

  Commit: c6b5a5e4e7c347d9d9e279de85ef47ccc9683a17
      https://github.com/zanata/zanata-server/commit/c6b5a5e4e7c347d9d9e279de85ef47ccc9683a17
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java

  Log Message:
  -----------
  rhbz982916 - wording change

  Commit: 3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
      https://github.com/zanata/zanata-server/commit/3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy

  Commit: 9fec98006ad6a90f926ea0203f01e8d77c37a992
      https://github.com/zanata/zanata-server/commit/9fec98006ad6a90f926ea0203f01e8d77c37a992
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store web asset url in jndi

  Commit: c9b1878fd488db600c79873a1b2a281686f2adb6
      https://github.com/zanata/zanata-server/commit/c9b1878fd488db600c79873a1b2a281686f2adb6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  wording change

  Commit: 5f2aabede50fb289bb5cf386d8039db72fc29026
      https://github.com/zanata/zanata-server/commit/5f2aabede50fb289bb5cf386d8039db72fc29026
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  rhbz982916 - prevent rejection when it's already in rejected state

  Commit: 9067f4a67ecddfa5ecfebd80063c4dc5c77407f7
      https://github.com/zanata/zanata-server/commit/9067f4a67ecddfa5ecfebd80063c4dc5c77407f7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge pull request #60 from zanata/force-reject-comment

rhbz982916 - force comment on reject

  Commit: 8353af8dfed430b29941ec235b3b0667a52cc0ae
      https://github.com/zanata/zanata-server/commit/8353af8dfed430b29941ec235b3b0667a52cc0ae
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Fixing usericon in header

  Commit: f8683469e3fc1f7e8d34978659cfb8573362b711
      https://github.com/zanata/zanata-server/commit/f8683469e3fc1f7e8d34978659cfb8573362b711
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into isolate-file-storage

  Commit: 1379dbb9e9ce6e0dc263759f5ed629f2d4d0127e
      https://github.com/zanata/zanata-server/commit/1379dbb9e9ce6e0dc263759f5ed629f2d4d0127e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/model/HPersonActivities.java
    A zanata-model/src/main/java/org/zanata/model/HPersonActivity.java
    R zanata-war/src/main/java/org/zanata/dao/PersonActivitiesDAO.java
    A zanata-war/src/main/java/org/zanata/dao/PersonActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/service/PersonActivityService.java
    R zanata-war/src/main/java/org/zanata/service/UserActivitiesService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/PersonActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/UserActivitiesServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/service/impl/PersonActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Implement HPersonActivity: https://bugzilla.redhat.com/show_bug.cgi?id=981064

  Commit: 5bd62146d563aefa0ccb48b0d6a13da2db276ffb
      https://github.com/zanata/zanata-server/commit/5bd62146d563aefa0ccb48b0d6a13da2db276ffb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

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

  Commit: c1fb7262373812c22599a601e36828b40d936a3c
      https://github.com/zanata/zanata-server/commit/c1fb7262373812c22599a601e36828b40d936a3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store only url base in jndi and externalize web asset version into pom.xml

  Commit: f3c20c94b44914f77f0d8bf2e5d7b19474dbcd1b
      https://github.com/zanata/zanata-server/commit/f3c20c94b44914f77f0d8bf2e5d7b19474dbcd1b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.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/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  Merge pull request #64 from zanata/isolate-file-storage

Isolate blob file storage

  Commit: 01032e7ac47f36a7e5c177bb8d64e3fdc010cc67
      https://github.com/zanata/zanata-server/commit/01032e7ac47f36a7e5c177bb8d64e3fdc010cc67
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  handle no maintained project list

  Commit: fda8ee38f41dd786ebe1cae7a7e769fc4fe8fb3c
      https://github.com/zanata/zanata-server/commit/fda8ee38f41dd786ebe1cae7a7e769fc4fe8fb3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java

  Log Message:
  -----------
  rhbz987235 - fix implicit hibernate flush causes double entries in history

  Commit: e96107bcca34ff09f8dd1107e9d95ca9c601ddee
      https://github.com/zanata/zanata-server/commit/e96107bcca34ff09f8dd1107e9d95ca9c601ddee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  move zanata assets version to componenet.properties

  Commit: 9e18ad6c9cee8710f6e20c66adb34d6e7084302d
      https://github.com/zanata/zanata-server/commit/9e18ad6c9cee8710f6e20c66adb34d6e7084302d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  fix IT test

  Commit: 3fc3e211e190c8269bc2870c5ecd552f125ba7ad
      https://github.com/zanata/zanata-server/commit/3fc3e211e190c8269bc2870c5ecd552f125ba7ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Add workaround for empty ResultSet

  Commit: 076b807e3c07a915f3da87cbfce1f9c9e4b8d3f3
      https://github.com/zanata/zanata-server/commit/076b807e3c07a915f3da87cbfce1f9c9e4b8d3f3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 add contentLocation to HRawDocument in preparation for content migration

  Commit: 2627b8b9d077b072634824701c27bebf97ab13fa
      https://github.com/zanata/zanata-server/commit/2627b8b9d077b072634824701c27bebf97ab13fa
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 move blob content field out of HRawDocument

  Commit: 6b4def9342c2f7c31706e29707ed42fbc38f6f6c
      https://github.com/zanata/zanata-server/commit/6b4def9342c2f7c31706e29707ed42fbc38f6f6c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java

  Log Message:
  -----------
  rhbz980658 implement blob access from temporary table

  Commit: f4f81b74b82398f8727228158069341a4a03fe29
      https://github.com/zanata/zanata-server/commit/f4f81b74b82398f8727228158069341a4a03fe29
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  rhbz980658 add jndi property for document file storage location

  Commit: 14f9d99160a562761a59b8f64a00207c43d63893
      https://github.com/zanata/zanata-server/commit/14f9d99160a562761a59b8f64a00207c43d63893
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java

  Log Message:
  -----------
  remove accidentally added imports

  Commit: 8719a7e92cc8f4dfa2ae94c6673b00ecfa00c451
      https://github.com/zanata/zanata-server/commit/8719a7e92cc8f4dfa2ae94c6673b00ecfa00c451
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java

  Log Message:
  -----------
  Add TextFlowTarget indexer that eagerly fetches all indexable properties.

  Commit: 902e80b5e839d7b81c6fb1600bc821acb53f29ed
      https://github.com/zanata/zanata-server/commit/902e80b5e839d7b81c6fb1600bc821acb53f29ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  Merge pull request #66 from zanata/globalid-equals

Add equals and hashcode to GlobalDocumentId

  Commit: 17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
      https://github.com/zanata/zanata-server/commit/17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Merge pull request #70 from zanata/rhbz980271

Add workaround for empty ResultSet

  Commit: 6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
      https://github.com/zanata/zanata-server/commit/6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge pull request #67 from zanata/web-assets-url

store web asset url in jndi

  Commit: ce3c1aaf015d824bec12ec2077892151fde49e6b
      https://github.com/zanata/zanata-server/commit/ce3c1aaf015d824bec12ec2077892151fde49e6b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/PersonActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/PersonActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/PersonActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/test/java/org/zanata/service/impl/PersonActivityServiceImplTest.java

  Log Message:
  -----------
  Implement rollup records in hourly

  Commit: 4b03b4801441c13994d9b6f4ea035f05b15b3489
      https://github.com/zanata/zanata-server/commit/4b03b4801441c13994d9b6f4ea035f05b15b3489
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.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/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

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

  Commit: 4a48990eef1b4d4fdf00d117da88c679c59b8f1d
      https://github.com/zanata/zanata-server/commit/4a48990eef1b4d4fdf00d117da88c679c59b8f1d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    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/dao/DocumentDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/PersonActivityServiceImplTest.java

  Log Message:
  -----------
  fix unit test

  Commit: bea5282b4b22640264ae2be7db29084e5ef5f93c
      https://github.com/zanata/zanata-server/commit/bea5282b4b22640264ae2be7db29084e5ef5f93c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  rhbz980658 add and use file system persist service

  Commit: dbcf19a12fcbb03e1781d660d04c6c84b65becbd
      https://github.com/zanata/zanata-server/commit/dbcf19a12fcbb03e1781d660d04c6c84b65becbd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge branch 'master' into isolate-file-storage

Conflicts:
	zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
  lombok annotations added in remote, toString added in local.
  kept changes from remote + toString method.

  Commit: d0f99171ecc8692f44d8de805a227c8f496260d9
      https://github.com/zanata/zanata-server/commit/d0f99171ecc8692f44d8de805a227c8f496260d9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Refactor Indexing Strategies for better performance.

Create an indexing strategy that performs less database queries and is able to index TextFlow targets faster.

  Commit: 4b0a381397076130e144aa50979e4bdf078e0052
      https://github.com/zanata/zanata-server/commit/4b0a381397076130e144aa50979e4bdf078e0052
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  implement readonly, obsolete on dashboard

  Commit: 53e80e078948089a5f6d56f0d8e43e807c1b2646
      https://github.com/zanata/zanata-server/commit/53e80e078948089a5f6d56f0d8e43e807c1b2646
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

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

Conflicts:
	zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Commit: 9759967e1d30daa2309b4f587a2c7266113f4333
      https://github.com/zanata/zanata-server/commit/9759967e1d30daa2309b4f587a2c7266113f4333
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  Add Search Indexing to Translation Unit variants.

Also fix the removal of TM contents. Have manually remove each TU from the trans memory because the hibernate relationship is being managed on the TU side. This causes orphan removal to effectively not work.

  Commit: a47e9f15c1e5c1ca1c47326309f660888fb5ece7
      https://github.com/zanata/zanata-server/commit/a47e9f15c1e5c1ca1c47326309f660888fb5ece7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    R zanata-model/src/main/java/org/zanata/model/HPersonActivity.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/ILoggable.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    R zanata-war/src/main/java/org/zanata/dao/PersonActivityDAO.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    R zanata-war/src/main/java/org/zanata/service/PersonActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/PersonActivityServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/service/impl/PersonActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Work in progress: generic activity log

  Commit: 3c86f0c2ef4aa47939ba5023a0aefbf6f150834e
      https://github.com/zanata/zanata-server/commit/3c86f0c2ef4aa47939ba5023a0aefbf6f150834e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/PersonActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Work in progress

  Commit: 8369426543943cb2cf84c836df89ab4a5ac2d6c0
      https://github.com/zanata/zanata-server/commit/8369426543943cb2cf84c836df89ab4a5ac2d6c0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  Work in progress: user activity

  Commit: def26df606855e22bcd799e759f4f518b4624ac3
      https://github.com/zanata/zanata-server/commit/def26df606855e22bcd799e759f4f518b4624ac3
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml

  Log Message:
  -----------
  Add id's to menus for active links to be tracked

  Commit: e884845772179ca027448c84b24bfb2a363c7c55
      https://github.com/zanata/zanata-server/commit/e884845772179ca027448c84b24bfb2a363c7c55
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml

  Log Message:
  -----------
  Why did I put hashes on them?

  Commit: e9e689ec9c65ee9c7f9a7ecab46be1f87cdbbd8d
      https://github.com/zanata/zanata-server/commit/e9e689ec9c65ee9c7f9a7ecab46be1f87cdbbd8d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  ModelEntity refactoring for generic activity

  Commit: ee0a8269afa502bf6705c53c593f12d1a3938553
      https://github.com/zanata/zanata-server/commit/ee0a8269afa502bf6705c53c593f12d1a3938553
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java

  Log Message:
  -----------
  Add no args constructor in Activity

  Commit: ca80ef8150fc95be2b9b8855b901570eb44d5aa6
      https://github.com/zanata/zanata-server/commit/ca80ef8150fc95be2b9b8855b901570eb44d5aa6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 migrate raw documents to file system

  Commit: c8c7320188fde893106bc38560d93dd821894555
      https://github.com/zanata/zanata-server/commit/c8c7320188fde893106bc38560d93dd821894555
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 drop (empty) temporary blob table

  Commit: 356ccd70e25a26c433743e9f0d835075e7371c82
      https://github.com/zanata/zanata-server/commit/356ccd70e25a26c433743e9f0d835075e7371c82
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  rhbz980658 remove remaining blob-based implementation for raw file persistence

  Commit: ef7c959d9f58da1bc7c402db5527abb92042ac93
      https://github.com/zanata/zanata-server/commit/ef7c959d9f58da1bc7c402db5527abb92042ac93
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Merge pull request #71 from zanata/index-optimization

Re-indexing optimization

  Commit: 551ce1324ee0dcf01690cd20d17cf66f5c5dc74b
      https://github.com/zanata/zanata-server/commit/551ce1324ee0dcf01690cd20d17cf66f5c5dc74b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    R zanata-model/src/main/java/org/zanata/model/ILoggable.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  refactor field names

  Commit: 53a33458dab18e7f853e58c01c8884de3720f06a
      https://github.com/zanata/zanata-server/commit/53a33458dab18e7f853e58c01c8884de3720f06a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  Change throwed exception to ZanataServiceException type

  Commit: a3b45818a863e49fb89955b31f4b77ce6733b456
      https://github.com/zanata/zanata-server/commit/a3b45818a863e49fb89955b31f4b77ce6733b456
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java

  Log Message:
  -----------
  minor

  Commit: 4e4acb912435b6d0ad472847089c1182a80933e5
      https://github.com/zanata/zanata-server/commit/4e4acb912435b6d0ad472847089c1182a80933e5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml

  Log Message:
  -----------
  Increase Test Heirarchy and add Security and Homepage edit tests

Tests sign in and reset password. Regression located, thus added
an expected assertion.
Creates a distinction between a basic page and the AbstractPage.
HomePage contained entities which were not specific to the home page, e.g. the
main navigation menu, thus coupling them meant navigating to the HomePage
before performing other actions.

  Commit: 3cbb79c7f9db7a89fb6e3949ea276981b4204be3
      https://github.com/zanata/zanata-server/commit/3cbb79c7f9db7a89fb6e3949ea276981b4204be3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #69 from zanata/rhbz987235-implicit-save

rhbz987235 - fix implicit hibernate flush

  Commit: 3ee71a92a4bb09cb3042a6e736b65de7f198ea89
      https://github.com/zanata/zanata-server/commit/3ee71a92a4bb09cb3042a6e736b65de7f198ea89
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml

  Log Message:
  -----------
  Merge pull request #74 from zanata/fill-in-the-page-blanks

Increase Test Heirarchy and add Security and Homepage edit tests

  Commit: 8cfa49a8d5755f605f6a19249b327574b88ec065
      https://github.com/zanata/zanata-server/commit/8cfa49a8d5755f605f6a19249b327574b88ec065
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Add admin,glossary link

  Commit: 252d682110069d5615c2fce4d098fb0777b19641
      https://github.com/zanata/zanata-server/commit/252d682110069d5615c2fce4d098fb0777b19641
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java

  Log Message:
  -----------
  rhbz980658 change jndi property name for document storage directory

  Commit: 350bc289a9fcd0228804c5cf87397a797be63fa8
      https://github.com/zanata/zanata-server/commit/350bc289a9fcd0228804c5cf87397a797be63fa8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Refactor field names in activity and data type for id

  Commit: e400b3b589ea774d9544f45acfb4da7392fcae43
      https://github.com/zanata/zanata-server/commit/e400b3b589ea774d9544f45acfb4da7392fcae43
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java

  Log Message:
  -----------
  rhbz980658 update TODO comment

  Commit: f591d97f53d55c1937e310a2f8de5a5cb88fc532
      https://github.com/zanata/zanata-server/commit/f591d97f53d55c1937e310a2f8de5a5cb88fc532
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  rhbz980658 change component name of FileSystemPersistService

  Commit: 48b730487e662a88101709118c57b23e07d38913
      https://github.com/zanata/zanata-server/commit/48b730487e662a88101709118c57b23e07d38913
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy

  Commit: 58659c74ce55a93e33c26bd448a29d84e768b2cd
      https://github.com/zanata/zanata-server/commit/58659c74ce55a93e33c26bd448a29d84e768b2cd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java

  Log Message:
  -----------
  rhbz980658 update TODO comment

  Commit: fc79d16abd43e1d4e0b2199ce19784651a291831
      https://github.com/zanata/zanata-server/commit/fc79d16abd43e1d4e0b2199ce19784651a291831
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Change Password Tests

Detailed tests for changing of an account password.
Uses Rule, rather than ClassRule, for resetting the database
between test functions.
Also rename Register to Account tests/suites, and the 'full'
is unnecessary.

  Commit: 6515af7f5807fae5c6e6fb705c395c7fbac7e757
      https://github.com/zanata/zanata-server/commit/6515af7f5807fae5c6e6fb705c395c7fbac7e757
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Add password change length test

  Commit: 5af1f643b83d87260dbe904358e82307175bc811
      https://github.com/zanata/zanata-server/commit/5af1f643b83d87260dbe904358e82307175bc811
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  - remove getByID to findById in HTextFlowTargetDAO
- change DatabaseOperation to DELETE_ALL when clear table in ActivityServiceImplTest
- change field name from action to actionType, person_id to actor_id
- change all parameter to use primitive long

  Commit: ad00d7693049f53cc72c38c98a947061fbff251e
      https://github.com/zanata/zanata-server/commit/ad00d7693049f53cc72c38c98a947061fbff251e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #72 from zanata/activityLog

User activity log

  Commit: 304a80a595a46927e8485c676902ee06153b2ab4
      https://github.com/zanata/zanata-server/commit/304a80a595a46927e8485c676902ee06153b2ab4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Use some better names in password tests

  Commit: 3b83e895b044644eaad70fe4bf0b24404f6d3f92
      https://github.com/zanata/zanata-server/commit/3b83e895b044644eaad70fe4bf0b24404f6d3f92
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 use fileId instead of contentLocation to refer to raw file lookup key

  Commit: 8180b76c41bc70f8c236fe2e217e2668ac1e22b3
      https://github.com/zanata/zanata-server/commit/8180b76c41bc70f8c236fe2e217e2668ac1e22b3
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    R zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  A bunch of css (interna; gwt) changes to fix the editor UI.

  Commit: c060f7a42a4074d1900ba0d201b50bc19f92637a
      https://github.com/zanata/zanata-server/commit/c060f7a42a4074d1900ba0d201b50bc19f92637a
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  Merge branches 'dashboard' and 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
  Add admin,glossary link

# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
  Add admin,glossary link

  Commit: bac8e2d60d08989bae6815b718c9fddf31683b69
      https://github.com/zanata/zanata-server/commit/bac8e2d60d08989bae6815b718c9fddf31683b69
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

  Commit: e1d99748d82eca577368036283ddcec6c0cf7847
      https://github.com/zanata/zanata-server/commit/e1d99748d82eca577368036283ddcec6c0cf7847
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    R zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Work in progress:
Rename template.xhtml to template_old.xhtml, template_v1.xhtml to template.xhtml. Preparing activities column in dashboard with message builder.

  Commit: 6678d08c0d49d7ba9eb357e89933d3f4585a3fe1
      https://github.com/zanata/zanata-server/commit/6678d08c0d49d7ba9eb357e89933d3f4585a3fe1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress: implementing activity in dashboard

  Commit: 1c2e1c7b94dde130c01997ff43d228f8a8394717
      https://github.com/zanata/zanata-server/commit/1c2e1c7b94dde130c01997ff43d228f8a8394717
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Clean up the chaining of function calls

  Commit: 73b0323fbe7acd1accccfae7e67e6a75ad92910f
      https://github.com/zanata/zanata-server/commit/73b0323fbe7acd1accccfae7e67e6a75ad92910f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    R zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    R zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    R zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    R zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    R zanata-war/src/main/java/org/zanata/service/ActivityService.java
    R zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Revert "Merge pull request #72 from zanata/activityLog"

This reverts commit ad00d7693049f53cc72c38c98a947061fbff251e, reversing
changes made to 3ee71a92a4bb09cb3042a6e736b65de7f198ea89.

  Commit: 8ebb8fd49c4ed394464ca661b200f7575ddd17cd
      https://github.com/zanata/zanata-server/commit/8ebb8fd49c4ed394464ca661b200f7575ddd17cd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  Merge pull request #73 from zanata/isolate-file-storage

WIP: raw file migration from database to file system

  Commit: 137ebb7375e8cc1c4aaaf2e182275b502837526c
      https://github.com/zanata/zanata-server/commit/137ebb7375e8cc1c4aaaf2e182275b502837526c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 add liquibase param for document storage directory migration

  Commit: 2cd4c4b734c53bc8c85e2313b8a1553c6ce92d3c
      https://github.com/zanata/zanata-server/commit/2cd4c4b734c53bc8c85e2313b8a1553c6ce92d3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Revert "Revert "Merge pull request #72 from zanata/activityLog""

This reverts commit 73b0323fbe7acd1accccfae7e67e6a75ad92910f.

  Commit: 4c9005bad88c06dd0a18baeed722e5311f73af75
      https://github.com/zanata/zanata-server/commit/4c9005bad88c06dd0a18baeed722e5311f73af75
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css

  Log Message:
  -----------
  Ui fixes, mostly colour

  Commit: 08a33c87f10b7fede51b0cd10d80dc941a5b4a8c
      https://github.com/zanata/zanata-server/commit/08a33c87f10b7fede51b0cd10d80dc941a5b4a8c
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    R zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Alex Eng (17) and others
# Via Alex Eng (5) and others
* 'dashboard' of https://github.com/zanata/zanata-server: (22 commits)
  Work in progress: implementing activity in dashboard
  Work in progress: Rename template.xhtml to template_old.xhtml, template_v1.xhtml to template.xhtml. Preparing activities column in dashboard with message builder.
  - remove getByID to findById in HTextFlowTargetDAO - change DatabaseOperation to DELETE_ALL when clear table in ActivityServiceImplTest - change field name from action to actionType, person_id to actor_id - change all parameter to use primitive long
  Refactor field names in activity and data type for id
  Increase Test Heirarchy and add Security and Homepage edit tests
  minor
  Change throwed exception to ZanataServiceException type
  refactor field names
  Add no args constructor in Activity
  ModelEntity refactoring for generic activity
  Work in progress: user activity
  Work in progress
  Work in progress: generic activity log
  Refactor Indexing Strategies for better performance.
  fix unit test
  Implement rollup records in hourly
  Add TextFlowTarget indexer that eagerly fetches all indexable properties.
  rhbz987235 - fix implicit hibernate flush causes double entries in history
  Implement HPersonActivity: https://bugzilla.redhat.com/show_bug.cgi?id=981064
  Work in progress: user activities
  ...

  Commit: 213601bb37a96275a92bee4de8e55436d17b9fb9
      https://github.com/zanata/zanata-server/commit/213601bb37a96275a92bee4de8e55436d17b9fb9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Add TransMemoryStreamingDAO

  Commit: d558c4b2b0bc904ea9921fea99834564690a0a33
      https://github.com/zanata/zanata-server/commit/d558c4b2b0bc904ea9921fea99834564690a0a33
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
	zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Commit: f67864459769a602f9cbc62d4a09cc947927f263
      https://github.com/zanata/zanata-server/commit/f67864459769a602f9cbc62d4a09cc947927f263
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java

  Log Message:
  -----------
  Excise lombok.val

  Commit: 89b50be3c49f0a9166711aa8e462f15b6557e146
      https://github.com/zanata/zanata-server/commit/89b50be3c49f0a9166711aa8e462f15b6557e146
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java

  Log Message:
  -----------
  Add TextFlowTarget indexer that eagerly fetches all indexable properties.

  Commit: 2975176136adeb25f63535b9d5f1eafba510fb69
      https://github.com/zanata/zanata-server/commit/2975176136adeb25f63535b9d5f1eafba510fb69
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Refactor Indexing Strategies for better performance.

Create an indexing strategy that performs less database queries and is able to index TextFlow targets faster.

  Commit: 94762fbc0c4f0f4ea06d8b59f3b52ef836950189
      https://github.com/zanata/zanata-server/commit/94762fbc0c4f0f4ea06d8b59f3b52ef836950189
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Get rid of Text Flow indexing altogether.

Now using text flow target indexing for TM searches.
Also, a bit of formatting applied to persistence.xml

  Commit: c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
      https://github.com/zanata/zanata-server/commit/c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java

  Log Message:
  -----------
  Change TM search query to return items in both HTextFlowTarget and TMTranslationUnit.

  Commit: e9b52d6e7471a6eef0ba724a6452746fe98a704d
      https://github.com/zanata/zanata-server/commit/e9b52d6e7471a6eef0ba724a6452746fe98a704d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

  Log Message:
  -----------
  Add TMTranslationUnits to the indexable entities in the Search admin page.

  Commit: d7172fde3cadab2eccf7deefcbe165ba95abf35c
      https://github.com/zanata/zanata-server/commit/d7172fde3cadab2eccf7deefcbe165ba95abf35c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Refactor content state enum into Match type.

This is because the matches can now be classified by their source (internal, imported TM) as well.
Also refactor a few bits of code that are no longer necessary.

  Commit: 4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
      https://github.com/zanata/zanata-server/commit/4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Add UI elements for TM results returned from imported TMs.

Replace the "Info" button with a comma-separated list of TM names.
Do not show a content state color for the target text, since TM translation units don't have such a property.

  Commit: 49a5fcf9d2c4699f96db9866ae7f928b26f44247
      https://github.com/zanata/zanata-server/commit/49a5fcf9d2c4699f96db9866ae7f928b26f44247
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    M zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx

  Log Message:
  -----------
  Fix broken tests

  Commit: fb364db28717e8550dff1fda6f5e1c1d1bad7271
      https://github.com/zanata/zanata-server/commit/fb364db28717e8550dff1fda6f5e1c1d1bad7271
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.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/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
	zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
	zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Commit: b2e94a2b035f144a8f4e438158c8e176aac5ba06
      https://github.com/zanata/zanata-server/commit/b2e94a2b035f144a8f4e438158c8e176aac5ba06
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/util/PrettyDate.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Work in progress: activities in dashboard

  Commit: 58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
      https://github.com/zanata/zanata-server/commit/58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Log Message:
  -----------
  Merge branch 'activityLog' into dashboard

  Commit: 28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
      https://github.com/zanata/zanata-server/commit/28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

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

Conflicts:
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Commit: a6625227aca13933bcdd1082ae8a56977c5fea9c
      https://github.com/zanata/zanata-server/commit/a6625227aca13933bcdd1082ae8a56977c5fea9c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Work in progress: dashboard activity

  Commit: 4579297f16584480878a0e2f8d52ec35d2cd3ff3
      https://github.com/zanata/zanata-server/commit/4579297f16584480878a0e2f8d52ec35d2cd3ff3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Move url methods into urlUtil

  Commit: 4f1b4259a19327bd4798dbaf698a7092857ae399
      https://github.com/zanata/zanata-server/commit/4f1b4259a19327bd4798dbaf698a7092857ae399
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Alter test code for consistency and readability

  Commit: def7b6aba43f419cf9009c8d7e56a2615c8a2250
      https://github.com/zanata/zanata-server/commit/def7b6aba43f419cf9009c8d7e56a2615c8a2250
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
    R zanata-model/src/main/java/org/zanata/model/HasStatus.java

  Log Message:
  -----------
  Rename HasStatus to HasEntityStatus.

  Commit: 109f2b4440cca82a9210b4551bb0d885352c3c38
      https://github.com/zanata/zanata-server/commit/109f2b4440cca82a9210b4551bb0d885352c3c38
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Refactor names in translation memory entities.

  Commit: a8b27039325d7397bee2363b3b9067ff72e90732
      https://github.com/zanata/zanata-server/commit/a8b27039325d7397bee2363b3b9067ff72e90732
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Add placeholder methods for TranslationMemory REST service

  Commit: 0a983c83085ef409f09b8fd51b1b233395d816f2
      https://github.com/zanata/zanata-server/commit/0a983c83085ef409f09b8fd51b1b233395d816f2
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    R zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/util/PrettyDate.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By David Mason (14) and others
# Via Alex Eng (3) and others
* 'dashboard' of https://github.com/zanata/zanata-server:
  Move url methods into urlUtil
  Work in progress: dashboard activity
  Work in progress: activities in dashboard
  Revert "Revert "Merge pull request #72 from zanata/activityLog""
  Revert "Merge pull request #72 from zanata/activityLog"
  rhbz980658 use fileId instead of contentLocation to refer to raw file lookup key
  rhbz980658 update TODO comment
  rhbz980658 change component name of FileSystemPersistService
  rhbz980658 update TODO comment
  rhbz980658 change jndi property name for document storage directory
  rhbz980658 remove remaining blob-based implementation for raw file persistence
  rhbz980658 drop (empty) temporary blob table
  rhbz980658 migrate raw documents to file system
  rhbz980658 add and use file system persist service
  remove accidentally added imports
  rhbz980658 add jndi property for document file storage location
  rhbz980658 implement blob access from temporary table
  rhbz980658 move blob content field out of HRawDocument
  rhbz980658 add contentLocation to HRawDocument in preparation for content migration

  Commit: 7bca5e200f4a498d8e0f25d89b8da7aa7739fb7f
      https://github.com/zanata/zanata-server/commit/7bca5e200f4a498d8e0f25d89b8da7aa7739fb7f
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Merge pull request #79 from zanata/tm-placeholders

Add placeholder methods for TranslationMemory REST service

  Commit: e02ff427cdf59344719a35b9a96c6464f3283730
      https://github.com/zanata/zanata-server/commit/e02ff427cdf59344719a35b9a96c6464f3283730
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Include register link to ui

  Commit: 80d30b49741eb6ba9b68c8f6df462376623ad3c5
      https://github.com/zanata/zanata-server/commit/80d30b49741eb6ba9b68c8f6df462376623ad3c5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css

  Log Message:
  -----------
  Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard

  Commit: 34b664cc635eb21062258d1b751265f9fc520ece
      https://github.com/zanata/zanata-server/commit/34b664cc635eb21062258d1b751265f9fc520ece
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Fix project version url

  Commit: e8b2e3e8c7b031e78875072c219cd143b5a239b7
      https://github.com/zanata/zanata-server/commit/e8b2e3e8c7b031e78875072c219cd143b5a239b7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Merge pull request #75 from zanata/change-password-tests

Change Password Tests

  Commit: 492a4147f281b8bc83d160086d58e3ac043e284f
      https://github.com/zanata/zanata-server/commit/492a4147f281b8bc83d160086d58e3ac043e284f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Language code fixes and table renaming.

  Commit: 044c5d67bff9efdcca6e6c2e8f74da2ca67197c7
      https://github.com/zanata/zanata-server/commit/044c5d67bff9efdcca6e6c2e8f74da2ca67197c7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  rhbz980658 update changelog

  Commit: ffd501c644c686025452d8cc8cceb1d323b43691
      https://github.com/zanata/zanata-server/commit/ffd501c644c686025452d8cc8cceb1d323b43691
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Rename ExportTransUnitStrategy -> ExportTMXTransUnitStrategy

  Commit: 921cf46a18b2b0042c509533f89fa2e0b0e3ff5b
      https://github.com/zanata/zanata-server/commit/921cf46a18b2b0042c509533f89fa2e0b0e3ff5b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
	zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Commit: 408c41c7a593f538143661c459f90489375bd40f
      https://github.com/zanata/zanata-server/commit/408c41c7a593f538143661c459f90489375bd40f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  Merge pull request #77 from zanata/isolate-file-storage

Add liquibase param for document storage directory migration

  Commit: d7d94d175d489a604d53e7e19b7c794067a3f113
      https://github.com/zanata/zanata-server/commit/d7d94d175d489a604d53e7e19b7c794067a3f113
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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

  Log Message:
  -----------
  Fix broken test

  Commit: 2ebf7276695871621e9db030ffcdb82009e87156
      https://github.com/zanata/zanata-server/commit/2ebf7276695871621e9db030ffcdb82009e87156
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Fix jsf head tag

  Commit: 1193a6a6b32fdd499239523ecbbb1789e8c38d19
      https://github.com/zanata/zanata-server/commit/1193a6a6b32fdd499239523ecbbb1789e8c38d19
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Update TM merge to support option for imported TMs.

  Commit: 1302a59526505bad5d91144079760365910a12e8
      https://github.com/zanata/zanata-server/commit/1302a59526505bad5d91144079760365910a12e8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java

  Log Message:
  -----------
  Update based on review comments

  Commit: 484300a5946337e331fb730d30df04b4d03d057c
      https://github.com/zanata/zanata-server/commit/484300a5946337e331fb730d30df04b4d03d057c
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Moved standard.css to application css in assets, Fixed some tags in dashboard template

  Commit: 787ecff645aa68b9272199a66b8c22e778ff0cf9
      https://github.com/zanata/zanata-server/commit/787ecff645aa68b9272199a66b8c22e778ff0cf9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java

  Log Message:
  -----------
  Code review updates.

  Commit: 2e5a884772470a94c93042ecc7bec2f472d780c4
      https://github.com/zanata/zanata-server/commit/2e5a884772470a94c93042ecc7bec2f472d780c4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

  Commit: 464b7d4e2c8e91ff9ace8a31272d6b386d014f50
      https://github.com/zanata/zanata-server/commit/464b7d4e2c8e91ff9ace8a31272d6b386d014f50
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Implement load more activities button

  Commit: a4c30823e9f5bb9c2804e3de154992db03baeb64
      https://github.com/zanata/zanata-server/commit/a4c30823e9f5bb9c2804e3de154992db03baeb64
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard

Conflicts:
	zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Commit: 2d425b03e77a25c44f8504eeb924f0114d8eb315
      https://github.com/zanata/zanata-server/commit/2d425b03e77a25c44f8504eeb924f0114d8eb315
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Refactor the writing of TMX metadata to the DB.

  Commit: faf3d5840e94490e3549f7ee988951fd0fa9ad68
      https://github.com/zanata/zanata-server/commit/faf3d5840e94490e3549f7ee988951fd0fa9ad68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java

  Log Message:
  -----------
  Use Optional instead of @Nullable

  Commit: d3f7714c45df6ffdfb24075f741bac0c2b0fb4a0
      https://github.com/zanata/zanata-server/commit/d3f7714c45df6ffdfb24075f741bac0c2b0fb4a0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  More updates from code review.

  Commit: 3f58fae6e57236032487faa8a228591be88a9c63
      https://github.com/zanata/zanata-server/commit/3f58fae6e57236032487faa8a228591be88a9c63
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Log Message:
  -----------
  Update based on review comments

  Commit: 1d197fc096fcbc56ea799ea56ddc76c122670ae3
      https://github.com/zanata/zanata-server/commit/1d197fc096fcbc56ea799ea56ddc76c122670ae3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Commit: 7460c3356ae5860c2213c10580b62ea46a22ddd9
      https://github.com/zanata/zanata-server/commit/7460c3356ae5860c2213c10580b62ea46a22ddd9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Update based on review comments

  Commit: f005bf2fac42a0443ffd1e267b54a649fe644305
      https://github.com/zanata/zanata-server/commit/f005bf2fac42a0443ffd1e267b54a649fe644305
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Refactor dashboard action to activity action

  Commit: 9b614d7c80dd49eb44328b986cebc39e7632b47c
      https://github.com/zanata/zanata-server/commit/9b614d7c80dd49eb44328b986cebc39e7632b47c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Add loading icon when load more activities

  Commit: c3f50592f42ee44d4d68559cb858ad01472ca267
      https://github.com/zanata/zanata-server/commit/c3f50592f42ee44d4d68559cb858ad01472ca267
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java

  Log Message:
  -----------
  Rename variable in activity action class

  Commit: cbdddcdc34238ad785392bd77ecb21571862113f
      https://github.com/zanata/zanata-server/commit/cbdddcdc34238ad785392bd77ecb21571862113f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/account/changepassword.xhtml

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

  Commit: 15558edcb47472072d4142c891e63520bae1d258
      https://github.com/zanata/zanata-server/commit/15558edcb47472072d4142c891e63520bae1d258
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  fix ConcurrentModificationException triggered by jsf

- refactoring
- fix an issue where a field blur event in jsf triggers an ajax validation call, while another selenium action triggers another server call, the server will in error state

  Commit: 23a8ea970317e6ba96ebe08cf4052dba97957649
      https://github.com/zanata/zanata-server/commit/23a8ea970317e6ba96ebe08cf4052dba97957649
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  fix functional cargo deployment after file storage changelog change

  Commit: e26c3bf7257ded45abdd7dcabd0b46833096e70b
      https://github.com/zanata/zanata-server/commit/e26c3bf7257ded45abdd7dcabd0b46833096e70b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java

  Log Message:
  -----------
  rename methods and add javadoc

  Commit: f4a69be11ba4921126b2e8b84da86f3d44103a35
      https://github.com/zanata/zanata-server/commit/f4a69be11ba4921126b2e8b84da86f3d44103a35
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Change loading animation for load more activities, update code based on review comments

  Commit: 9747c7cd1a99b0d5ee0dc93b30a4f1db2385bf50
      https://github.com/zanata/zanata-server/commit/9747c7cd1a99b0d5ee0dc93b30a4f1db2385bf50
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    M zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Update based on review comments

  Commit: 3641a82e999d3f6dd877f3f09fa1233d08536a90
      https://github.com/zanata/zanata-server/commit/3641a82e999d3f6dd877f3f09fa1233d08536a90
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Update code based on review

  Commit: ca2d55a8d587843224d407b526a291c1b61b3c0d
      https://github.com/zanata/zanata-server/commit/ca2d55a8d587843224d407b526a291c1b61b3c0d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  Merge pull request #76 from zanata/fix-functional-test

fix ConcurrentModificationException triggered by jsf

  Commit: 7a4a4d1d3be724bb6a490fce360e7a0708a4b593
      https://github.com/zanata/zanata-server/commit/7a4a4d1d3be724bb6a490fce360e7a0708a4b593
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Change load activity to 5 initially, change version icon

  Commit: 3d9b0f6acb7c326a78ca7983ca46ba6f485b91a8
      https://github.com/zanata/zanata-server/commit/3d9b0f6acb7c326a78ca7983ca46ba6f485b91a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    R zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  refactor code based on review comments

  Commit: 88a8d4aaa52883048bdb93e849c3c806e6f7bb4f
      https://github.com/zanata/zanata-server/commit/88a8d4aaa52883048bdb93e849c3c806e6f7bb4f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java

  Log Message:
  -----------
  refactor code based on review comments

  Commit: 716f4060077cef9f0bb85c3f6212f7856bf1c7b0
      https://github.com/zanata/zanata-server/commit/716f4060077cef9f0bb85c3f6212f7856bf1c7b0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  refactor code based on review comments

  Commit: ab1e9b9e8d4c2b7ffd4c0e17e65c181c7a75b375
      https://github.com/zanata/zanata-server/commit/ab1e9b9e8d4c2b7ffd4c0e17e65c181c7a75b375
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml

  Log Message:
  -----------
  Fix editor translation colors

  Commit: e9231c9bdc897077ebfab7862c27e6b30c6c68ec
      https://github.com/zanata/zanata-server/commit/e9231c9bdc897077ebfab7862c27e6b30c6c68ec
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    R zanata-model/src/main/java/org/zanata/model/HasEntityType.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
  refactor code based on review comments
  refactor code based on review comments
  refactor code based on review comments

  Commit: 4985db54fcde9d3e8f17c2318dfe57ccf707c013
      https://github.com/zanata/zanata-server/commit/4985db54fcde9d3e8f17c2318dfe57ccf707c013
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java

  Log Message:
  -----------
  refactor code based on review comments

  Commit: 90d5c0ae753cc691d7f9d0664202be97e4a6778a
      https://github.com/zanata/zanata-server/commit/90d5c0ae753cc691d7f9d0664202be97e4a6778a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml

  Log Message:
  -----------
  Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard

  Commit: e5906a9f6e5a7efef1773978e158bcb6e2222db7
      https://github.com/zanata/zanata-server/commit/e5906a9f6e5a7efef1773978e158bcb6e2222db7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml

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

  Commit: 67b925f7ed7abb635b948ec84b41fab86800efdf
      https://github.com/zanata/zanata-server/commit/67b925f7ed7abb635b948ec84b41fab86800efdf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/util/TMXUtils.java
    R zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/MultiLangTMXWriter.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Improve TMX metadata handling

  Commit: 5be9d28429a58bdc56823276678810a93389b77c
      https://github.com/zanata/zanata-server/commit/5be9d28429a58bdc56823276678810a93389b77c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  delete old exploded deployment before redeploy

  Commit: 930aee17123121e40cc87b6c97f57f03fdf56e13
      https://github.com/zanata/zanata-server/commit/930aee17123121e40cc87b6c97f57f03fdf56e13
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #82 from zanata/exploded-deploy

delete old exploded deployment before redeploy

  Commit: 68ff8a2927e32e4359c2116f0ff538cae8f97d56
      https://github.com/zanata/zanata-server/commit/68ff8a2927e32e4359c2116f0ff538cae8f97d56
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/PrettyDate.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  refactor code based on review comments

  Commit: 81b17b0fc7c633498dcf303497a501b2a3217d6a
      https://github.com/zanata/zanata-server/commit/81b17b0fc7c633498dcf303497a501b2a3217d6a
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml

  Log Message:
  -----------
  More history css changes. Removing css variable… this is not Sass.

  Commit: c2a9e55842a60f98300c52800af534ff7559d3a4
      https://github.com/zanata/zanata-server/commit/c2a9e55842a60f98300c52800af534ff7559d3a4
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/PrettyDate.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard

# By Patrick Huang (3) and Alex Eng (2)
# Via Alex Eng (3) and Carlos Munoz (1)
* 'dashboard' of https://github.com/zanata/zanata-server:
  refactor code based on review comments
  refactor code based on review comments
  rename methods and add javadoc
  fix functional cargo deployment after file storage changelog change
  fix ConcurrentModificationException triggered by jsf

  Commit: d2516a043eba6ae30490d590d6b798dbb1136a51
      https://github.com/zanata/zanata-server/commit/d2516a043eba6ae30490d590d6b798dbb1136a51
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Add unit test to validate the order of the MAtchType enumeration is kept.

  Commit: 272363f58ffcf9f857cbe73d077a79e01065bfe0
      https://github.com/zanata/zanata-server/commit/272363f58ffcf9f857cbe73d077a79e01065bfe0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Add Trans memory merge tests.

  Commit: ce7411a1923a70df6e861713152c8e03dc512e15
      https://github.com/zanata/zanata-server/commit/ce7411a1923a70df6e861713152c8e03dc512e15
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/TMXUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Remove namespace when persisting node and prop elements

  Commit: 781ee848c60eebc44209c50428afb83656ae309e
      https://github.com/zanata/zanata-server/commit/781ee848c60eebc44209c50428afb83656ae309e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  functional test fix

  Commit: db0bba41577638db2cd7a60bea3868282eb6986e
      https://github.com/zanata/zanata-server/commit/db0bba41577638db2cd7a60bea3868282eb6986e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  Fix reset password test

An unstable behaviour of the reset password form results in either
one of two error messages showing, so expect one or the other.

  Commit: 9e1c8423228d087dd28641c55e2fd69ee5c7947c
      https://github.com/zanata/zanata-server/commit/9e1c8423228d087dd28641c55e2fd69ee5c7947c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

  Log Message:
  -----------
  Add TMXParser tests that account for metadata.

  Commit: e4db9485b130d1f6202a572a9cff90073aaae4be
      https://github.com/zanata/zanata-server/commit/e4db9485b130d1f6202a572a9cff90073aaae4be
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Change handling of attributes and elements in TMXMetadataHelper

  Commit: 07c43838ec0bc3c90ef93ada1d4527e0f755585f
      https://github.com/zanata/zanata-server/commit/07c43838ec0bc3c90ef93ada1d4527e0f755585f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

  Commit: 71062b88deb291929fc3ee7fb3c9cb08cd0cc75d
      https://github.com/zanata/zanata-server/commit/71062b88deb291929fc3ee7fb3c9cb08cd0cc75d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java

  Log Message:
  -----------
  rhbz980658 add test class for SourceDocumentUpload

  Commit: f230fc64f7ecae62dea5d96407f5d80c13b4b45b
      https://github.com/zanata/zanata-server/commit/f230fc64f7ecae62dea5d96407f5d80c13b4b45b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  Merge pull request #83 from zanata/fix-reset-password-test

Fix reset password test

  Commit: 106ec4d4e1bc8363ced6079ab4a76f4b37117915
      https://github.com/zanata/zanata-server/commit/106ec4d4e1bc8363ced6079ab4a76f4b37117915
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java

  Log Message:
  -----------
  rhbz980658 move source document upload tests from file service tests

  Commit: a7ebbbdc8bbe49afc8d1a1d4e96e206eb7c117c2
      https://github.com/zanata/zanata-server/commit/a7ebbbdc8bbe49afc8d1a1d4e96e206eb7c117c2
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Add metadata content verification in the TMX Parser test.

  Commit: 44472758ad8e21246357f6ba2f42e0fc4f7888ff
      https://github.com/zanata/zanata-server/commit/44472758ad8e21246357f6ba2f42e0fc4f7888ff
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

  Log Message:
  -----------
  Fix tmx metadata parser tests.

  Commit: ce9ff037c42b4aec604db81f7596fa0816a9a053
      https://github.com/zanata/zanata-server/commit/ce9ff037c42b4aec604db81f7596fa0816a9a053
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  rhbz980658 move remaining source document upload tests from file service tests

  Commit: 903c0171b05127643dfb14401090e58a6ec08a89
      https://github.com/zanata/zanata-server/commit/903c0171b05127643dfb14401090e58a6ec08a89
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  rhbz980658 update FileServiceTest to check that source upload values are passed properly

  Commit: bcbb271424347d4231c5e82a9e541d20c26a64dd
      https://github.com/zanata/zanata-server/commit/bcbb271424347d4231c5e82a9e541d20c26a64dd
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

  Log Message:
  -----------
  Added new classes and tweaks to history UI

  Commit: 3a61fb7c70d5c4f49fca4b6e2c0bb7074da08e12
      https://github.com/zanata/zanata-server/commit/3a61fb7c70d5c4f49fca4b6e2c0bb7074da08e12
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Refactor test assertions.

  Commit: b266064cab365e4cd04c806fbec46811170b436a
      https://github.com/zanata/zanata-server/commit/b266064cab365e4cd04c806fbec46811170b436a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Fix failing TMX parser test.

  Commit: d73beb72e54f7bc38d9ed1a6b6460f7153b5f3c1
      https://github.com/zanata/zanata-server/commit/d73beb72e54f7bc38d9ed1a6b6460f7153b5f3c1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml

  Log Message:
  -----------
  separate icon for review and tranlate entries

  Commit: 92cf5ff39943be26a783ba261828aa4732f4ad32
      https://github.com/zanata/zanata-server/commit/92cf5ff39943be26a783ba261828aa4732f4ad32
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  rhbz980658 update FileServiceTest to check that translation upload values are passed properly

  Commit: 1eaca91663c73cfd64c1168701022bc78e8b8970
      https://github.com/zanata/zanata-server/commit/1eaca91663c73cfd64c1168701022bc78e8b8970
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/main/java/org/zanata/util/TMXUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/MultiLangTMXWriter.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
    A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java

  Log Message:
  -----------
  Use XOM instead of Okapi to output TMX

  Commit: 752e03ab9bd32624870f15e1101721d5caba4af9
      https://github.com/zanata/zanata-server/commit/752e03ab9bd32624870f15e1101721d5caba4af9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Remove unused TranslatedTextFlowFilter and associated caching

  Commit: da7f772e1e7cd90d25b9454e3bc46fec45dbd5c7
      https://github.com/zanata/zanata-server/commit/da7f772e1e7cd90d25b9454e3bc46fec45dbd5c7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M zanata-war/pom.xml

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

  Commit: 6ea385d4becd91fc526d1cdff7d14965b90990bb
      https://github.com/zanata/zanata-server/commit/6ea385d4becd91fc526d1cdff7d14965b90990bb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  fix database script in functional test

  Commit: 63185e448cc300a3fb4ecf7d7cd16984544b69c9
      https://github.com/zanata/zanata-server/commit/63185e448cc300a3fb4ecf7d7cd16984544b69c9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Log Message:
  -----------
  ensure sign out before register test

  Commit: d891da9bf4ee37829e44f9123463e8c0c56d0bcb
      https://github.com/zanata/zanata-server/commit/d891da9bf4ee37829e44f9123463e8c0c56d0bcb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java

  Log Message:
  -----------
  move admin visible elements out of annotated fields

  Commit: b85f72decb188eb1fdc5fb76da5354a0ae05113a
      https://github.com/zanata/zanata-server/commit/b85f72decb188eb1fdc5fb76da5354a0ae05113a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  change tests that go to registration page delete cookies first(sign out)

  Commit: a07a9f1e88423e12f7172407da9f6a03074b047d
      https://github.com/zanata/zanata-server/commit/a07a9f1e88423e12f7172407da9f6a03074b047d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  Merge pull request #84 from zanata/fix-functional-test

fix functional test

  Commit: 10c78f479b72b8c9e25a5e87373cbcd3c9a19650
      https://github.com/zanata/zanata-server/commit/10c78f479b72b8c9e25a5e87373cbcd3c9a19650
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R zanata-war/src/main/java/org/zanata/util/PrettyDate.java

  Log Message:
  -----------
  fix functional test

  Commit: 553f957adae4acd80a2fcde17d9c457e8443f03e
      https://github.com/zanata/zanata-server/commit/553f957adae4acd80a2fcde17d9c457e8443f03e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/BasePage.java
	functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Commit: 66f13d1008724549def42abc9acd5555d8f2df70
      https://github.com/zanata/zanata-server/commit/66f13d1008724549def42abc9acd5555d8f2df70
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    R zanata-model/src/main/java/org/zanata/model/SourceContents.java
    R zanata-model/src/main/java/org/zanata/model/TargetContents.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
    R zanata-model/src/main/java/org/zanata/util/TMXUtils.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    R zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    R zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Update based on review comments

  Commit: 6d46c7295393c2cb9c32607a3de48b8b2f79ae51
      https://github.com/zanata/zanata-server/commit/6d46c7295393c2cb9c32607a3de48b8b2f79ae51
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Fix functional test

  Commit: 870d45694dfb660e9d69bb60a770ea9686fc6fa8
      https://github.com/zanata/zanata-server/commit/870d45694dfb660e9d69bb60a770ea9686fc6fa8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Update based on review comments

  Commit: ce20b1e3f22a01964a9623cd7cc854cabb0f4345
      https://github.com/zanata/zanata-server/commit/ce20b1e3f22a01964a9623cd7cc854cabb0f4345
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Add message when no activity loaded

  Commit: 67e168c703f5e33a8f325c11dca4fd83fb4b33ac
      https://github.com/zanata/zanata-server/commit/67e168c703f5e33a8f325c11dca4fd83fb4b33ac
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java

  Log Message:
  -----------
  Include XML declaration when exporting TMX, expand StreamSerializerTest

  Commit: f7e53b9e07e357a2b2ff1be675af7d3b3b854bde
      https://github.com/zanata/zanata-server/commit/f7e53b9e07e357a2b2ff1be675af7d3b3b854bde
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Log Message:
  -----------
  Ensure that TranslationMemoryResourceService & TMXStreamingOutput co-operate to close CloseableIterators

  Commit: dec159f80ab28f098070fccb4722862f4e5680e0
      https://github.com/zanata/zanata-server/commit/dec159f80ab28f098070fccb4722862f4e5680e0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Update based on review comments

  Commit: a4407891aa2cf5b0cd26b3a2877ba1d84fef647c
      https://github.com/zanata/zanata-server/commit/a4407891aa2cf5b0cd26b3a2877ba1d84fef647c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  Extract methods for writing elements

  Commit: fd29efa3eaf1127a4f226577699ad8e49b983239
      https://github.com/zanata/zanata-server/commit/fd29efa3eaf1127a4f226577699ad8e49b983239
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Update matchTypeEnumOrder test

  Commit: 75b0116314953191c59649c4812f87c9dfe6b44b
      https://github.com/zanata/zanata-server/commit/75b0116314953191c59649c4812f87c9dfe6b44b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml

  Log Message:
  -----------
  Rename element id to be consistance with new text

  Commit: 3c4502b60e16fcb8e1ac2d94e18428bc3feff59a
      https://github.com/zanata/zanata-server/commit/3c4502b60e16fcb8e1ac2d94e18428bc3feff59a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

  Log Message:
  -----------
  Merge pull request #86 from zanata/translation-history-tweaks

Translation history tweaks

  Commit: ad905b21cb2337e68ba402c145fbe08d811e8c35
      https://github.com/zanata/zanata-server/commit/ad905b21cb2337e68ba402c145fbe08d811e8c35
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Enable TMX upload as a synchronous rest service.

  Commit: cc51b96c1be6f8138a2eb83f7cafecc68cce19cc
      https://github.com/zanata/zanata-server/commit/cc51b96c1be6f8138a2eb83f7cafecc68cce19cc
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add progress feedback to the asynchronous TM import resource.

  Commit: 58178363591d154fa2207d36aa9a9eb3498c5f24
      https://github.com/zanata/zanata-server/commit/58178363591d154fa2207d36aa9a9eb3498c5f24
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Log Message:
  -----------
  web driver delete cookies and also refresh page

  Commit: 221722a05fa3dbec11c63039b7280412ad4ee71a
      https://github.com/zanata/zanata-server/commit/221722a05fa3dbec11c63039b7280412ad4ee71a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  rename method

  Commit: 5fec7d8d4b42c2d9373903071d013d03f250115b
      https://github.com/zanata/zanata-server/commit/5fec7d8d4b42c2d9373903071d013d03f250115b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  Merge pull request #88 from zanata/fix-functional-test

Fix functional test

  Commit: c471da3527dbd4cdc623e9466e64ebf89a39bea6
      https://github.com/zanata/zanata-server/commit/c471da3527dbd4cdc623e9466e64ebf89a39bea6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Create MergeOptions to hold a group of MergeOption

  Commit: 9ce0095f7fa551cefe647277431346533ac1722f
      https://github.com/zanata/zanata-server/commit/9ce0095f7fa551cefe647277431346533ac1722f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Rename MergeOption to MergeRule

  Commit: 5fce327ed0a8d4300471fc82fc33536362167232
      https://github.com/zanata/zanata-server/commit/5fce327ed0a8d4300471fc82fc33536362167232
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java

  Log Message:
  -----------
  Fix build broken by mismatched version of api

  Commit: 8307270c186163e85d276750afb78c193812f672
      https://github.com/zanata/zanata-server/commit/8307270c186163e85d276750afb78c193812f672
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardRedirectTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/DashboardRedirect.html

  Log Message:
  -----------
  add dashboard redirect test

  Commit: fbc88bd162d4814d67ec3a824ceba5a0c991845f
      https://github.com/zanata/zanata-server/commit/fbc88bd162d4814d67ec3a824ceba5a0c991845f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java

  Log Message:
  -----------
  rhbz980658 move tests for common upload checks to new test class

    Checks are performed in DocumentUploadUtil, so would have been duplicated
    in source and translation upload tests. Instead, source and translation
    upload tests just make sure they handle exceptions from the util properly
    and tests for the specific checks run only against the util.

  Commit: 860f62f3952f4223d2da4b2c18cbce13f7677f7e
      https://github.com/zanata/zanata-server/commit/860f62f3952f4223d2da4b2c18cbce13f7677f7e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Clear Session after each batch; disable caching

  Commit: e718b98aa347c20a4250af802dae653a4dd5a5f4
      https://github.com/zanata/zanata-server/commit/e718b98aa347c20a4250af802dae653a4dd5a5f4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardRedirectTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/DashboardRedirect.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  Add functional test for dashboard activities and maintained project

  Commit: 20b46ae28be919f3c8adb6e18aba59f678d5b74a
      https://github.com/zanata/zanata-server/commit/20b46ae28be919f3c8adb6e18aba59f678d5b74a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Add id to maintainedProject list

  Commit: 27bd89895a7bd14f8ff952606455d0ab1ed09cb8
      https://github.com/zanata/zanata-server/commit/27bd89895a7bd14f8ff952606455d0ab1ed09cb8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Commit: 0889029daaf53b67eace6892cb3d26b8cd2cdff1
      https://github.com/zanata/zanata-server/commit/0889029daaf53b67eace6892cb3d26b8cd2cdff1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

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

Conflicts:
	functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Commit: f3592a892017ae3a2bb0e4294cc8c01f44aa6788
      https://github.com/zanata/zanata-server/commit/f3592a892017ae3a2bb0e4294cc8c01f44aa6788
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Switch back to a synchronous (but fully streamed) revision of the TM file upload service.

  Commit: b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
      https://github.com/zanata/zanata-server/commit/b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'dashboard' into tmx-dashboard

Conflicts:
	zanata-model/src/main/java/org/zanata/model/HDocument.java
	zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
	zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
	zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
	zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Commit: 07bb8cfcb6c32c4ee616f8c038566015538dcc70
      https://github.com/zanata/zanata-server/commit/07bb8cfcb6c32c4ee616f8c038566015538dcc70
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Change dummy implementation for TranslationMemoryService.updateTranslationMemory.

This change is temporary until the changes for TM import are merged into the main branch.

  Commit: 9620e5e7f9d92fe90152f99e26eafc3a62fe0f88
      https://github.com/zanata/zanata-server/commit/9620e5e7f9d92fe90152f99e26eafc3a62fe0f88
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  rhbz990373 disable source upload buttons when no file specified

    A null pointer exception occurred when an upload was submitted
    without first selecting a file. This prevents submission whenever
    a file is not selected.

  Commit: c8d4e99617af85a65c5b787d8b7b432f6804fd4c
      https://github.com/zanata/zanata-server/commit/c8d4e99617af85a65c5b787d8b7b432f6804fd4c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css

  Log Message:
  -----------
  Merge pull request #89 from zanata/disable-null-upload

Fix for rhbz990373 - disables source upload buttons when no file specified

  Commit: 91d532e4650583d56ee130eb45f012329a866e9c
      https://github.com/zanata/zanata-server/commit/91d532e4650583d56ee130eb45f012329a866e9c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Log Message:
  -----------
  Fix merger issue with dashboard

  Commit: 84f47a60cc49ff02932b70c982120cc966a7a620
      https://github.com/zanata/zanata-server/commit/84f47a60cc49ff02932b70c982120cc966a7a620
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge branch 'tm-import' into tmx-dashboard

  Commit: b37d8cc0cddb30312049106e0e98578310a61cbc
      https://github.com/zanata/zanata-server/commit/b37d8cc0cddb30312049106e0e98578310a61cbc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    A functional-test/src/main/java/org/zanata/util/Checkbox.java

  Log Message:
  -----------
  rewrite add language team member page

  Commit: 635cefff72756848afee91e3f33c2610a65970d9
      https://github.com/zanata/zanata-server/commit/635cefff72756848afee91e3f33c2610a65970d9
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Log Message:
  -----------
  Merge branch 'tmx-dashboard' of github.com:zanata/zanata into tmx-dashboard

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Commit: 75633b2162306f978367408540239b5860ecabe0
      https://github.com/zanata/zanata-server/commit/75633b2162306f978367408540239b5860ecabe0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml

  Log Message:
  -----------
  Change script.js to use jndi config url

  Commit: 7c91740176890206661a08c807244c2649ed5188
      https://github.com/zanata/zanata-server/commit/7c91740176890206661a08c807244c2649ed5188
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml

  Log Message:
  -----------
  Merge branch 'tmx-dashboard' of github.com:zanata/zanata into tmx-dashboard

  Commit: 972139b1fac261cde8ed9b5ca5de6357b5afc0e8
      https://github.com/zanata/zanata-server/commit/972139b1fac261cde8ed9b5ca5de6357b5afc0e8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Change templates in Trans Memory pages to the new ones.

  Commit: 366c3b032cb21b6cb432cb3ff15015bedc2b878c
      https://github.com/zanata/zanata-server/commit/366c3b032cb21b6cb432cb3ff15015bedc2b878c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Refactor Metadata tables.

Metadata is now a single string in both the TU and TUVs.
Change the way the Translation Memory size is being calculated in the home page. It's now done using a query.
Add pages.xml entry for the Trans Memory admin home page.

  Commit: 226c77809b317f4b11a27bcf7cce92f7900b762b
      https://github.com/zanata/zanata-server/commit/226c77809b317f4b11a27bcf7cce92f7900b762b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Fix handling of metadata

  Commit: 2b8ad1acd535461271e06d103bcfc049404c160c
      https://github.com/zanata/zanata-server/commit/2b8ad1acd535461271e06d103bcfc049404c160c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Add dashboard functional-test - load more activities action

  Commit: f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
      https://github.com/zanata/zanata-server/commit/f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
	zanata-war/src/main/webapp/resources/css/zanata.css

  Commit: bbe8f454b365ca29fd9b5ea5d68a245b596bace5
      https://github.com/zanata/zanata-server/commit/bbe8f454b365ca29fd9b5ea5d68a245b596bace5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java

  Log Message:
  -----------
  Check metadataType in setMetadata

  Commit: 452dd75adff2fd2d3f4baa0c77365088d786cced
      https://github.com/zanata/zanata-server/commit/452dd75adff2fd2d3f4baa0c77365088d786cced
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Implement 'merging' of existing TUs when importing TMX files.

  Commit: 5293647b41c5fde10adce203c2ccf01bb7f11afd
      https://github.com/zanata/zanata-server/commit/5293647b41c5fde10adce203c2ccf01bb7f11afd
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Fix issues when clearing a translation memory.

  Commit: c6487a9e4a327c2aaa4d496e3e1ab692d986f360
      https://github.com/zanata/zanata-server/commit/c6487a9e4a327c2aaa4d496e3e1ab692d986f360
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

  Log Message:
  -----------
  Add JUnit annotations

  Commit: cca3baaf5d6b774bfc85b3ca39bdae3afbb1d313
      https://github.com/zanata/zanata-server/commit/cca3baaf5d6b774bfc85b3ca39bdae3afbb1d313
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml

  Log Message:
  -----------
  Add DTD validation for TMX files

  Commit: 1a656656509b6857cab17463cd6ca0ccabd68d52
      https://github.com/zanata/zanata-server/commit/1a656656509b6857cab17463cd6ca0ccabd68d52
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Change error page default message and add bug report link to error page.

  Commit: 2b3872dd29ca0cb936d26dabbbae3a2546cda0f3
      https://github.com/zanata/zanata-server/commit/2b3872dd29ca0cb936d26dabbbae3a2546cda0f3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  Merge pull request #85 from zanata/test-file-service-classes

Move source file upload tests out of FileServiceTest

  Commit: 17502b58329c22bb416a5cb2b34c6706c981b1f3
      https://github.com/zanata/zanata-server/commit/17502b58329c22bb416a5cb2b34c6706c981b1f3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    A functional-test/src/main/java/org/zanata/util/Checkbox.java

  Log Message:
  -----------
  Merge pull request #90 from zanata/fix-functional-test

Rewrite add language team member page

  Commit: 0a5bddc7f24c5495e422035de208a2032f3f25b6
      https://github.com/zanata/zanata-server/commit/0a5bddc7f24c5495e422035de208a2032f3f25b6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    A functional-test/src/main/java/org/zanata/util/Checkbox.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

  Commit: 2d213a91e4d2466f4288bfeaa64dc7db1a246b83
      https://github.com/zanata/zanata-server/commit/2d213a91e4d2466f4288bfeaa64dc7db1a246b83
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add TMX export option in the TM home page.

Change verbiage in the TM home page.

  Commit: 1d77175e6731fc5faf8970499bba4e6c3a3b3bb2
      https://github.com/zanata/zanata-server/commit/1d77175e6731fc5faf8970499bba4e6c3a3b3bb2
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add delete feature from translation memories.

  Commit: 3144ebb49788373aa9dc4c5a6f3aff18deea8b44
      https://github.com/zanata/zanata-server/commit/3144ebb49788373aa9dc4c5a6f3aff18deea8b44
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml

  Log Message:
  -----------
  Merge branch 'tm-import' into tmx-dashboard

  Commit: 5bf0f1eadda3c43c780c06cdbdb9746bae49215d
      https://github.com/zanata/zanata-server/commit/5bf0f1eadda3c43c780c06cdbdb9746bae49215d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge pull request #91 from zanata/change-error-page

Change error page default message and add bug report link to error page.

  Commit: 0b7c5f18e86fa7dbd7f0cb6cee8b5b1807c6832c
      https://github.com/zanata/zanata-server/commit/0b7c5f18e86fa7dbd7f0cb6cee8b5b1807c6832c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

  Commit: 59e7e6da5a89c38299d35df95a59b0a99e54f0ca
      https://github.com/zanata/zanata-server/commit/59e7e6da5a89c38299d35df95a59b0a99e54f0ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Add DOCTYPE when exporting TMX

  Commit: 80a5665234b21db897082ffe803517ef06d5b949
      https://github.com/zanata/zanata-server/commit/80a5665234b21db897082ffe803517ef06d5b949
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

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

  Log Message:
  -----------
  change error page text to reflect new menu

  Commit: a9793ae5c4192f792fb0995727eb01d4b7f18053
      https://github.com/zanata/zanata-server/commit/a9793ae5c4192f792fb0995727eb01d4b7f18053
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java

  Log Message:
  -----------
  Treat any tmx14.dtd as TMX 1.4

  Commit: 3f5dff51eab9a7fdadb434d54427499eda635fc3
      https://github.com/zanata/zanata-server/commit/3f5dff51eab9a7fdadb434d54427499eda635fc3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx

  Log Message:
  -----------
  Handle underscore in locale names (probably invalid, but common in TMX files)

  Commit: 79520dfaca8ea10c4ca13f305d83464a332e9c21
      https://github.com/zanata/zanata-server/commit/79520dfaca8ea10c4ca13f305d83464a332e9c21
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Log Message:
  -----------
  Retrict getTranslationMemory to admin

  Commit: acfa6b755bdf9f23cdbdea9cd7f94b24d2fe4b88
      https://github.com/zanata/zanata-server/commit/acfa6b755bdf9f23cdbdea9cd7f94b24d2fe4b88
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

  Log Message:
  -----------
  Remove indexing of HTextFlow

  Commit: f1085c4774ef5acb270079778d04c2d43195f482
      https://github.com/zanata/zanata-server/commit/f1085c4774ef5acb270079778d04c2d43195f482
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Refactor reindexing and strategy classes

  Commit: 958748362751ac7c7bea32904022c36f5803602c
      https://github.com/zanata/zanata-server/commit/958748362751ac7c7bea32904022c36f5803602c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java

  Log Message:
  -----------
  Add some basic tests for TranslationFileServiceImpl

    Just testing a few of the utility methods, nothing for the core
    behaviour yet.

  Commit: 5cdf56cfe02883487e320090d5e9e8c88feeff88
      https://github.com/zanata/zanata-server/commit/5cdf56cfe02883487e320090d5e9e8c88feeff88
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Remove println

  Commit: a49231e0ca67f4ef018fbcb3129c84370d1c18a7
      https://github.com/zanata/zanata-server/commit/a49231e0ca67f4ef018fbcb3129c84370d1c18a7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  Remove superfluous logging of filter parameters

    The removed line was generating several lines of log output any time source
    document was uploaded and any non-pot translation file was downloaded.

  Commit: 63080aedd8985d6daa6510b5fccf9087ba80541e
      https://github.com/zanata/zanata-server/commit/63080aedd8985d6daa6510b5fccf9087ba80541e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java

  Log Message:
  -----------
  Check locales once

  Commit: 76d7a2124f2e3d15bc857b2a8fc1904dacfe836d
      https://github.com/zanata/zanata-server/commit/76d7a2124f2e3d15bc857b2a8fc1904dacfe836d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  Merge pull request #93 from zanata/stop-logging-params

Remove superfluous logging of filter parameters

  Commit: f98f7f59607976c6aaf84578cb8e40b84842b4a8
      https://github.com/zanata/zanata-server/commit/f98f7f59607976c6aaf84578cb8e40b84842b4a8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Use TMXParseException when uploaded TMX is invalid

  Commit: d6075e9d39bbca9c1d52b5d37c5b3a60616e3548
      https://github.com/zanata/zanata-server/commit/d6075e9d39bbca9c1d52b5d37c5b3a60616e3548
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Fix Application.xhtml to use JNDI for assets script, fix color overridden in editor options

  Commit: 11353ca9b705df716f3ca7a58d38cdce33d331bb
      https://github.com/zanata/zanata-server/commit/11353ca9b705df716f3ca7a58d38cdce33d331bb
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  Prevent upload and show error message if source upload filename has a semicolon.

    Zanata cannot accept files with a semicolon for upload due to a bug in
    seam taglib that causes filename truncation. This prevents the upload
    from the browser to avoid the confusing truncation behaviour.

  Commit: 9281e298ddc5d8bdf830afc6dff1a842f00e0dd5
      https://github.com/zanata/zanata-server/commit/9281e298ddc5d8bdf830afc6dff1a842f00e0dd5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Test with multiple prop elements

  Commit: 19c30e3bffab8c66447e9c84b968817693f9140f
      https://github.com/zanata/zanata-server/commit/19c30e3bffab8c66447e9c84b968817693f9140f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java

  Log Message:
  -----------
  Change names for clarity

  Commit: 6c06b160b33e8d69af641bfa53e368307d1fd70a
      https://github.com/zanata/zanata-server/commit/6c06b160b33e8d69af641bfa53e368307d1fd70a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java

  Log Message:
  -----------
  Organise imports

  Commit: e17e8a287dfb4c714d5a4d118fcfabc8a30ffbe6
      https://github.com/zanata/zanata-server/commit/e17e8a287dfb4c714d5a4d118fcfabc8a30ffbe6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  prevent unhandled exception when upload file has no extension

  Commit: 9a52b917166d099487a745f19daa31fdb0a538c3
      https://github.com/zanata/zanata-server/commit/9a52b917166d099487a745f19daa31fdb0a538c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java

  Log Message:
  -----------
  Add logging for TMX import/export

  Commit: 62a46eb297a9cdfd00639e00bdfff3988f96aad8
      https://github.com/zanata/zanata-server/commit/62a46eb297a9cdfd00639e00bdfff3988f96aad8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Add missing metadata to test data

  Commit: fad363d244a91b0021e1d17aa71cc1639ea5fa9b
      https://github.com/zanata/zanata-server/commit/fad363d244a91b0021e1d17aa71cc1639ea5fa9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

  Commit: dff60922d03fc6e95c32a76fde41651a3fb1172d
      https://github.com/zanata/zanata-server/commit/dff60922d03fc6e95c32a76fde41651a3fb1172d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #92 from zanata/transfileservice-test

Add some basic tests for TranslationFileServiceImpl

  Commit: ebc197c10c5ed2c2d159b4a2ef5a5e85776e208b
      https://github.com/zanata/zanata-server/commit/ebc197c10c5ed2c2d159b4a2ef5a5e85776e208b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into tmx-dashboard

  Commit: 58c8a251f12b5417fc6a6c525694b1fa262d6c13
      https://github.com/zanata/zanata-server/commit/58c8a251f12b5417fc6a6c525694b1fa262d6c13
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml

  Log Message:
  -----------
  Reduce dom element in workspace user view

  Commit: 2a3d77cc3d70cc0b029111428a6c81f8b247f6b6
      https://github.com/zanata/zanata-server/commit/2a3d77cc3d70cc0b029111428a6c81f8b247f6b6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  move error string to messages.properties

  Commit: 746e145803d0d6d99190dbb9d8173ff32a5ad153
      https://github.com/zanata/zanata-server/commit/746e145803d0d6d99190dbb9d8173ff32a5ad153
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog for clamav

  Commit: 4b541b8e4a79fc972cf6f80a106957a0a6f08123
      https://github.com/zanata/zanata-server/commit/4b541b8e4a79fc972cf6f80a106957a0a6f08123
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Refactor document status cache - update cache entry when tft updated event sent

  Commit: cf3faa34809c4a721cd162f844f26e1e15917050
      https://github.com/zanata/zanata-server/commit/cf3faa34809c4a721cd162f844f26e1e15917050
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

  Log Message:
  -----------
  Merge pull request #94 from zanata/stop-semicolon-upload

Prevent upload and show error message if source upload filename has a semicolon.

  Commit: 75af08a20727af32f3f233f22f94a8eb920e1589
      https://github.com/zanata/zanata-server/commit/75af08a20727af32f3f233f22f94a8eb920e1589
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/source_files.xhtml

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

  Commit: b3a6db91f38ce241631aaab5e963e362c3e43733
      https://github.com/zanata/zanata-server/commit/b3a6db91f38ce241631aaab5e963e362c3e43733
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java

  Log Message:
  -----------
  Remove reference to javaName

  Commit: 4176808289b4e6cbe45a45adf5f4c7e5f898a702
      https://github.com/zanata/zanata-server/commit/4176808289b4e6cbe45a45adf5f4c7e5f898a702
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Rename a variable, and invert if statement condition.

  Commit: 7691a6ac8902e54761f4d67c4f553bc005b9537e
      https://github.com/zanata/zanata-server/commit/7691a6ac8902e54761f4d67c4f553bc005b9537e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java

  Log Message:
  -----------
  Fix broken test

  Commit: 17b0fd7e8fd2c57c0fa9d12f6be55526c0e7d1e3
      https://github.com/zanata/zanata-server/commit/17b0fd7e8fd2c57c0fa9d12f6be55526c0e7d1e3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Log Message:
  -----------
  Change name to jobName

  Commit: a4d80bda5d1d8d565ce8211de411600ab79f1af6
      https://github.com/zanata/zanata-server/commit/a4d80bda5d1d8d565ce8211de411600ab79f1af6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Cleanup indexing classes a little

Rename clazz to entityType
Rename newScrollableResults to scrollableResults
Remove redundant Class parameter

  Commit: dfaba27f1d369250f67fcfe9dcbe94b52162b448
      https://github.com/zanata/zanata-server/commit/dfaba27f1d369250f67fcfe9dcbe94b52162b448
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java

  Log Message:
  -----------
  Refactor method based on review comments

  Commit: 611992740f240d71ea8af997d97f6d5cd899a619
      https://github.com/zanata/zanata-server/commit/611992740f240d71ea8af997d97f6d5cd899a619
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java

  Log Message:
  -----------
  Indent query string

  Commit: 6d0141bff6f730c93c2050a89e5d3ac6c0d11e2c
      https://github.com/zanata/zanata-server/commit/6d0141bff6f730c93c2050a89e5d3ac6c0d11e2c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Rename n to rowNum

  Commit: 2b5fc8582772063bd7b2d375abb07397790ff04b
      https://github.com/zanata/zanata-server/commit/2b5fc8582772063bd7b2d375abb07397790ff04b
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Merge pull request #98 from zanata/RefactorDocumentStatusCache

Refactor document status cache

  Commit: 2e1b75b21653a8817d10ec88dd7a126f83f33366
      https://github.com/zanata/zanata-server/commit/2e1b75b21653a8817d10ec88dd7a126f83f33366
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Update translation memory screen wording.

  Commit: 9f0d4c0b88a8bb23de714cd65f0b52036f39f81b
      https://github.com/zanata/zanata-server/commit/9f0d4c0b88a8bb23de714cd65f0b52036f39f81b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Restore disabled assertion for creationid attribute.

  Commit: 40fba3322f1a55836f08cea12c492f854793302e
      https://github.com/zanata/zanata-server/commit/40fba3322f1a55836f08cea12c492f854793302e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Rename parseDubiousTMX()

  Commit: 39fbd6d455cfc2d64f611f344feaad64701ddd79
      https://github.com/zanata/zanata-server/commit/39fbd6d455cfc2d64f611f344feaad64701ddd79
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  rhbz987707 - Replace outdated (and invalid) use of natural Id search.

Searching by a class that did not have a natural Id. Replaced with a criteria query.

  Commit: 7c3c6dc5b95920bcdba7577649613b30795d16b0
      https://github.com/zanata/zanata-server/commit/7c3c6dc5b95920bcdba7577649613b30795d16b0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Update based on review comments. (See below)

Update typo in one ofthe translation memory messages ('your').
Remove conditional display of clear button for translation memories.

  Commit: 8c2c43538e090f1d8801ee7fa3e6e8c681469a8c
      https://github.com/zanata/zanata-server/commit/8c2c43538e090f1d8801ee7fa3e6e8c681469a8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java

  Log Message:
  -----------
  Fix home page not refresh when content changes: https://bugzilla.redhat.com/show_bug.cgi?id=988162

  Commit: 99d2d483ccdbf9b40b99d0690ef6be6310d6693f
      https://github.com/zanata/zanata-server/commit/99d2d483ccdbf9b40b99d0690ef6be6310d6693f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #95 from zanata/stop-no-extension-npe

Prevent unhandled exception when upload file has no extension

  Commit: 8f703ac4a16c795a43ea4930da0cf592506bcf06
      https://github.com/zanata/zanata-server/commit/8f703ac4a16c795a43ea4930da0cf592506bcf06
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx

  Log Message:
  -----------
  Merge branch 'tm-import' into tmx-dashboard

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java

  Commit: 69fccc8880ca07ddcf00da56c3408be69e745672
      https://github.com/zanata/zanata-server/commit/69fccc8880ca07ddcf00da56c3408be69e745672
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css

  Log Message:
  -----------
  style newline rather than replace it with pilcrow character

  Commit: ef22a4bc13e21ffe103fcbeec2632a3c045d1607
      https://github.com/zanata/zanata-server/commit/ef22a4bc13e21ffe103fcbeec2632a3c045d1607
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    A functional-test/src/main/java/org/zanata/util/Checkbox.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java

  Commit: be8c4da45c11675a748a5db39772488991ff222d
      https://github.com/zanata/zanata-server/commit/be8c4da45c11675a748a5db39772488991ff222d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' into tmx-dashboard

  Commit: e9717d26d96269893f8fa25296402d30d590eea6
      https://github.com/zanata/zanata-server/commit/e9717d26d96269893f8fa25296402d30d590eea6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Disable randomly failing test.

This test should later be converted to an Arquillian test.

  Commit: e9e64835654fae362330fd6d0ecbb56ef8573f4d
      https://github.com/zanata/zanata-server/commit/e9e64835654fae362330fd6d0ecbb56ef8573f4d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    R zanata-model/src/main/java/org/zanata/model/SourceContents.java
    R zanata-model/src/main/java/org/zanata/model/TargetContents.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

  Log Message:
  -----------
  Merge pull request #101 from zanata/tmx-dashboard

Tmx Import & Dashboard

  Commit: 753448b58ff7bb7aceb87645fc1e9a5bc4061d1f
      https://github.com/zanata/zanata-server/commit/753448b58ff7bb7aceb87645fc1e9a5bc4061d1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    R zanata-model/src/main/java/org/zanata/model/SourceContents.java
    R zanata-model/src/main/java/org/zanata/model/TargetContents.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    R 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/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/ehcache.xml
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml

  Commit: 34b25dcf927ff5f34760a649f9df961a6799563b
      https://github.com/zanata/zanata-server/commit/34b25dcf927ff5f34760a649f9df961a6799563b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge pull request #99 from zanata/rhbz987707

rhbz987707 - Replace outdated (and invalid) use of natural Id search.

  Commit: 24f229bd4a41324a23b7364523ed5eb34a50cb79
      https://github.com/zanata/zanata-server/commit/24f229bd4a41324a23b7364523ed5eb34a50cb79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  Remove unnecessary spaces in line

  Commit: 9afebcd8ccfc6bfa1077e11905e10d7d8886dda7
      https://github.com/zanata/zanata-server/commit/9afebcd8ccfc6bfa1077e11905e10d7d8886dda7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css

  Log Message:
  -----------
  Merge pull request #102 from zanata/rhbz910642-pilcrow

Style newline rather than replace it with pilcrow character

  Commit: c06aa0ab4125a60868c6bd89fdaa69cfc888d09d
      https://github.com/zanata/zanata-server/commit/c06aa0ab4125a60868c6bd89fdaa69cfc888d09d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  Add an event listener that clears out a single configuration property when it's changed.

  Commit: be23c0b00fbdaf0f6333abed5becbdc5376e774a
      https://github.com/zanata/zanata-server/commit/be23c0b00fbdaf0f6333abed5becbdc5376e774a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    R zanata-model/src/main/java/org/zanata/model/SourceContents.java
    R zanata-model/src/main/java/org/zanata/model/TargetContents.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    R 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/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

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

Conflicts:
	zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Commit: 5552f8f720fdebc67275127499f0f29d5a5efeca
      https://github.com/zanata/zanata-server/commit/5552f8f720fdebc67275127499f0f29d5a5efeca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml

  Log Message:
  -----------
  Merge pull request #96 from zanata/RefactorWorkspaceUserView

Refactor workspace user view

  Commit: b64b63896012c581316e68b0cee3afd1815423a0
      https://github.com/zanata/zanata-server/commit/b64b63896012c581316e68b0cee3afd1815423a0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Change docStatus to invalidate entry when TU update

  Commit: 69d34fd262c6620cf187ca34968b28bc69413b54
      https://github.com/zanata/zanata-server/commit/69d34fd262c6620cf187ca34968b28bc69413b54
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  improve on TODO comment for invalidate documentStatus

  Commit: bc14ea9d82608762ca0e614413ffe2fd82febeaa
      https://github.com/zanata/zanata-server/commit/bc14ea9d82608762ca0e614413ffe2fd82febeaa
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  Merge pull request #100 from zanata/rhbz988162

Fix home page not refresh when content changes: https://bugzilla.redhat.com/show_bug.cgi?id=988162

  Commit: 3078393e0b0c102619ab1395b4a3cf6ce1341eff
      https://github.com/zanata/zanata-server/commit/3078393e0b0c102619ab1395b4a3cf6ce1341eff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  Implement redirect to dashboard after login (if its to redirect to home page), add 'Dashboard' link on top menu when user logged in

  Commit: 32c4bbb785ef38706fbce3607ef10a363ed6ac02
      https://github.com/zanata/zanata-server/commit/32c4bbb785ef38706fbce3607ef10a363ed6ac02
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml

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

  Commit: 63f0373fefe6e335d04b98deccaaf83520b016e7
      https://github.com/zanata/zanata-server/commit/63f0373fefe6e335d04b98deccaaf83520b016e7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java

  Log Message:
  -----------
  Update method comment to include 'dashboard' in the redirection

  Commit: b4ed242348790029b6048f83c81245f988926fec
      https://github.com/zanata/zanata-server/commit/b4ed242348790029b6048f83c81245f988926fec
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  Merge pull request #104 from zanata/fix_dashboard_redirection

Implement redirect to dashboard after login

  Commit: 0a1f16647b3b134f6d228fa4dba8c16d429284a7
      https://github.com/zanata/zanata-server/commit/0a1f16647b3b134f6d228fa4dba8c16d429284a7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #103 from zanata/InvalidateDocStatus

Change docStatus to invalidate entry when TU update

  Commit: 05243bf64464e89e1a4044e6afffb6328244928b
      https://github.com/zanata/zanata-server/commit/05243bf64464e89e1a4044e6afffb6328244928b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Map exception handler for failed file upload.

    There could be multiple causes for failed upload, so the best
    I can do for now is to append the exception message to a generic
    message. This is not ideal for localization, but is better than
    nothing and appears to be all that Seam will allow.

  Commit: 16cd4cf4aafb8b54c481f541fc322a94717c0252
      https://github.com/zanata/zanata-server/commit/16cd4cf4aafb8b54c481f541fc322a94717c0252
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Merge pull request #105 from zanata/map-upload-exception

Map exception handler for failed file upload.

  Commit: 05fb752644797436cb5f4ebc0577dd9577d181e9
      https://github.com/zanata/zanata-server/commit/05fb752644797436cb5f4ebc0577dd9577d181e9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  change problem reporting link on error page to mimic link in footer

    This is to show users what the button looks like, but the copy of the
    button is made to work so that users are not confused by trying to click
    an inert button.

  Commit: e5145222c374477dfa93fb0ec18c253be54680d5
      https://github.com/zanata/zanata-server/commit/e5145222c374477dfa93fb0ec18c253be54680d5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Remove inline style from error page report problem link.

  Commit: be36d87e795bb0b5401f8bb233de339d7927aba8
      https://github.com/zanata/zanata-server/commit/be36d87e795bb0b5401f8bb233de339d7927aba8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge pull request #106 from zanata/change-error-problem-link

change problem reporting link on error page to mimic link in footer

  Commit: 8ebb83004af8156e476adf90b2616d991bb40098
      https://github.com/zanata/zanata-server/commit/8ebb83004af8156e476adf90b2616d991bb40098
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Pull latest translation strings from server.

  Commit: 6746118767a7e277965af791072952ccf1a25fd8
      https://github.com/zanata/zanata-server/commit/6746118767a7e277965af791072952ccf1a25fd8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  rhbz990825 - Admin user list was not being fetched from configuration.

This was caused inadvertently when introducing JNDI configuration.

  Commit: 2560140fc3544b639753b6ab37b3abbdbab6af1f
      https://github.com/zanata/zanata-server/commit/2560140fc3544b639753b6ab37b3abbdbab6af1f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  rhbz990825 - Refactor code that fetches admin users.

Using guava "niceness" now.

  Commit: b69a52a1d117162b4d574a1e92f14db6c511a479
      https://github.com/zanata/zanata-server/commit/b69a52a1d117162b4d574a1e92f14db6c511a479
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  rhbz990825 - Change imports on ApplicationConfiguration.

  Commit: c1172b0f69beeffbd18b267b68d48c5b0460a598
      https://github.com/zanata/zanata-server/commit/c1172b0f69beeffbd18b267b68d48c5b0460a598
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  Merge pull request #108 from zanata/rhbz990825

rhbz990825 - Admin user list was not being fetched from configuration.

  Commit: 113b8d272b5ab6e423915e15b3dd7f659f68fcf2
      https://github.com/zanata/zanata-server/commit/113b8d272b5ab6e423915e15b3dd7f659f68fcf2
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java

  Log Message:
  -----------
  Canonicalize TM locales before storing them.

This makes TM matches available in cases where a TM file has languages in the form "en-us" while Zanata's internal representation has "en-US".

  Commit: 2fd962a50fbc6d68f67d02c36d9e9af33b35693f
      https://github.com/zanata/zanata-server/commit/2fd962a50fbc6d68f67d02c36d9e9af33b35693f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java

  Log Message:
  -----------
  Use StringTokenizer for locale canonicalization.

  Commit: 051abfa45a9abbb2340ef0094456d2c5dbcbc2b9
      https://github.com/zanata/zanata-server/commit/051abfa45a9abbb2340ef0094456d2c5dbcbc2b9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ko.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Merge pull request #107 from zanata/update-strings

Pull latest translation strings from server.

  Commit: 5d37eb25ad520008b918c4e0e3e4ee151e78a131
      https://github.com/zanata/zanata-server/commit/5d37eb25ad520008b918c4e0e3e4ee151e78a131
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java

  Log Message:
  -----------
  Merge pull request #109 from zanata/locale-canonicalization

Canonicalize TM locales before storing them.

  Commit: 027fa5d8b1836a3ba3f7f1313100828c9d4d6cfb
      https://github.com/zanata/zanata-server/commit/027fa5d8b1836a3ba3f7f1313100828c9d4d6cfb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Fix 'Last translated' column in version page with sorting feature

  Commit: d1e93c8bdff13e43a2beba1151aaf0b98aac3c32
      https://github.com/zanata/zanata-server/commit/d1e93c8bdff13e43a2beba1151aaf0b98aac3c32
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java

  Log Message:
  -----------
  Remove unused import in ProjectIterationFilesAction

  Commit: a243b3163168ab73dfb92d80a0de16e3fbbd4bfb
      https://github.com/zanata/zanata-server/commit/a243b3163168ab73dfb92d80a0de16e3fbbd4bfb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #111 from zanata/rhbz966334

Fix up 'Last translated' column sorting features in version page

  Commit: 7fc0b0c678d803fae3d9bc8eb893a9fabf79553c
      https://github.com/zanata/zanata-server/commit/7fc0b0c678d803fae3d9bc8eb893a9fabf79553c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java

  Log Message:
  -----------
  fix username validation error message: https://bugzilla.redhat.com/show_bug.cgi?id=977595

  Commit: 7f7d11650a569a3915fb247ecde834f397ceeadb
      https://github.com/zanata/zanata-server/commit/7f7d11650a569a3915fb247ecde834f397ceeadb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java

  Log Message:
  -----------
  Merge pull request #112 from zanata/rhbz977595

Fix username validation message in "Edit profile" page

  Commit: 05d8c5b0139453ad1913b7ccba92173924e87a76
      https://github.com/zanata/zanata-server/commit/05d8c5b0139453ad1913b7ccba92173924e87a76
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  Remove unnecessary activity warning log

  Commit: a79bebc17c3a6f215b3602298749d1686b0f596d
      https://github.com/zanata/zanata-server/commit/a79bebc17c3a6f215b3602298749d1686b0f596d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #113 from zanata/RemoveUnnecessaryWarning

Remove unnecessary activity warning log

  Commit: 9bea84d0b06059372769809e871a255c098c8e79
      https://github.com/zanata/zanata-server/commit/9bea84d0b06059372769809e871a255c098c8e79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Add empty string checking in dashboard page

  Commit: 5604c11afd1443d31c2b5604325ba83d89241c79
      https://github.com/zanata/zanata-server/commit/5604c11afd1443d31c2b5604325ba83d89241c79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  remove dashboard link from top menu - to side menu

  Commit: 8d8d4ed55821725ad41eadb735a68be5d0cf8cd1
      https://github.com/zanata/zanata-server/commit/8d8d4ed55821725ad41eadb735a68be5d0cf8cd1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  rhbz995910 - Change transaction successful event to immediate.

Because transactions are being handled manually, a transaction successful event will fail when raised.

  Commit: 5470bae2054efe010b19d146dce1432e76a4a1fd
      https://github.com/zanata/zanata-server/commit/5470bae2054efe010b19d146dce1432e76a4a1fd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Merge pull request #114 from zanata/DashboardNullChecking

Add empty string checking in dashboard page

  Commit: 09948e41431c9cb0d1abfd2b03406ddff63d6531
      https://github.com/zanata/zanata-server/commit/09948e41431c9cb0d1abfd2b03406ddff63d6531
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge pull request #115 from zanata/removedashboardlink

remove dashboard link from top menu - to side menu

  Commit: ee822942bc284050cabf6fb9b34d9115f27aa035
      https://github.com/zanata/zanata-server/commit/ee822942bc284050cabf6fb9b34d9115f27aa035
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  Improve error page - adding new style

  Commit: 1f078cfff91296d6fbbabe00006b2a3885137e0b
      https://github.com/zanata/zanata-server/commit/1f078cfff91296d6fbbabe00006b2a3885137e0b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/empty.txt
    A zanata-war/src/test/resources/tmx/invalid.txt
    A zanata-war/src/test/resources/tmx/invalid.xhtml
    A zanata-war/src/test/resources/tmx/invalid.xml

  Log Message:
  -----------
  Add better error checking when importing invalid TMX files

  Commit: 03c448c3c59f1492d7896ceb5cba113e97be22a0
      https://github.com/zanata/zanata-server/commit/03c448c3c59f1492d7896ceb5cba113e97be22a0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #117 from zanata/ImproveErrorPage

Improve error page - adding new style

  Commit: 5871c639bcc47218a6690c6dbaf1d4463b860a13
      https://github.com/zanata/zanata-server/commit/5871c639bcc47218a6690c6dbaf1d4463b860a13
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #116 from zanata/rhbz995910

rhbz995910 - Change transaction successful event to immediate.

  Commit: eefd6fd899c7572272f21cdb8cea99bc853cdaeb
      https://github.com/zanata/zanata-server/commit/eefd6fd899c7572272f21cdb8cea99bc853cdaeb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/empty.txt
    A zanata-war/src/test/resources/tmx/invalid.txt
    A zanata-war/src/test/resources/tmx/invalid.xhtml
    A zanata-war/src/test/resources/tmx/invalid.xml

  Log Message:
  -----------
  Merge pull request #118 from zanata/handle-invalid-tmx

rhbz995909 Add better error checking when importing invalid TMX files

  Commit: 32821c255a8aee384a6948063c0b1dcd3452a378
      https://github.com/zanata/zanata-server/commit/32821c255a8aee384a6948063c0b1dcd3452a378
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Fix on error page display section

  Commit: 75ccfffbc0bab9f924b4f1f94ccae46862f5a008
      https://github.com/zanata/zanata-server/commit/75ccfffbc0bab9f924b4f1f94ccae46862f5a008
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/error.xhtml

  Log Message:
  -----------
  Merge pull request #119 from zanata/errorpagefix

Fix on error page display section

  Commit: 5eeb1faedc6a8b5885e7a5be95e7352cdd021aa8
      https://github.com/zanata/zanata-server/commit/5eeb1faedc6a8b5885e7a5be95e7352cdd021aa8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Fix functional test on dashboard and homepage

  Commit: 92eae5e4eb837990d0739ecabffa242f8bc0ca49
      https://github.com/zanata/zanata-server/commit/92eae5e4eb837990d0739ecabffa242f8bc0ca49
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Implement new avatar icon - top right menu

  Commit: b5fc9c80ce67c71a2bfa44fcb2203dc5134a1b19
      https://github.com/zanata/zanata-server/commit/b5fc9c80ce67c71a2bfa44fcb2203dc5134a1b19
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge pull request #121 from zanata/NewAvatarMenu

Implement new avatar icon - top right menu

  Commit: 33df9529f8bddd752c45ec8a70110deecec5793d
      https://github.com/zanata/zanata-server/commit/33df9529f8bddd752c45ec8a70110deecec5793d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml

  Log Message:
  -----------
  fix dashboard function test

  Commit: 86db25acfd1445f910ba31e8b27677824cbf318c
      https://github.com/zanata/zanata-server/commit/86db25acfd1445f910ba31e8b27677824cbf318c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  rhbz995964 - Delete Trans Memories asynchronously.

This is to prevent the container from cancelling long transactions while deleting large TMs. Also, the database might lock the table for too long.

  Commit: 35d71755f0708c4b52d78e1982881f4a42d9071f
      https://github.com/zanata/zanata-server/commit/35d71755f0708c4b52d78e1982881f4a42d9071f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Minor fix on text and tooltip in dashboard page

  Commit: 54414f45fe323833b8490124b5cea2ab271d06ba
      https://github.com/zanata/zanata-server/commit/54414f45fe323833b8490124b5cea2ab271d06ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge pull request #122 from zanata/async-tm-delete

rhbz995964 - Delete Trans Memories asynchronously.

  Commit: 44af1946b0cea21a7645a857e0b47693d0905e3d
      https://github.com/zanata/zanata-server/commit/44af1946b0cea21a7645a857e0b47693d0905e3d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge commit '54414f45fe323833b8490124b5cea2ab271d06ba' into HEAD

  Commit: 911fc28bc18987d2258e4bc6d4e09e256a14fc13
      https://github.com/zanata/zanata-server/commit/911fc28bc18987d2258e4bc6d4e09e256a14fc13
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update module versions

  Commit: 6f28d2931e371fcdc19a71b37f5316e980295a34
      https://github.com/zanata/zanata-server/commit/6f28d2931e371fcdc19a71b37f5316e980295a34
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #124 from zanata/update-modules

Update module versions

  Commit: 89dea767540ba70bcfe23b7235b3ed00588d187c
      https://github.com/zanata/zanata-server/commit/89dea767540ba70bcfe23b7235b3ed00588d187c
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge commit '6f28d2931e371fcdc19a71b37f5316e980295a34' into HEAD

  Commit: a2a1cc168eb124abbed111ee91322d17fb494970
      https://github.com/zanata/zanata-server/commit/a2a1cc168eb124abbed111ee91322d17fb494970
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml

  Log Message:
  -----------
  Merge pull request #120 from zanata/fixFunctionTest

Fix functional test on dashboard and homepage

  Commit: 0a63c7fcdc0e6332aecad7054bab814901b2ac16
      https://github.com/zanata/zanata-server/commit/0a63c7fcdc0e6332aecad7054bab814901b2ac16
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Merge pull request #123 from zanata/fixOnDashboard

Minor fix on text and tooltip in dashboard page

  Commit: 01cdc67bf148ec76dfdf36948a675c073d8a73cc
      https://github.com/zanata/zanata-server/commit/01cdc67bf148ec76dfdf36948a675c073d8a73cc
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Merge commit '0a63c7fcdc0e6332aecad7054bab814901b2ac16' into HEAD

  Commit: 09da677b39afdc3784daf2a37b5ffef2ae5955f5
      https://github.com/zanata/zanata-server/commit/09da677b39afdc3784daf2a37b5ffef2ae5955f5
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml

  Log Message:
  -----------
  Fix kerberos authentication.

The latest changes for authentication require the kerberos module to have a static name. For now, this name is 'zanata.kerberos' as it stands on the wiki. This should be changed for future releases.

  Commit: 1e28618079199db9fd012f52f1b659ef47610eb2
      https://github.com/zanata/zanata-server/commit/1e28618079199db9fd012f52f1b659ef47610eb2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml

  Log Message:
  -----------
  Merge commit '09da677b39afdc3784daf2a37b5ffef2ae5955f5' into HEAD

  Commit: f3311712d602adbf1db756a69a0ec7f4200c105c
      https://github.com/zanata/zanata-server/commit/f3311712d602adbf1db756a69a0ec7f4200c105c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml

  Log Message:
  -----------
  Use non-seam instance of JndiBackedConfig when authenticating via kerberos.

When kerberos authentication happens there is no Seam context available causing the process to fail.
Also revert previous commit which fixed kerberos authentication but broke other authentication mechanisms.

  Commit: c75fbd06f35f45e1adb99b8fb4c4e31460b78027
      https://github.com/zanata/zanata-server/commit/c75fbd06f35f45e1adb99b8fb4c4e31460b78027
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml

  Log Message:
  -----------
  Merge pull request #125 from zanata/kerberos-fix

Use non-seam instance of JndiBackedConfig when authenticating via kerber...

  Commit: 6ee47918a95d8e34e3438b266b918a2f9d022433
      https://github.com/zanata/zanata-server/commit/6ee47918a95d8e34e3438b266b918a2f9d022433
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml

  Log Message:
  -----------
  Merge commit 'c75fbd06f35f45e1adb99b8fb4c4e31460b78027' into HEAD

  Commit: 73a449cb3ea4a17ced70acf737254228ab6a6397
      https://github.com/zanata/zanata-server/commit/73a449cb3ea4a17ced70acf737254228ab6a6397
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Counteract changes to maven-release-plugin

  Commit: 9277dca8562453b971bf78e7317223ef790075f0
      https://github.com/zanata/zanata-server/commit/9277dca8562453b971bf78e7317223ef790075f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Disable gpg signing (inherited from oss-parent)

  Commit: 50fd485092a9eaaca1e10af11edd1fd28c64593d
      https://github.com/zanata/zanata-server/commit/50fd485092a9eaaca1e10af11edd1fd28c64593d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.0

  Commit: 7a4dcf99de9ddabcbe150f721f6f67d28c63fcb1
      https://github.com/zanata/zanata-server/commit/7a4dcf99de9ddabcbe150f721f6f67d28c63fcb1
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 518ba6cccc7701bc316bbc9d49e0b5822e44e7b8
      https://github.com/zanata/zanata-server/commit/518ba6cccc7701bc316bbc9d49e0b5822e44e7b8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge commit '7a4dcf99de9ddabcbe150f721f6f67d28c63fcb1' into HEAD

  Commit: aac6aa6b5b10eff927fbdb45ab9631e8d3866556
      https://github.com/zanata/zanata-server/commit/aac6aa6b5b10eff927fbdb45ab9631e8d3866556
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Implement fix for activity log: https://bugzilla.redhat.com/show_bug.cgi?id=996377
- Update activity target when update entry
- Dashboard page requires login from user
- Fix up translation document upload activity string - incorrect "Finishing on..." was displayed

  Commit: 5e6baa3b1781405f4820c9934425e5c4d281c427
      https://github.com/zanata/zanata-server/commit/5e6baa3b1781405f4820c9934425e5c4d281c427
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  - Remove 'dashboard' from left side menu
- Increase left side menu icon size

  Commit: 53a4583f8c86aaecb8a36ecc09ce66c868f7f324
      https://github.com/zanata/zanata-server/commit/53a4583f8c86aaecb8a36ecc09ce66c868f7f324
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java

  Log Message:
  -----------
  Add @Restrict in dashboard related action class

  Commit: 211cd4c684b96f2fbd23631dc498e2d1e3ca5808
      https://github.com/zanata/zanata-server/commit/211cd4c684b96f2fbd23631dc498e2d1e3ca5808
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  Merge pull request #128 from zanata/MinorUiChange

Minor UI change

  Commit: 96af233212edd46300c5e0d5814cd00c33a5620e
      https://github.com/zanata/zanata-server/commit/96af233212edd46300c5e0d5814cd00c33a5620e
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Merge pull request #127 from zanata/rhbz996377

Implement fix for activity log: https://bugzilla.redhat.com/show_bug.cgi?id=996377

  Commit: 60a95cf0d1ffe34abc0edb71c56d5c3812803047
      https://github.com/zanata/zanata-server/commit/60a95cf0d1ffe34abc0edb71c56d5c3812803047
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.1

  Commit: 21666add5b2a709df3e4594afec44ccd824174b4
      https://github.com/zanata/zanata-server/commit/21666add5b2a709df3e4594afec44ccd824174b4
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 973f6e55f477f2999e453229f266c7854bdf0373
      https://github.com/zanata/zanata-server/commit/973f6e55f477f2999e453229f266c7854bdf0373
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  rhbz995964 - Fix issue with the clearing of large TMs.

Reduce the batch size to a smaller size.
USe the correct method when setting up TU batches to clear.

  Commit: 344357ba52dd23c21cb59649b3b0ae7c414ead63
      https://github.com/zanata/zanata-server/commit/344357ba52dd23c21cb59649b3b0ae7c414ead63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  Merge pull request #129 from zanata/tm-clear-fix

rhbz995964 - Fix issue with the clearing of large TMs.

  Commit: ee98166d27b31008ce7fdd8fbd1949c0d2407b67
      https://github.com/zanata/zanata-server/commit/ee98166d27b31008ce7fdd8fbd1949c0d2407b67
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp/resources/richext/spacer.xhtml

  Log Message:
  -----------
  Normalize line endings

  Commit: 936b0392745b242d649356a300415e434dfa2ec2
      https://github.com/zanata/zanata-server/commit/936b0392745b242d649356a300415e434dfa2ec2
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Fixed the untraslated color in the editor, which was too dark.

  Commit: 6e63446fbcaa702bbe8982587909f80fdb7f78a1
      https://github.com/zanata/zanata-server/commit/6e63446fbcaa702bbe8982587909f80fdb7f78a1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Merge pull request #131 from zanata/update-untranslated-color

Fixed the untraslated color in the editor, which was too dark.

  Commit: 3b4f1732e1dfcfc2965703081bb9a2139f2f3b2b
      https://github.com/zanata/zanata-server/commit/3b4f1732e1dfcfc2965703081bb9a2139f2f3b2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Update sign up and login button

  Commit: 78afafcedc492dbbbdead971f566cc30733971ee
      https://github.com/zanata/zanata-server/commit/78afafcedc492dbbbdead971f566cc30733971ee
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge pull request #132 from zanata/bannerChange

Update sign up and login button

  Commit: 3b8f40d75b8b597bfc5bc15b1f924264154c52ae
      https://github.com/zanata/zanata-server/commit/3b8f40d75b8b597bfc5bc15b1f924264154c52ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/LockManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java

  Log Message:
  -----------
  Record username when locking, report username when already locked

  Commit: 856da7dda6642e44784a7e17fe2a7734b1506c2a
      https://github.com/zanata/zanata-server/commit/856da7dda6642e44784a7e17fe2a7734b1506c2a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

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

  Log Message:
  -----------
  Allow individual ProcessHandles to be removed

  Commit: 831126fca8005b08381b212b463979e2a44c5119
      https://github.com/zanata/zanata-server/commit/831126fca8005b08381b212b463979e2a44c5119
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  rhbz996939 Check lock when uploading/clearing TM, report lock errors in web UI

  Commit: b2fb2646a343139539265f886bf54efb4c2a97b1
      https://github.com/zanata/zanata-server/commit/b2fb2646a343139539265f886bf54efb4c2a97b1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Ensure TM table is refreshed when last TM is deleted

  Commit: 6fdf99fb599104c6379b176f444d19df57a4e058
      https://github.com/zanata/zanata-server/commit/6fdf99fb599104c6379b176f444d19df57a4e058
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Fix creation of TMs

  Commit: 2c0643ac37b0ee7f1506885645e89cca85de3d54
      https://github.com/zanata/zanata-server/commit/2c0643ac37b0ee7f1506885645e89cca85de3d54
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Remove unnecessary Restrict

  Commit: de6c0eacfa025d20cb3e3a330f18996635125da5
      https://github.com/zanata/zanata-server/commit/de6c0eacfa025d20cb3e3a330f18996635125da5
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/service/LockManagerService.java
    M zanata-war/src/main/java/org/zanata/service/ProcessManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge pull request #134 from zanata/lock-tm

rhbz996939 Check lock when uploading/clearing TM, report lock errors

  Commit: a76ce1c38a6db839789db8486729d6d8318134a1
      https://github.com/zanata/zanata-server/commit/a76ce1c38a6db839789db8486729d6d8318134a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update module versions

  Commit: ed13e683f1b339aa56acead1852d87bb09120f2d
      https://github.com/zanata/zanata-server/commit/ed13e683f1b339aa56acead1852d87bb09120f2d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.2

  Commit: d19ee6cdd087b5194f16e6ca8eafd13c68c4b4f3
      https://github.com/zanata/zanata-server/commit/d19ee6cdd087b5194f16e6ca8eafd13c68c4b4f3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 6640b7c2394915d660cb40ef165d76dc77256f1f
      https://github.com/zanata/zanata-server/commit/6640b7c2394915d660cb40ef165d76dc77256f1f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  rhbz1000196 - Prevent copy trans from reusing translations from obsolete documents, iterations and projects.

  Commit: dace028cdb41d347e9e659a632432bc4d3c84185
      https://github.com/zanata/zanata-server/commit/dace028cdb41d347e9e659a632432bc4d3c84185
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

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

  Log Message:
  -----------
  rhbz1000237 - Make sure unwanted copy trans results are discarded.

  Commit: 52a8f9b777291c8e5745a9850d927a7ee2678c8e
      https://github.com/zanata/zanata-server/commit/52a8f9b777291c8e5745a9850d927a7ee2678c8e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #149 from zanata/rhbz1000237

rhbz1000237 - Make sure unwanted copy trans results are discarded.

  Commit: 4c2828792812abd27cc822207b6ce253b4a70f49
      https://github.com/zanata/zanata-server/commit/4c2828792812abd27cc822207b6ce253b4a70f49
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Implement url fix in version-group page: https://bugzilla.redhat.com/show_bug.cgi?id=1003451

  Commit: 7e1d78aa7b9f4f39cb01458aa607b94a6eddbde5
      https://github.com/zanata/zanata-server/commit/7e1d78aa7b9f4f39cb01458aa607b94a6eddbde5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  Add function test for version group page link

  Commit: ee535a66dbe3dd94a81202df5a5f6c682040744a
      https://github.com/zanata/zanata-server/commit/ee535a66dbe3dd94a81202df5a5f6c682040744a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #153 from zanata/rhbz1003451

Fix wrong project and version url generated in version-group page. https://bugzilla.redhat.com/show_bug.cgi?id=1003451

  Commit: 2e832be3ee62f44e2c97c45f33443ce888163d68
      https://github.com/zanata/zanata-server/commit/2e832be3ee62f44e2c97c45f33443ce888163d68
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  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/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Refactor Copy Trans to be more testable.

Correct a previously inserted bug where translations from obsolete documents where not being reused.
Refactor Copy trans to be more functional and thus testable.
Add some tests to test these discrete pieces.

  Commit: 28321027a6907da2ed059d2391b2997081921e36
      https://github.com/zanata/zanata-server/commit/28321027a6907da2ed059d2391b2997081921e36
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Rename ResultActionPair to MatchRulePair.

  Commit: d1dae05e6c647eb12506773b0cb5bc5b403fc2e4
      https://github.com/zanata/zanata-server/commit/d1dae05e6c647eb12506773b0cb5bc5b403fc2e4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

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

  Log Message:
  -----------
  Code review changes (See below).

Refactor method to use ternary operator.
Assume a non-nullable argument in copy trans internal method.

  Commit: 3512081da1f4ba861f77313cc855161d12474248
      https://github.com/zanata/zanata-server/commit/3512081da1f4ba861f77313cc855161d12474248
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

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

  Log Message:
  -----------
  Refactor internal MatchRulePair class.

  Commit: da8e36ad77d9bc2b8aebe681dbd7bbd16d6b7849
      https://github.com/zanata/zanata-server/commit/da8e36ad77d9bc2b8aebe681dbd7bbd16d6b7849
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/SlowTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Add @SlowTest annotation.

For now just a marker interface to identify potentially slow running tests.

  Commit: 3d0f8bd97f49b4ed804ee21e5f786c446270ebdc
      https://github.com/zanata/zanata-server/commit/3d0f8bd97f49b4ed804ee21e5f786c446270ebdc
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/SlowTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Change @SlowTest to be a method level annotation.

  Commit: 6166bea7a1a6ca06f8b9fffd99619662079ddc6d
      https://github.com/zanata/zanata-server/commit/6166bea7a1a6ca06f8b9fffd99619662079ddc6d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  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
    A zanata-war/src/test/java/org/zanata/SlowTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #154 from zanata/copy-trans-changes

Refactor Copy Trans to be more testable.

  Commit: 57f8743af6544eef197473f3efaf4826f0a35a07
      https://github.com/zanata/zanata-server/commit/57f8743af6544eef197473f3efaf4826f0a35a07
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/webapp/profile/edit.xhtml

  Log Message:
  -----------
  rhbz1002340 - verify username availability in first openid log in

  Commit: dbd196f54c13a086fe0cf44700137d08b4fd6d02
      https://github.com/zanata/zanata-server/commit/dbd196f54c13a086fe0cf44700137d08b4fd6d02
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  rhbz1007106 - Correct error when signing up with open where the open id username is the same as an existing Zanata user name.

Also remove some default values for username and email when using open id as they might be invalid.

  Commit: 970b0a953d4820ddf75774a916818c80874d1aaa
      https://github.com/zanata/zanata-server/commit/970b0a953d4820ddf75774a916818c80874d1aaa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/webapp/profile/edit.xhtml

  Log Message:
  -----------
  rhbz1002340 - prevent ajax race condition

  Commit: eca252f1c29a665339829d013b45997a0c399ff0
      https://github.com/zanata/zanata-server/commit/eca252f1c29a665339829d013b45997a0c399ff0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Merge pull request #178 from zanata/rhbz1007106

rhbz1007106 - Correct error when signing up with open where the open id username is the same as an existing Zanata user name.

  Commit: 1763e36d8d62baa657b69420f344be0693d3b2b8
      https://github.com/zanata/zanata-server/commit/1763e36d8d62baa657b69420f344be0693d3b2b8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  Fix sign in for OpenID enabled server.

The functional test Zanata server has OpenID and internal auth
enabled, which changes the login process. Basic internal
sign in still only available.
TODO: Tests for OpenID login.
(cherry picked from commit d62f98db687c961b6c46e7f03918cfaa0bba1240)

Conflicts:

	zanata-war/src/main/webapp/account/login.xhtml

  Commit: 0c410dfa873da3e47d2ae1031458e695b9010a1f
      https://github.com/zanata/zanata-server/commit/0c410dfa873da3e47d2ae1031458e695b9010a1f
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.3

  Commit: 488cf049853b5a5d7260d67b0705d8f78804ded5
      https://github.com/zanata/zanata-server/commit/488cf049853b5a5d7260d67b0705d8f78804ded5
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

Compare: https://github.com/zanata/zanata-server/compare/01e59540151e...488cf049853b