[zanata/zanata] 6fb0e9: work in progress - prefill

Tue Jul 3 03:14:22 UTC 2012

  Branch: refs/heads/search-replace
  Home:   https://github.com/zanata/zanata
  Commit: 6fb0e90ff5206287a40ab69a066a390b59a534b1
      https://github.com/zanata/zanata/commit/6fb0e90ff5206287a40ab69a066a390b59a534b1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
    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

  Log Message:
  -----------
  work in progress - prefill

  Commit: f240af3d0a63eaece2f387f61620eb175310b00a
      https://github.com/zanata/zanata/commit/f240af3d0a63eaece2f387f61620eb175310b00a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/ProjectsPage.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/TransMemoryPresenter.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/PrefillPopupPanelView.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/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NoOpResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEdit.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  refactor GetTransMemoryHandler and a few others

  Commit: 36c2405d1890693d3e29eacdccde6d4963a972f8
      https://github.com/zanata/zanata/commit/36c2405d1890693d3e29eacdccde6d4963a972f8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java

  Log Message:
  -----------
  work in progress - prefill from TM rpc

  Commit: feb4676824600b888068555a7050668b3bda76c0
      https://github.com/zanata/zanata/commit/feb4676824600b888068555a7050668b3bda76c0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    A zanata-war/src/main/java/org/zanata/exception/KeyNotFoundException.java
    R zanata-war/src/main/java/org/zanata/security/KeyNotFoundException.java
    A zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.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/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  new SecurityService for checking translation permission

  Commit: 2a13e73c30055c86b28ced9be7f460bfd83f70fd
      https://github.com/zanata/zanata/commit/2a13e73c30055c86b28ced9be7f460bfd83f70fd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/PrefillPresenter.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/PrefillTranslationHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  work in progress - TextFlowDAO for prefill and other refactoring

  Commit: 26d97e1a0bf2a246dd323ad95cc700db34601efc
      https://github.com/zanata/zanata/commit/26d97e1a0bf2a246dd323ad95cc700db34601efc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/PrefillPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NoOpResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  work in progress - getting TextFlowDAO to work

  Commit: cf4427471b485a38c845bae1470386c8f8ef0946
      https://github.com/zanata/zanata/commit/cf4427471b485a38c845bae1470386c8f8ef0946
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java

  Log Message:
  -----------
  TextFlowDAO get untranslated text flow working

  Commit: 00e7d579e531bf9d04b027f1d2a131b0724b3a79
      https://github.com/zanata/zanata/commit/00e7d579e531bf9d04b027f1d2a131b0724b3a79
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    A functional-test/src/test/resources/log4j.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.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/PrefillPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java

  Log Message:
  -----------
  prefill working piece

  Commit: 03c113e7cbb065433dcb2657f6ef4b7844550b90
      https://github.com/zanata/zanata/commit/03c113e7cbb065433dcb2657f6ef4b7844550b90
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdatePreview.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PreviewReplaceText.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PreviewReplaceTextResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java

  Log Message:
  -----------
  Merge branch 'master' into prefill

  Commit: 07661553c6b4e6f5bafa18835afe4cd2593d8abc
      https://github.com/zanata/zanata/commit/07661553c6b4e6f5bafa18835afe4cd2593d8abc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.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
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

  Log Message:
  -----------
  Reenable chat feature in workspace presenter

  Commit: cb05ffe7f005f8455ad94e5e9a3536f5bbbd4f2f
      https://github.com/zanata/zanata/commit/cb05ffe7f005f8455ad94e5e9a3536f5bbbd4f2f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Fix test

  Commit: 87fea6ed9610eac81448dcd5c6e9e2002bb202a8
      https://github.com/zanata/zanata/commit/87fea6ed9610eac81448dcd5c6e9e2002bb202a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.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/edit.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

  Commit: b5cc7a683ca49c86028c05d3eb82fc0dafccba89
      https://github.com/zanata/zanata/commit/b5cc7a683ca49c86028c05d3eb82fc0dafccba89
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

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

  Log Message:
  -----------
  Enable blinking on message alert

  Commit: 984dc4f555550255ac5f2045c9bd45393c9d2c0d
      https://github.com/zanata/zanata/commit/984dc4f555550255ac5f2045c9bd45393c9d2c0d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.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/TransMemoryView.java
    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/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

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

  Changed paths:
    M copyright.txt
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

  Commit: 7699cdc390091e68843d35654636ae3d4c504539
      https://github.com/zanata/zanata/commit/7699cdc390091e68843d35654636ae3d4c504539
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.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/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Work in progress: move notification messages into popup, remove from top menu

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

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

  Log Message:
  -----------
  Work in progress: adding timestamp into message

  Commit: 7ab4dfb587ee5e94f8baf604656b7d10d692be89
      https://github.com/zanata/zanata/commit/7ab4dfb587ee5e94f8baf604656b7d10d692be89
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Work in progress: fixing test

  Commit: 5677884077d25decbaac0003345b6a3c0f646b75
      https://github.com/zanata/zanata/commit/5677884077d25decbaac0003345b6a3c0f646b75
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

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

  Log Message:
  -----------
  work in progress: fixing test

  Commit: 67ca4760656180a81f139d5263c12955a19ca4b5
      https://github.com/zanata/zanata/commit/67ca4760656180a81f139d5263c12955a19ca4b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz828624

  Commit: 172388019dbc03398f3d3e207006e5fa9c49e5ba
      https://github.com/zanata/zanata/commit/172388019dbc03398f3d3e207006e5fa9c49e5ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  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/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Moved Info and Warning msg into notification, add timestamp into messages

  Commit: 4f6ff689679a6076421985964c7168d66e6fddb1
      https://github.com/zanata/zanata/commit/4f6ff689679a6076421985964c7168d66e6fddb1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java

  Commit: 56a7b5e94732632a8a420e1270bed43050502bdd
      https://github.com/zanata/zanata/commit/56a7b5e94732632a8a420e1270bed43050502bdd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz828624

  Commit: f2d24015c532b1ef5af13f70a0db2cee68c56755
      https://github.com/zanata/zanata/commit/f2d24015c532b1ef5af13f70a0db2cee68c56755
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rhbz831035 - Add on-demand copyTrans.

