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

Tue Oct 2 06:20:41 UTC 2012

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

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

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

  Commit: 918000793db504028b5e71f31d7753a05443253b
      https://github.com/zanata/zanata/commit/918000793db504028b5e71f31d7753a05443253b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    A zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    A zanata-war/src/main/java/org/zanata/exception/HashMismatchException.java
    M zanata-war/src/main/java/org/zanata/rest/files/DocumentFileUploadForm.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  add part-file upload support for raw source document upload

  Commit: a53e220dba6922da0f20eac916563eed728abcdd
      https://github.com/zanata/zanata/commit/a53e220dba6922da0f20eac916563eed728abcdd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

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

  Log Message:
  -----------
  add part-file upload support for raw translation document upload

  Commit: eafecd8fc8867ac27700ce6c383f956b2775d627
      https://github.com/zanata/zanata/commit/eafecd8fc8867ac27700ce6c383f956b2775d627
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

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

  Log Message:
  -----------
  TransMemoryPresenter unit test

  Commit: a65f9b23ad856dcbbf7c999950c3a0b97df39536
      https://github.com/zanata/zanata/commit/a65f9b23ad856dcbbf7c999950c3a0b97df39536
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.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/TranslationPresenter.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/TranslationPresenterTest.java

  Log Message:
  -----------
  fully unit test of TranslationPresenter

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

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

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

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

  Commit: facd9a2ca21f2c6e51eca9db2db0df0b5d7a9fab
      https://github.com/zanata/zanata/commit/facd9a2ca21f2c6e51eca9db2db0df0b5d7a9fab
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.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/GlossaryDetailsPresenterTest.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/TranslationEditorPresenterTest.java

  Log Message:
  -----------
  unit test

  Commit: ceb783916e6ed8fc3241595e9c9702e5fc792cfd
      https://github.com/zanata/zanata/commit/ceb783916e6ed8fc3241595e9c9702e5fc792cfd
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Implement statistic options in project version page

  Commit: 47bf91e097e1ac352fde889d816c46042692aeee
      https://github.com/zanata/zanata/commit/47bf91e097e1ac352fde889d816c46042692aeee
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.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/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/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.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/TargetContentsPresenterTest.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/TransMemoryPresenterTest.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/TranslationPresenterTest.java

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

  Commit: 2c6c1ae24b76f89d519ef853c83972e737c18f6a
      https://github.com/zanata/zanata/commit/2c6c1ae24b76f89d519ef853c83972e737c18f6a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

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

  Log Message:
  -----------
  minor

  Commit: 334c944f2305c06e49c41b3277b193d9ef993260
      https://github.com/zanata/zanata/commit/334c944f2305c06e49c41b3277b193d9ef993260
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    A zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java

  Log Message:
  -----------
  cobertura exclusion and unit test

  Commit: b212fc16eceb71f361154ed7cae5321a5f9e2816
      https://github.com/zanata/zanata/commit/b212fc16eceb71f361154ed7cae5321a5f9e2816
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Fix problem with caching in statistic option in project version page: https://bugzilla.redhat.com/show_bug.cgi?id=836935

  Commit: c856b7c6ddc9b949cdff2110437cdb4c0afcd1b8
      https://github.com/zanata/zanata/commit/c856b7c6ddc9b949cdff2110437cdb4c0afcd1b8
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    A zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

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

  Commit: 01a42489bcbbc78542ea3a50f6121bf30377744d
      https://github.com/zanata/zanata/commit/01a42489bcbbc78542ea3a50f6121bf30377744d
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

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

  Log Message:
  -----------
  -

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

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

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

Also disable automatic copy trans when pushing a document.

  Commit: 51c2b431cbe44ed89d9ddf5d984490ca968ce92f
      https://github.com/zanata/zanata/commit/51c2b431cbe44ed89d9ddf5d984490ca968ce92f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/util/FindByTransUnitIdPredicate.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  TargetContentsPresenter unit test

  Commit: 125fdfe34196f6b2664fa50c28895468e42a0369
      https://github.com/zanata/zanata/commit/125fdfe34196f6b2664fa50c28895468e42a0369
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

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

  Commit: 37932a50fba3d4d57999950feb93a22279f666b5
      https://github.com/zanata/zanata/commit/37932a50fba3d4d57999950feb93a22279f666b5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeHandler.java
    A 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/TransUnitNavigationPresenter.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/TransUnitNavigationPresenterTest.java

  Log Message:
  -----------
  refactor TargetContentsPresenter and move all key shortcut stuff out to EditorKeyShortcuts

  Commit: 249627dc53356c867f7b3d35909b71f384fcefb7
      https://github.com/zanata/zanata/commit/249627dc53356c867f7b3d35909b71f384fcefb7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

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

  Log Message:
  -----------
  turn log off in testing

  Commit: 65a3c87a84fb1a3862827daa613490426bb757f9
      https://github.com/zanata/zanata/commit/65a3c87a84fb1a3862827daa613490426bb757f9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java

  Log Message:
  -----------
  EditorKeyShortcuts unit test

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

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

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

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

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

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

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

  Commit: 2d1d0cb4a87a4ed66e362a8dac5e19349fe480b5
      https://github.com/zanata/zanata/commit/2d1d0cb4a87a4ed66e362a8dac5e19349fe480b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml

  Log Message:
  -----------
  Fix enter key closes add maintainer dialog instead of search: https://bugzilla.redhat.com/show_bug.cgi?id=854076

  Commit: ca75637469911e51bab0560919a7f96871a2af8c
      https://github.com/zanata/zanata/commit/ca75637469911e51bab0560919a7f96871a2af8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

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

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

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java

  Log Message:
  -----------
  rhbz837979 - Change default enabled locales for projects and versions.

