[zanata/zanata] 9b7ddd: work in progress: prototyping layout selection

GitHub noreply at github.com
Wed Jul 25 23:20:06 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 9b7ddd669fd3e6b3aaa75275cd1170e87fd3f5b0
      https://github.com/zanata/zanata/commit/9b7ddd669fd3e6b3aaa75275cd1170e87fd3f5b0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/LayoutSelectionPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    A zanata-war/src/main/resources/images/crystal_project/_24x24/actions/run.png

  Log Message:
  -----------
  work in progress: prototyping layout selection


  Commit: 8e3c5ff8687bd28e1aad8cf94c34c7e0b65a71d2
      https://github.com/zanata/zanata/commit/8e3c5ff8687bd28e1aad8cf94c34c7e0b65a71d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml

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


  Commit: ec598a39076c70e70e1fdf682457ec3dd15401b9
      https://github.com/zanata/zanata/commit/ec598a39076c70e70e1fdf682457ec3dd15401b9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    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/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.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/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/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/LocalesData.dbunit.xml

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


  Commit: 8d7b3cd5ac556b05712f86d3c33d80a864552578
      https://github.com/zanata/zanata/commit/8d7b3cd5ac556b05712f86d3c33d80a864552578
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

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

  Log Message:
  -----------
  Removed unused ui.xml


  Commit: 8639f7fcd6660387315c0a9e4d53916eb2a70558
      https://github.com/zanata/zanata/commit/8639f7fcd6660387315c0a9e4d53916eb2a70558
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/view_choose.png

  Log Message:
  -----------
  Work in progress: Layout selector


  Commit: 7253a35181dd239052a573d3dae9678a0bd3c749
      https://github.com/zanata/zanata/commit/7253a35181dd239052a573d3dae9678a0bd3c749
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutOrganiser.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectionPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml

  Log Message:
  -----------
  Work in progress: css changes for layout selector


  Commit: bf3c2b2b959fbfd680aaee1c8e8ca2cc3e7cc84e
      https://github.com/zanata/zanata/commit/bf3c2b2b959fbfd680aaee1c8e8ca2cc3e7cc84e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    R zanata-war/src/main/resources/images/crystal_project/_24x24/actions/run.png

  Log Message:
  -----------
  Removed unuse image


  Commit: a1694d8e0e36be5f991f42a6ab7e4c9f3b1ee3d5
      https://github.com/zanata/zanata/commit/a1694d8e0e36be5f991f42a6ab7e4c9f3b1ee3d5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutOrganiser.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectionPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml

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


  Commit: 3d7c82cf15733b93939ffbffe10c071de0d89d9b
      https://github.com/zanata/zanata/commit/3d7c82cf15733b93939ffbffe10c071de0d89d9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M functional-test/pom.xml
    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/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/pom.xml
    A zanata-war/src/etc/properties-service-sample.xml
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.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/table/TableEditorPresenter.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/KeyShortcutPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PreviewState.java
    M 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
    M 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/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/SearchResultsDocumentTable.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
    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/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/GetTranslatorListHandler.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/TransUnitEdit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/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/TextFlowTestData.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: 80358ab29fe186974909b915d10ef1476c41358f
      https://github.com/zanata/zanata/commit/80358ab29fe186974909b915d10ef1476c41358f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 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/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/version-group/version_group.xhtml

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


  Commit: 6bc5b782def0dacc1b51846cdc5c4233c829078b
      https://github.com/zanata/zanata/commit/6bc5b782def0dacc1b51846cdc5c4233c829078b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

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

  Log Message:
  -----------
  Work in progress: layout selection


  Commit: 44704a0d02f7d3d4f5147340245ecc5b6096e802
      https://github.com/zanata/zanata/commit/44704a0d02f7d3d4f5147340245ecc5b6096e802
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasCommand.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MenuCommandItem.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/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Work in progress: refactor menuitem command


  Commit: 35c0bb0be33bb5e3de475610afa86fbd1bdab4d2
      https://github.com/zanata/zanata/commit/35c0bb0be33bb5e3de475610afa86fbd1bdab4d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    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/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.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/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

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


  Commit: 1e7e977fd3eaa4fefed94422b804fda881b52c96
      https://github.com/zanata/zanata/commit/1e7e977fd3eaa4fefed94422b804fda881b52c96
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-28 (Mon, 28 May 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

  Log Message:
  -----------
  Fix app presenter test


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/logout.png
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Implemented layout selection option


  Commit: 3fb84921957a42e5aa1630d0901f4fd67ae83f0a
      https://github.com/zanata/zanata/commit/3fb84921957a42e5aa1630d0901f4fd67ae83f0a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/TranslatedDocResourceService.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/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
    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/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
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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


  Commit: 08ee4cd320767353ffaa1abd9a267096c70cf545
      https://github.com/zanata/zanata/commit/08ee4cd320767353ffaa1abd9a267096c70cf545
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    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/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/events/TransUnitUpdatedEvent.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/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.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/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    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/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/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java


  Commit: 56e8e79d528ed156b9700391eb59b7dec66323ec
      https://github.com/zanata/zanata/commit/56e8e79d528ed156b9700391eb59b7dec66323ec
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    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

  Log Message:
  -----------
  Increase width for menu in workspace


  Commit: 8636543e78960835b9a6fc1a3db64c149f1d40f7
      https://github.com/zanata/zanata/commit/8636543e78960835b9a6fc1a3db64c149f1d40f7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M .gitignore
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/eclipse/launch/webtrans-dummy.launch
    M zanata-war/eclipse/launch/webtrans-jboss.launch
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

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


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

  Changed paths:
    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 zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

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


  Commit: 225b6b2dfac5373622b63e7d5e5a19a4e4f98c7d
      https://github.com/zanata/zanata/commit/225b6b2dfac5373622b63e7d5e5a19a4e4f98c7d
  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 LayoutSelection


  Commit: c39f5447703f91a91ed566cd407cae6ec902cb1d
      https://github.com/zanata/zanata/commit/c39f5447703f91a91ed566cd407cae6ec902cb1d
  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 LayoutSelection


  Commit: 7f468d9b920201deacbacf2368dbc5f2c55a2530
      https://github.com/zanata/zanata/commit/7f468d9b920201deacbacf2368dbc5f2c55a2530
  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 LayoutSelection


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

  Changed paths:
    A zanata-war/etc/gui-preview/logo.png
    A zanata-war/etc/gui-preview/sort.gif
    A zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  Add gui preview page and related files.


  Commit: 95b21de7d4f2c4f90ee859622187a45381cddea5
      https://github.com/zanata/zanata/commit/95b21de7d4f2c4f90ee859622187a45381cddea5
  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 LayoutSelection


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

  Changed paths:
    M zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  More styling.


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

  Changed paths:
    A zanata-war/etc/gui-preview/edit_user.png
    A zanata-war/etc/gui-preview/help.png
    A zanata-war/etc/gui-preview/kdf.png
    A zanata-war/etc/gui-preview/kllckety.png
    A zanata-war/etc/gui-preview/kuser.png
    A zanata-war/etc/gui-preview/kwrite.png
    A zanata-war/etc/gui-preview/lin_agt_wrench.png
    A zanata-war/etc/gui-preview/locale.png
    A zanata-war/etc/gui-preview/logo2.png
    M zanata-war/etc/gui-preview/test.html
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java

  Log Message:
  -----------
  Finalised menu bar


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

  Changed paths:
    M zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  Merge branch '2.0-gui-preview' of github.com:zanata/zanata into 2.0-gui-preview


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

  Changed paths:
    M zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  Add footer


  Commit: 20465c3df3e9886bb0512b5df03437ebe72c6161
      https://github.com/zanata/zanata/commit/20465c3df3e9886bb0512b5df03437ebe72c6161
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-07 (Thu, 07 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 'master' into 2.0-gui-preview


  Commit: 615c17550a2b634b66909383c71ebb2924c5921e
      https://github.com/zanata/zanata/commit/615c17550a2b634b66909383c71ebb2924c5921e
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M zanata-war/etc/gui-preview/logo2.png
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    A zanata-war/src/main/resources/images/logo_new.png
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Implement new footer in jsp, new logo


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

  Changed paths:
    A zanata-war/etc/gui-preview/logo2.xcf
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/kuser.png
    A zanata-war/src/main/resources/images/crystal_project/_32x32/apps/kwrite.png
    A zanata-war/src/main/resources/images/logo2.png
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  work in progress: Integrate new top menu into jsf


  Commit: 78dd4ad13ec85f4de9b1f5df33159a694789692f
      https://github.com/zanata/zanata/commit/78dd4ad13ec85f4de9b1f5df33159a694789692f
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/edit_user.png
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Complete integration with jsf


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

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

  Log Message:
  -----------
  Tweak on css


  Commit: 21402203012ce72b40ad972199c541c90e8f460a
      https://github.com/zanata/zanata/commit/21402203012ce72b40ad972199c541c90e8f460a
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

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

  Log Message:
  -----------
  Css tweak for width in submenu


  Commit: 0fee81a66ee3a24263645476b2836ca841e9c7b8
      https://github.com/zanata/zanata/commit/0fee81a66ee3a24263645476b2836ca841e9c7b8
  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 LayoutSelection


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

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

  Log Message:
  -----------
  Move menu to left side


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

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/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/java/org/zanata/action/ProjectIterationHome.java
    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
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.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/SearchResultsPresenter.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/ui/DiffMatchPatchLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.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/SearchResultsView.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/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/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/main/resources/messages.properties
    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/web.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    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/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

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview


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

  Changed paths:
    M zanata-war/etc/gui-preview/logo2.png
    M zanata-war/etc/gui-preview/logo2.xcf
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kchart.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    A zanata-war/src/main/resources/images/javamelody.png
    M zanata-war/src/main/resources/images/logo2.png
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Redesign admin page


  Commit: b2673ab3588a0a4b3743e8e01dc404bad3f6234c
      https://github.com/zanata/zanata/commit/b2673ab3588a0a4b3743e8e01dc404bad3f6234c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutOrganiser.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutSelection.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Changes in interface naming


  Commit: b24c9932606517d33e323bc100ad401405f20688
      https://github.com/zanata/zanata/commit/b24c9932606517d33e323bc100ad401405f20688
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/sample-projects/trans-memory/differentProject/zanata.xml
    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/groups/VersionGroupPage.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/ExperimentTest.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
    A functional-test/src/test/resources/log4j.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-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/java/org/zanata/action/ActivateAction.java
    A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    A zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.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/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    A zanata-war/src/main/java/org/zanata/exception/KeyNotFoundException.java
    M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
    A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
    A zanata-war/src/main/java/org/zanata/process/CopyTransProcess.java
    A zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
    R zanata-war/src/main/java/org/zanata/security/KeyNotFoundException.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    A zanata-war/src/main/java/org/zanata/service/EmailService.java
    A zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.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
    A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.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/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.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/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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/TargetContentsDisplay.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/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.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/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.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
    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/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.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/EnumMessages.java
    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/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/service/UserSessionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.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/EnumRadioButtonGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRenderer.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/InlineLink.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.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/TMMergeForm.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    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
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.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/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/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/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/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/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/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.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
    A 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/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/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/GetTransMemoryDetailsAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.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/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RevertTransUnitUpdates.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.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/TransUnitEditResult.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
    R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilter.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.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/resources/pluralforms.properties
    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/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
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/main/webapp/admin/search.xhtml
    A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    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/project/project.xhtml
    M zanata-war/src/main/webapp/stylesheet/base.css
    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
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/TestFixture.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/editor/table/TransUnitsModelUnitTest.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
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/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/DummyGetTransMemoryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java


  Commit: 8a1a36a46d06aba77b68b74f5a110529797f2c9b
      https://github.com/zanata/zanata/commit/8a1a36a46d06aba77b68b74f5a110529797f2c9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

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


  Commit: b56cd95b2b36bd6954f40e6191ced865eb9d9eb5
      https://github.com/zanata/zanata/commit/b56cd95b2b36bd6954f40e6191ced865eb9d9eb5
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  Minor style tweaks.

Reduce border radius' and shadows for tables and panels.


  Commit: aff69f3628873ee31cc0d4207f5925b6feb40359
      https://github.com/zanata/zanata/commit/aff69f3628873ee31cc0d4207f5925b6feb40359
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.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/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/SurplusKeyListener.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/KeyShortcutPresenter.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/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/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
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.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/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.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/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/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    A zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.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/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java


  Commit: 9c2210eed3f3892f01ed362a2c1597f5a410ee49
      https://github.com/zanata/zanata/commit/9c2210eed3f3892f01ed362a2c1597f5a410ee49
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 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/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/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Moved option toggle button


  Commit: a7f57cee8eaf9c6c18f5fdb4d28c142fd0fe90d4
      https://github.com/zanata/zanata/commit/a7f57cee8eaf9c6c18f5fdb4d28c142fd0fe90d4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/sample-projects/trans-memory/differentProject/zanata.xml
    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/groups/VersionGroupPage.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/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
    A functional-test/src/test/resources/functional-test.tng.xml
    A functional-test/src/test/resources/log4j.xml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    A zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.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/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    A zanata-war/src/main/java/org/zanata/exception/KeyNotFoundException.java
    M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
    A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
    A zanata-war/src/main/java/org/zanata/process/CopyTransProcess.java
    A zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
    A zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    R zanata-war/src/main/java/org/zanata/security/KeyNotFoundException.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    A zanata-war/src/main/java/org/zanata/service/EmailService.java
    A zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.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/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.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/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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/TargetContentsDisplay.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/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.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/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/SurplusKeyListener.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/HasLayoutSelection.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.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/OptionsPanelPresenter.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/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/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.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/NavigationMessages.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/UiMessages.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/service/UserSessionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.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/EnumRadioButtonGroup.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRenderer.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasCommand.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MenuCommandItem.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.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/TMMergeForm.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    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
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.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/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.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
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.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/TransMemoryView.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
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/UndoRedoView.ui.xml
    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/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.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
    A 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/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/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/GetTransMemoryDetailsAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.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/RevertTransUnitUpdates.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.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/TransUnitEditResult.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
    R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilter.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/logout.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/view_choose.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/pluralforms.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
    M zanata-war/src/main/webapp/WEB-INF/layout/template.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
    M zanata-war/src/main/webapp/admin/search.xhtml
    A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    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/project/project.xhtml
    A zanata-war/src/main/webapp/stylesheet/2.0.css
    M zanata-war/src/main/webapp/stylesheet/base.css
    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
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    A zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/TestFixture.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/editor/table/TransUnitsModelUnitTest.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/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.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/DummyGetTransMemoryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'LayoutSelection' into 2.0-gui-preview

Conflicts:
	zanata-war/src/main/webapp/META-INF/MANIFEST.MF


  Commit: 5718fc87fde642d9317089d4c6e82d74e42714fe
      https://github.com/zanata/zanata/commit/5718fc87fde642d9317089d4c6e82d74e42714fe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/etc/gui-preview/test.html

  Log Message:
  -----------
  Merge branch '2.0-gui-preview' of github.com:zanata/zanata into 2.0-gui-preview


  Commit: 5ce31190a7e52e9ad22b819b7996988c1e2d8322
      https://github.com/zanata/zanata/commit/5ce31190a7e52e9ad22b819b7996988c1e2d8322
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/easymoblog.png
    R zanata-war/src/main/resources/images/crystal_project/_32x32/apps/kwrite.png
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  Changed 'translation' icon


  Commit: 60d974e8be2e6e4b22e5bed354f8c146e57ab51b
      https://github.com/zanata/zanata/commit/60d974e8be2e6e4b22e5bed354f8c146e57ab51b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.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/TargetContentsDisplay.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/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.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/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/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/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/AbstractValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/search/stopwords.txt
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidationTest.java

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview


  Commit: 0fd8d792efb33ed74e0e143d0c3e6369400ebe3c
      https://github.com/zanata/zanata/commit/0fd8d792efb33ed74e0e143d0c3e6369400ebe3c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/DashboardPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.ui.xml

  Log Message:
  -----------
  Add empty dashboard view


  Commit: 1563a9e4f53b85a4c30650656d6d9f69cf300ccd
      https://github.com/zanata/zanata/commit/1563a9e4f53b85a4c30650656d6d9f69cf300ccd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.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/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/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/TransMemoryView.java
    A zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    A zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java


  Commit: 3e26c14c42f07d5b9828f55698581a9aebc6383c
      https://github.com/zanata/zanata/commit/3e26c14c42f07d5b9828f55698581a9aebc6383c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    A zanata-war/eclipse/launch/debug-jboss-zanata (1).launch	
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.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/DashboardPresenter.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/DashboardView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Dashboard view implementation


  Commit: 1e4f67b1ec4bc82b1993a7034952facb4f8ef8cf
      https://github.com/zanata/zanata/commit/1e4f67b1ec4bc82b1993a7034952facb4f8ef8cf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M 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/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.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/TableEditorTableDefinition.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/TargetContentsDisplay.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/WorkspaceContextUpdateEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/EventWrapper.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/EventWrapperImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M 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/DashboardPresenter.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/GlossaryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.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/NavigationMessages.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/rpc/CachingDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/DelegatingDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasManageUserPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/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/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.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/GetTransMemoryDetailsHandler.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/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M 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
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/Person.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/PersonSessionDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ProjectIterationId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitId.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/TransUnitUpdatePreview.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserPanelSessionItem.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceId.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/ActivateWorkspaceAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ActivateWorkspaceResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/DispatchAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/DispatchResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ExitWorkspaceResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.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/GetStatusCountResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigationResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.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/HasWorkspaceContextUpdateData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.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/PreviewReplaceTextResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/SessionEventData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.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/WEB-INF/layout/add_maintainer_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.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/KeyShortcutPresenterTest.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/OptionsPanelPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/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/DummyGetTransMemoryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
	zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java


  Commit: 763c290afde3328dc5ef50a7210d86287196dc8b
      https://github.com/zanata/zanata/commit/763c290afde3328dc5ef50a7210d86287196dc8b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    R zanata-war/src/etc/autotest.properties
    R zanata-war/src/etc/fedora.properties
    R zanata-war/src/etc/internalauth.properties
    R zanata-war/src/etc/jaas.properties
    R zanata-war/src/etc/kerberos.properties
    R zanata-war/src/etc/seamtests.properties
    A zanata-war/src/etc/zanata-defaultconfig.properties
    A zanata-war/src/etc/zanata.properties
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/resources/zanata-defaultconfig.properties
    A zanata-war/src/test/resources/zanata.properties

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview


  Commit: 1cf0d700d1d96ec1741b2f6b3c124cdc6dc78a4a
      https://github.com/zanata/zanata/commit/1cf0d700d1d96ec1741b2f6b3c124cdc6dc78a4a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview


  Commit: 5e8c8663f2cb5ddf5ac6228f38f101430cd35889
      https://github.com/zanata/zanata/commit/5e8c8663f2cb5ddf5ac6228f38f101430cd35889
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

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

  Log Message:
  -----------
  decrease box shadow


  Commit: 857abdcc9e06d2e3cd0410b761d6daec1c64c3b6
      https://github.com/zanata/zanata/commit/857abdcc9e06d2e3cd0410b761d6daec1c64c3b6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    A zanata-war/etc/gui-preview/template.xhtml
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/edit_user.png

  Log Message:
  -----------
  Disable new menu bar


  Commit: 2c665b73074d655aefe9eeeccce9754b65b59180
      https://github.com/zanata/zanata/commit/2c665b73074d655aefe9eeeccce9754b65b59180
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

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

  Log Message:
  -----------
  Disable new menu bar


  Commit: b4ff24f2ea1a1571c680450ebb279fc620b809b4
      https://github.com/zanata/zanata/commit/b4ff24f2ea1a1571c680450ebb279fc620b809b4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    A zanata-war/eclipse/launch/debug-jboss-zanata (1).launch	
    A zanata-war/etc/gui-preview/edit_user.png
    A zanata-war/etc/gui-preview/help.png
    A zanata-war/etc/gui-preview/kdf.png
    A zanata-war/etc/gui-preview/kllckety.png
    A zanata-war/etc/gui-preview/kuser.png
    A zanata-war/etc/gui-preview/kwrite.png
    A zanata-war/etc/gui-preview/lin_agt_wrench.png
    A zanata-war/etc/gui-preview/locale.png
    A zanata-war/etc/gui-preview/logo.png
    A zanata-war/etc/gui-preview/logo2.png
    A zanata-war/etc/gui-preview/logo2.xcf
    A zanata-war/etc/gui-preview/sort.gif
    A zanata-war/etc/gui-preview/template.xhtml
    A zanata-war/etc/gui-preview/test.html
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DashboardPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutSelection.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.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/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasCommand.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MenuCommandItem.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
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.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
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/UndoRedoView.ui.xml
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/kuser.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/logout.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/actions/view_choose.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/easymoblog.png
    A zanata-war/src/main/resources/images/logo2.png
    A zanata-war/src/main/resources/images/logo_new.png
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    A zanata-war/src/main/webapp/stylesheet/2.0.css
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Merge branch '2.0-gui-preview' into integration/master


  Commit: 1ea2f622e3ee56d03bc7fdb2997b731d72ea10bf
      https://github.com/zanata/zanata/commit/1ea2f622e3ee56d03bc7fdb2997b731d72ea10bf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

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


Compare: https://github.com/zanata/zanata/compare/2fa0457d435d...1ea2f622e3ee

More information about the zanata-commits mailing list