First implementation, might present http timeouts if there is too much data to query. Future implementations should add background process and progress feedback to be scalable.

  Commit: 3131aaa5a9314a8dc8cb50063434e045ef5083f3
      https://github.com/zanata/zanata/commit/3131aaa5a9314a8dc8cb50063434e045ef5083f3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

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

  Commit: bfb4f495c10c154fd4e91b6f4f34c3df0eead620
      https://github.com/zanata/zanata/commit/bfb4f495c10c154fd4e91b6f4f34c3df0eead620
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    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

  Log Message:
  -----------
  Reduce logging volume

  Commit: c0b2dd926f522f98c64d3f73ee3da8314a971b08
      https://github.com/zanata/zanata/commit/c0b2dd926f522f98c64d3f73ee3da8314a971b08
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

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

  Log Message:
  -----------
  fix potential bug - codemirror syntax highlight will cause browser freeze when performing on empty/null string

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

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/jboss-service-snippet.xml
    R zanata-war/src/etc/properties-service-sample.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Bug 831482 - Define system properties service MBean in JBoss

  Commit: 3edf1acc777962a00357527fab59bf78dc2953dc
      https://github.com/zanata/zanata/commit/3edf1acc777962a00357527fab59bf78dc2953dc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  rhbz826318 Add cache headers for GWT resources

  Commit: 30266efc0825b13f1136f574edafe6dc3b4d93f6
      https://github.com/zanata/zanata/commit/30266efc0825b13f1136f574edafe6dc3b4d93f6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M .gitignore
    M copyright.txt
    M functional-test/pom.xml
    R functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/CreateProjectPage.java
    R functional-test/src/main/java/org/zanata/page/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/ProjectPage.java
    R functional-test/src/main/java/org/zanata/page/ProjectVersionPage.java
    R functional-test/src/main/java/org/zanata/page/ProjectsPage.java
    R functional-test/src/main/java/org/zanata/page/WebTranPage.java
    A functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    A functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    A functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    A functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    A functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    A functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    A functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java
    A functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    A functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    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/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-war/eclipse/launch/webtrans-dummy.launch
    M zanata-war/eclipse/launch/webtrans-jboss.launch
    M zanata-war/pom.xml
    A zanata-war/src/etc/jboss-service-snippet.xml
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/MemberLanguageList.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/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.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/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/EnterWorkspaceEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/ExitWorkspaceEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/KeyShortcutEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/KeyShortcutEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitEditEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.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
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PreviewState.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReplacementState.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfo.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/resources/Resources.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/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.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/CellTableResources.css
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.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/Editor.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasCommand.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MenuCommandItem.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/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.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/ExitWorkspaceHandler.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/GetProjectTransUnitListsHandler.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/GetTranslatorListHandler.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/TransUnitEditHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Identity.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EnterWorkspace.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ExitWorkspace.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslatorListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasEnterWorkspaceData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasExitWorkspaceData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasTransUnitEditData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasTransUnitUpdatedData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEdit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A zanata-war/src/main/resources/images/combo_box_arrow.png
    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-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/liquibase
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.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/edit.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/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/v1_3/TranslationsCompatibilityTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/TranslationsCompatibilityTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.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
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.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/DummyGetTranslatorListCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/LocalesData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java

  Commit: 8359711663561b30274e4dc180fe6061be025517
      https://github.com/zanata/zanata/commit/8359711663561b30274e4dc180fe6061be025517
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.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/UiMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    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
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  rename prefill to TM merge

  Commit: ef99c44c8192676d07c0428ba99bf4d8c6ed8f07
      https://github.com/zanata/zanata/commit/ef99c44c8192676d07c0428ba99bf4d8c6ed8f07
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

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

  Log Message:
  -----------
  update pom versions for next development iteration

  Commit: 42de941105b33a4256a7c5fb8c819ca8af6a0690
      https://github.com/zanata/zanata/commit/42de941105b33a4256a7c5fb8c819ca8af6a0690
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    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
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

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

  Commit: f601d0c5815852ac26cb4907f7c1a31fe19871ba
      https://github.com/zanata/zanata/commit/f601d0c5815852ac26cb4907f7c1a31fe19871ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  Fix test for enabling chat feature in workspace

  Commit: cf9429644e55dbcf864411e293add49b6a4c5a04
      https://github.com/zanata/zanata/commit/cf9429644e55dbcf864411e293add49b6a4c5a04
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

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

  Commit: de5ff2547dc6d755878906b8b1d6b367605da568
      https://github.com/zanata/zanata/commit/de5ff2547dc6d755878906b8b1d6b367605da568
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  Resize time label in notification view

  Commit: 9c5dbc2d49870aa8e8b1c4ea59e0b00cc54103cc
      https://github.com/zanata/zanata/commit/9c5dbc2d49870aa8e8b1c4ea59e0b00cc54103cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  Fix error message: https://bugzilla.redhat.com/show_bug.cgi?id=737736#c2

  Commit: cb7a674abd19dce1a277ce2842d276f8af6f589f
      https://github.com/zanata/zanata/commit/cb7a674abd19dce1a277ce2842d276f8af6f589f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

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

  Commit: 4b0911e7f4b3a48e47e91926adf78e50c5a983f7
      https://github.com/zanata/zanata/commit/4b0911e7f4b3a48e47e91926adf78e50c5a983f7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.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/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    A zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Work in progress: version group enhancement

  Commit: e98c7c03426bf554049881db05c5592ab2c4a31c
      https://github.com/zanata/zanata/commit/e98c7c03426bf554049881db05c5592ab2c4a31c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    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:
  -----------
  Multiple Projects can be selected (by admins) and made part of a predefined group

  Commit: 1e38a6384319fac0b66708e2603e37da14ad16b3
      https://github.com/zanata/zanata/commit/1e38a6384319fac0b66708e2603e37da14ad16b3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    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/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Impleted bookmarkable url for group maintainer

  Commit: fe0b189b5d038d5de8d0601ebba3af831fdb2f83
      https://github.com/zanata/zanata/commit/fe0b189b5d038d5de8d0601ebba3af831fdb2f83
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    A zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    A zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M 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_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    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 email implementation into emailService

  Commit: 728eaff85416cb6d4674e2321c694c12e1e324f8
      https://github.com/zanata/zanata/commit/728eaff85416cb6d4674e2321c694c12e1e324f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Implemented version request from group page

  Commit: ff091a220223c18a0b572807449793b79f5ce4e5
      https://github.com/zanata/zanata/commit/ff091a220223c18a0b572807449793b79f5ce4e5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.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:
  -----------
  work in progress: implementing group request from project version page

  Commit: 31116b1610864f26aa7c40a468616c7091e4330c
      https://github.com/zanata/zanata/commit/31116b1610864f26aa7c40a468616c7091e4330c
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    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/WEB-INF/layout/version_group_join.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/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.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:
  -----------
  work in progress: group request from version page

  Commit: 2ec7e176871a27fb22a26f38a48bd1e89a3ebbea
      https://github.com/zanata/zanata/commit/2ec7e176871a27fb22a26f38a48bd1e89a3ebbea
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/SecurityService.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/EnumMessages.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/EnumRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.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/client/ui/TransMemoryMergePopupPanelView.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
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransMemoryDetailsAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/test/java/org/zanata/webtrans/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Implement options for TM merge when encounter different meta info
- when match percentage is not 100%
- when res id is different
- when doc id is different
- when project name is different
All the above will NOT make an auto-translation mark as approved.
First condition will make status fuzzy.
User can choose Approved, fuzzy or skip for last three conditions.

  Commit: 6781a19d4af49960d2a42980517090d6e021a4a6
      https://github.com/zanata/zanata/commit/6781a19d4af49960d2a42980517090d6e021a4a6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.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/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/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/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    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
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.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/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into prefill

  Commit: dec6c3d2081636341ef5bccdd235353fdc0f5d4e
      https://github.com/zanata/zanata/commit/dec6c3d2081636341ef5bccdd235353fdc0f5d4e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.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/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/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:
  -----------
  Implemented request to join group from project version page

  Commit: 1643b420c9c0831611cf2f2a7337fc0fe0393e60
      https://github.com/zanata/zanata/commit/1643b420c9c0831611cf2f2a7337fc0fe0393e60
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Include 'joined group' in project iteration page

  Commit: 1e60fe6fc5346e4f75ddc559586bf52de1b8f056
      https://github.com/zanata/zanata/commit/1e60fe6fc5346e4f75ddc559586bf52de1b8f056
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  add message into messages.properties

  Commit: 45129aaab4b5895716511535cb50215d2d75036d
      https://github.com/zanata/zanata/commit/45129aaab4b5895716511535cb50215d2d75036d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.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/TransMemoryMergeHandler.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/TransUnitUpdateInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  refactor to reuse existing handler to do the translation work

  Commit: 1d1e10d24226b54f9a9d796ea6c130c4f95b85dd
      https://github.com/zanata/zanata/commit/1d1e10d24226b54f9a9d796ea6c130c4f95b85dd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.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/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java

  Log Message:
  -----------
  refactor SecurityService to reduce duplicate logic for modify translation

  Commit: b25e2aac8feca178499203503b4f53e4ee91036b
      https://github.com/zanata/zanata/commit/b25e2aac8feca178499203503b4f53e4ee91036b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml

  Log Message:
  -----------
  Add reason for receivers that received email request

  Commit: 8e34be5799c976cb8152f908ee5310ce474ce329
      https://github.com/zanata/zanata/commit/8e34be5799c976cb8152f908ee5310ce474ce329
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java

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

  Commit: f67d2b731f15a393f072eda3d4b25d223c41e764
      https://github.com/zanata/zanata/commit/f67d2b731f15a393f072eda3d4b25d223c41e764
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

  Log Message:
  -----------
  fix bug - should us TM result text flow details

  Commit: 5d755e02db311c7960ef7fcbb9c6a7bd35a42e4b
      https://github.com/zanata/zanata/commit/5d755e02db311c7960ef7fcbb9c6a7bd35a42e4b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    A functional-test/sample-projects/trans-memory/pom.xml
    A functional-test/sample-projects/trans-memory/pot/different-file.pot
    A functional-test/sample-projects/trans-memory/pot/tm-source.pot
    A functional-test/sample-projects/trans-memory/zanata.xml
    A functional-test/sample-projects/trans-memory/zh-CN/different-file.po
    A functional-test/sample-projects/trans-memory/zh-CN/tm-source.po
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    A functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java

  Log Message:
  -----------
  functional test to set up TM test data

  Commit: 7605d42612682b7a0aa965676f3207ee7b349dfc
      https://github.com/zanata/zanata/commit/7605d42612682b7a0aa965676f3207ee7b349dfc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

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

  Log Message:
  -----------
  Fix functional test for version group

  Commit: 569dabaa1bd4114c488cecac1c2b07c38a97dcf0
      https://github.com/zanata/zanata/commit/569dabaa1bd4114c488cecac1c2b07c38a97dcf0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.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/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    A zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M 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_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.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/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/request_to_join.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    A zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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

  Commit: 10834ea279cbb9d938c2571ae40759130e9dbe67
      https://github.com/zanata/zanata/commit/10834ea279cbb9d938c2571ae40759130e9dbe67
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  fix tests

  Commit: 37024f57647681a4cbab04a8bfa20e0b33dcded1
      https://github.com/zanata/zanata/commit/37024f57647681a4cbab04a8bfa20e0b33dcded1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    A zanata-war/src/test/java/org/zanata/model/TestFixture.java
    R zanata-war/src/test/java/org/zanata/webtrans/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TransUnitsModelUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java

  Log Message:
  -----------
  move TestFixture to org.zanata.model so that it can access protected methods

  Commit: a8a35b5d77ed588dc491a8c7712f500f366559cf
      https://github.com/zanata/zanata/commit/a8a35b5d77ed588dc491a8c7712f500f366559cf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  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/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  unit test and refine code

  Commit: 0136107b2c9bbd76bb34ae16c9cfca8e3c364505
      https://github.com/zanata/zanata/commit/0136107b2c9bbd76bb34ae16c9cfca8e3c364505
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

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

  Log Message:
  -----------
  Fix on server side for large glossary: https://bugzilla.redhat.com/show_bug.cgi?id=826383

  Commit: 50239907fcaa26a3fb05ec9880f457b05713f71a
      https://github.com/zanata/zanata/commit/50239907fcaa26a3fb05ec9880f457b05713f71a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  having scroll bar on extra long word

  Commit: ce85397a2a35281418c35f9b20cc0857a07cd60d
      https://github.com/zanata/zanata/commit/ce85397a2a35281418c35f9b20cc0857a07cd60d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

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

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

  Commit: 4d5d42fe3182332418fa372618b448b3d6ef84c2
      https://github.com/zanata/zanata/commit/4d5d42fe3182332418fa372618b448b3d6ef84c2
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Work in progress: fix firefox word wrap issue: https://bugzilla.redhat.com/show_bug.cgi?id=834145

  Commit: c671b9241a8ac5b2fc03e5bb1471b805be8dc10e
      https://github.com/zanata/zanata/commit/c671b9241a8ac5b2fc03e5bb1471b805be8dc10e
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

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

  Commit: 66af68917ff343d21d874428ee3f4a918384894e
      https://github.com/zanata/zanata/commit/66af68917ff343d21d874428ee3f4a918384894e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

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

  Commit: 9701932b571a9c60a4bc35b52fb3fbcead593f88
      https://github.com/zanata/zanata/commit/9701932b571a9c60a4bc35b52fb3fbcead593f88
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

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

  Log Message:
  -----------
  modify NotificationEvent so that it can accept extra link and hanlder

  Commit: 67fb0f5da99496bc5d36a4ba4d5f78a0cbcdb6ec
      https://github.com/zanata/zanata/commit/67fb0f5da99496bc5d36a4ba4d5f78a0cbcdb6ec
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RevertTransUnitUpdates.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  embed TM merge undo link in notification message

  Commit: 500a4cc9ea42cc6b7f73bfdf8bbc7f7887e1c178
      https://github.com/zanata/zanata/commit/500a4cc9ea42cc6b7f73bfdf8bbc7f7887e1c178
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.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/TransMemoryMergePresenter.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/InlineLink.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  create UndoLink widget to handle undo translation

  Commit: 0d12ee469425f8e980b9a7223c931b8c9fda335a
      https://github.com/zanata/zanata/commit/0d12ee469425f8e980b9a7223c931b8c9fda335a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

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

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

  Commit: 8ad8bc71ec25260c12ff37e0b19f802d1e2975cd
      https://github.com/zanata/zanata/commit/8ad8bc71ec25260c12ff37e0b19f802d1e2975cd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.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/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java

  Log Message:
  -----------
  remove some unused UI messages

  Commit: 7506b8b6d967b390071ba98ec21a38a9dd3352f2
      https://github.com/zanata/zanata/commit/7506b8b6d967b390071ba98ec21a38a9dd3352f2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  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/RevertTransUnitUpdateLink.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
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java

  Log Message:
  -----------
  minor refactor and add unit test for presenter

  Commit: 815ba6a89a2f76e7451dec8e3f1158819bf980d6
      https://github.com/zanata/zanata/commit/815ba6a89a2f76e7451dec8e3f1158819bf980d6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java

  Log Message:
  -----------
  ManageLanguagePage wait for ajax table loading

  Commit: a28aabbe955258800c602205aa08a4a177783796
      https://github.com/zanata/zanata/commit/a28aabbe955258800c602205aa08a4a177783796
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-24 (Sun, 24 Jun 2012)

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

  Log Message:
  -----------
  Fix south panel expend issue

Compare: https://github.com/zanata/zanata/compare/f803d87a8fcd...a28aabbe9552