The default selected locales when overriding only include the "enabled by default" ones. The others will not be selected but available for selection.

  Commit: f963a0a4bf7579b7da87619ff460ac5a8814963a
      https://github.com/zanata/zanata/commit/f963a0a4bf7579b7da87619ff460ac5a8814963a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

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

  Log Message:
  -----------
  disable enter key in filtering box to avoid invalid url being generate: https://bugzilla.redhat.com/show_bug.cgi?id=858116

  Commit: 24f21cbc7104006d15f5cd8496fbe79d34958482
      https://github.com/zanata/zanata/commit/24f21cbc7104006d15f5cd8496fbe79d34958482
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java

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

  Commit: e4142c4a83482e7e9f517900d6c8a9e1bb44b8e5
      https://github.com/zanata/zanata/commit/e4142c4a83482e7e9f517900d6c8a9e1bb44b8e5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M pom.xml
    A zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    A zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/exception/HashMismatchException.java
    M zanata-war/src/main/java/org/zanata/rest/files/DocumentFileUploadForm.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.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/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/TransUnitNavigationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/util/FindByTransUnitIdPredicate.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    A zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.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/NotificationPresenterTest.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
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.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/TranslationPresenterTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

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

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

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

  Log Message:
  -----------
  Update UrlRewrite filter version to 4.0.3

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

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

  Log Message:
  -----------
  Add default values for the origin email address.

This is needed for new instances of Zanata.

  Commit: 6a2ba1ff7c79f8b4a786fa6943b39a16e1fe8271
      https://github.com/zanata/zanata/commit/6a2ba1ff7c79f8b4a786fa6943b39a16e1fe8271
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  cobertura exclusion

  Commit: 8f1b43b3320b9dfa6cb5bec80372a5b0733e2f49
      https://github.com/zanata/zanata/commit/8f1b43b3320b9dfa6cb5bec80372a5b0733e2f49
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/TranslationPresenter.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  unit test

  Commit: a53ca83d500139db24d43c69c79d259948b266af
      https://github.com/zanata/zanata/commit/a53ca83d500139db24d43c69c79d259948b266af
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  fix duplicate apperance of concurrent translators

  Commit: 71cff54bf3dfa25312914439eb7dddbf715c83a7
      https://github.com/zanata/zanata/commit/71cff54bf3dfa25312914439eb7dddbf715c83a7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java

  Log Message:
  -----------
  Fix issue: concurrent translator list out of sync with current users list

- UserSessionService should be the only class responsible of updating the session map
- After UserSessionService updates the map, it need to let TargetContentsPresenter and WorkspaceUsersPresenter to update their views to reflect the new users list

  Commit: aed6918571a4f6f9bce2af87b104c613f6784671
      https://github.com/zanata/zanata/commit/aed6918571a4f6f9bce2af87b104c613f6784671
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.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/ui/table/column/RemainingHoursColumn.java

  Log Message:
  -----------
  Fix remaining hours label by using words unit

  Commit: 8359fa1383fc2de0fb623ac1b6fb9588d253641c
      https://github.com/zanata/zanata/commit/8359fa1383fc2de0fb623ac1b6fb9588d253641c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  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/webtrans/client/EventProcessor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.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/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.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/WorkspaceUsersPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java

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

  Commit: 64e678903c7b0c35dbdd40a281ab47392cec9056
      https://github.com/zanata/zanata/commit/64e678903c7b0c35dbdd40a281ab47392cec9056
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  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/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.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/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.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/ui/table/column/RemainingHoursColumn.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.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/WorkspaceUsersPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java

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

  Commit: 292e7a6e5d3c693b82be0032f19e3ffe59750b6d
      https://github.com/zanata/zanata/commit/292e7a6e5d3c693b82be0032f19e3ffe59750b6d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    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

  Commit: e42c959c76ac39c816f58f8d9c7515e829857c98
      https://github.com/zanata/zanata/commit/e42c959c76ac39c816f58f8d9c7515e829857c98
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    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:
  -----------
  Merge branch 'integration/master' into rhbz828629

  Commit: a1864932f2bbdb12f96fbee29b3b455a5959a148
      https://github.com/zanata/zanata/commit/a1864932f2bbdb12f96fbee29b3b455a5959a148
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

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

  Log Message:
  -----------
  Make loadingPanel singleton to avoid conflict in search and editor

Compare: https://github.com/zanata/zanata/compare/ae6e32ff7b77...a1864932f2bb