[zanata/zanata] 6fb0e9: work in progress - prefill
GitHub
noreply at github.com
Mon Jul 9 01:28:42 UTC 2012
Branch: refs/heads/2.0-gui-preview
Home: https://github.com/zanata/zanata
Commit: 6fb0e90ff5206287a40ab69a066a390b59a534b1
https://github.com/zanata/zanata/commit/6fb0e90ff5206287a40ab69a066a390b59a534b1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
Log Message:
-----------
work in progress - prefill
Commit: f240af3d0a63eaece2f387f61620eb175310b00a
https://github.com/zanata/zanata/commit/f240af3d0a63eaece2f387f61620eb175310b00a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/ProjectsPage.java
M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NoOpResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEdit.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
refactor GetTransMemoryHandler and a few others
Commit: 36c2405d1890693d3e29eacdccde6d4963a972f8
https://github.com/zanata/zanata/commit/36c2405d1890693d3e29eacdccde6d4963a972f8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
Log Message:
-----------
work in progress - prefill from TM rpc
Commit: feb4676824600b888068555a7050668b3bda76c0
https://github.com/zanata/zanata/commit/feb4676824600b888068555a7050668b3bda76c0
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
A zanata-war/src/main/java/org/zanata/exception/KeyNotFoundException.java
R zanata-war/src/main/java/org/zanata/security/KeyNotFoundException.java
A zanata-war/src/main/java/org/zanata/service/SecurityService.java
A zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
new SecurityService for checking translation permission
Commit: 2a13e73c30055c86b28ced9be7f460bfd83f70fd
https://github.com/zanata/zanata/commit/2a13e73c30055c86b28ced9be7f460bfd83f70fd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
Log Message:
-----------
work in progress - TextFlowDAO for prefill and other refactoring
Commit: 26d97e1a0bf2a246dd323ad95cc700db34601efc
https://github.com/zanata/zanata/commit/26d97e1a0bf2a246dd323ad95cc700db34601efc
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NoOpResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEditResult.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
Log Message:
-----------
work in progress - getting TextFlowDAO to work
Commit: cf4427471b485a38c845bae1470386c8f8ef0946
https://github.com/zanata/zanata/commit/cf4427471b485a38c845bae1470386c8f8ef0946
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
Log Message:
-----------
TextFlowDAO get untranslated text flow working
Commit: 00e7d579e531bf9d04b027f1d2a131b0724b3a79
https://github.com/zanata/zanata/commit/00e7d579e531bf9d04b027f1d2a131b0724b3a79
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
A functional-test/src/test/resources/log4j.xml
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
Log Message:
-----------
prefill working piece
Commit: 03c113e7cbb065433dcb2657f6ef4b7844550b90
https://github.com/zanata/zanata/commit/03c113e7cbb065433dcb2657f6ef4b7844550b90
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-21 (Mon, 21 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdatePreview.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PreviewReplaceText.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PreviewReplaceTextResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
Log Message:
-----------
Merge branch 'master' into prefill
Commit: 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: 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: 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: 0e780595b09fda78e8b26d1517d0e99dfa45d15d
https://github.com/zanata/zanata/commit/0e780595b09fda78e8b26d1517d0e99dfa45d15d
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/CopyTransManager.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/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - Add progress feddback for on-demand copy trans.
- Add a time estimation mechanism for background processes.
Commit: 30266efc0825b13f1136f574edafe6dc3b4d93f6
https://github.com/zanata/zanata/commit/30266efc0825b13f1136f574edafe6dc3b4d93f6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M .gitignore
M copyright.txt
M functional-test/pom.xml
R functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
R functional-test/src/main/java/org/zanata/page/AdministrationPage.java
R functional-test/src/main/java/org/zanata/page/CreateProjectPage.java
R functional-test/src/main/java/org/zanata/page/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/HomePage.java
R functional-test/src/main/java/org/zanata/page/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/ProjectPage.java
R functional-test/src/main/java/org/zanata/page/ProjectVersionPage.java
R functional-test/src/main/java/org/zanata/page/ProjectsPage.java
R functional-test/src/main/java/org/zanata/page/WebTranPage.java
A functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
A functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
A functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
A functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
A functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
A functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
A functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
A functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
A functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
A functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
A functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
A functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
A functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java
A functional-test/src/main/java/org/zanata/util/TableRow.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
A functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/eclipse/launch/webtrans-dummy.launch
M zanata-war/eclipse/launch/webtrans-jboss.launch
M zanata-war/pom.xml
A zanata-war/src/etc/jboss-service-snippet.xml
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/MemberLanguageList.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/DocumentService.java
M zanata-war/src/main/java/org/zanata/service/LocaleService.java
M zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/EnterWorkspaceEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/ExitWorkspaceEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/KeyShortcutEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/KeyShortcutEventHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitEditEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
A zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
A zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PreviewState.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReplacementState.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfo.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CellTableResources.css
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasCommand.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MenuCommandItem.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/auth/EditorClientId.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Identity.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/EnterWorkspace.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ExitWorkspace.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslatorListResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasEnterWorkspaceData.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasExitWorkspaceData.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasTransUnitEditData.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasTransUnitUpdatedData.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitEdit.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
A zanata-war/src/main/resources/images/combo_box_arrow.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/security.drl
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/liquibase
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/web.xml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/compat/v1_3/TranslationsCompatibilityTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/v1_4_4/TranslationsCompatibilityTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/v1_5_0/TranslationsCompatibilityTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
M zanata-war/src/test/resources/org/zanata/test/model/LocalesData.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into prefill
Conflicts:
zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
Commit: 8359711663561b30274e4dc180fe6061be025517
https://github.com/zanata/zanata/commit/8359711663561b30274e4dc180fe6061be025517
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/PrefillPresenter.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.java
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillForm.ui.xml
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelDisplay.java
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/PrefillPopupPanelView.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PrefillTranslationHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PrefillTranslation.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
rename prefill to TM merge
Commit: cefeb811d05b8b9cd727fcf8cdca5ca0658b8ae1
https://github.com/zanata/zanata/commit/cefeb811d05b8b9cd727fcf8cdca5ca0658b8ae1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - On-demand copy trans improvements.
- Tested for multi-user concurrent access.
- Add more feedback about an ongoing copy trans.
Commit: b031146696bf4f6965d9903bed73ea5edd8b4d8b
https://github.com/zanata/zanata/commit/b031146696bf4f6965d9903bed73ea5edd8b4d8b
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - On-demand copy trans improvements.
- Keep track of completed and cancelled copy trans.
- Show info on last copy trans for the iteration.
Commit: 4b0911e7f4b3a48e47e91926adf78e50c5a983f7
https://github.com/zanata/zanata/commit/4b0911e7f4b3a48e47e91926adf78e50c5a983f7
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/language/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
A zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Work in progress: version group enhancement
Commit: e98c7c03426bf554049881db05c5592ab2c4a31c
https://github.com/zanata/zanata/commit/e98c7c03426bf554049881db05c5592ab2c4a31c
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Multiple Projects can be selected (by admins) and made part of a predefined group
Commit: 1e38a6384319fac0b66708e2603e37da14ad16b3
https://github.com/zanata/zanata/commit/1e38a6384319fac0b66708e2603e37da14ad16b3
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Impleted bookmarkable url for group maintainer
Commit: fe0b189b5d038d5de8d0601ebba3af831fdb2f83
https://github.com/zanata/zanata/commit/fe0b189b5d038d5de8d0601ebba3af831fdb2f83
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
A zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
A zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Move email implementation into emailService
Commit: 728eaff85416cb6d4674e2321c694c12e1e324f8
https://github.com/zanata/zanata/commit/728eaff85416cb6d4674e2321c694c12e1e324f8
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
Log Message:
-----------
Implemented version request from group page
Commit: ff091a220223c18a0b572807449793b79f5ce4e5
https://github.com/zanata/zanata/commit/ff091a220223c18a0b572807449793b79f5ce4e5
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
work in progress: implementing group request from project version page
Commit: 31116b1610864f26aa7c40a468616c7091e4330c
https://github.com/zanata/zanata/commit/31116b1610864f26aa7c40a468616c7091e4330c
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
work in progress: group request from version page
Commit: 2ec7e176871a27fb22a26f38a48bd1e89a3ebbea
https://github.com/zanata/zanata/commit/2ec7e176871a27fb22a26f38a48bd1e89a3ebbea
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRenderer.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransMemoryDetailsAction.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/TestFixture.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Implement options for TM merge when encounter different meta info
- when match percentage is not 100%
- when res id is different
- when doc id is different
- when project name is different
All the above will NOT make an auto-translation mark as approved.
First condition will make status fuzzy.
User can choose Approved, fuzzy or skip for last three conditions.
Commit: 6781a19d4af49960d2a42980517090d6e021a4a6
https://github.com/zanata/zanata/commit/6781a19d4af49960d2a42980517090d6e021a4a6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
Log Message:
-----------
Merge branch 'master' into prefill
Commit: a12eb39eb99bb0da860a80c0a821143dbed6e8f8
https://github.com/zanata/zanata/commit/a12eb39eb99bb0da860a80c0a821143dbed6e8f8
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
M 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/service/impl/CopyTransServiceImpl.java
Log Message:
-----------
rhbz831035 - Refactor background process mechanism.
- Add listener capability to background processes.
- Add self-cleaning to the copy trans manager bean.
- Add more feedback to the on-demand copy trans UI.
Commit: dec6c3d2081636341ef5bccdd235353fdc0f5d4e
https://github.com/zanata/zanata/commit/dec6c3d2081636341ef5bccdd235353fdc0f5d4e
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Implemented request to join group from project version page
Commit: 1643b420c9c0831611cf2f2a7337fc0fe0393e60
https://github.com/zanata/zanata/commit/1643b420c9c0831611cf2f2a7337fc0fe0393e60
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
Include 'joined group' in project iteration page
Commit: 1e60fe6fc5346e4f75ddc559586bf52de1b8f056
https://github.com/zanata/zanata/commit/1e60fe6fc5346e4f75ddc559586bf52de1b8f056
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
add message into messages.properties
Commit: 45129aaab4b5895716511535cb50215d2d75036d
https://github.com/zanata/zanata/commit/45129aaab4b5895716511535cb50215d2d75036d
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateInfo.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
refactor to reuse existing handler to do the translation work
Commit: 1d1e10d24226b54f9a9d796ea6c130c4f95b85dd
https://github.com/zanata/zanata/commit/1d1e10d24226b54f9a9d796ea6c130c4f95b85dd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
Log Message:
-----------
refactor SecurityService to reduce duplicate logic for modify translation
Commit: b25e2aac8feca178499203503b4f53e4ee91036b
https://github.com/zanata/zanata/commit/b25e2aac8feca178499203503b4f53e4ee91036b
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
Log Message:
-----------
Add reason for receivers that received email request
Commit: 8e34be5799c976cb8152f908ee5310ce474ce329
https://github.com/zanata/zanata/commit/8e34be5799c976cb8152f908ee5310ce474ce329
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
Log Message:
-----------
refactor
Commit: f67d2b731f15a393f072eda3d4b25d223c41e764
https://github.com/zanata/zanata/commit/f67d2b731f15a393f072eda3d4b25d223c41e764
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
Log Message:
-----------
fix bug - should us TM result text flow details
Commit: 5d755e02db311c7960ef7fcbb9c6a7bd35a42e4b
https://github.com/zanata/zanata/commit/5d755e02db311c7960ef7fcbb9c6a7bd35a42e4b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
A functional-test/sample-projects/trans-memory/pom.xml
A functional-test/sample-projects/trans-memory/pot/different-file.pot
A functional-test/sample-projects/trans-memory/pot/tm-source.pot
A functional-test/sample-projects/trans-memory/zanata.xml
A functional-test/sample-projects/trans-memory/zh-CN/different-file.po
A functional-test/sample-projects/trans-memory/zh-CN/tm-source.po
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
A functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
Log Message:
-----------
functional test to set up TM test data
Commit: 7605d42612682b7a0aa965676f3207ee7b349dfc
https://github.com/zanata/zanata/commit/7605d42612682b7a0aa965676f3207ee7b349dfc
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
Log Message:
-----------
Fix functional test for version group
Commit: 569dabaa1bd4114c488cecac1c2b07c38a97dcf0
https://github.com/zanata/zanata/commit/569dabaa1bd4114c488cecac1c2b07c38a97dcf0
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
A zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
A zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
A zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/request_to_join.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
A zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into prefill
Commit: 10834ea279cbb9d938c2571ae40759130e9dbe67
https://github.com/zanata/zanata/commit/10834ea279cbb9d938c2571ae40759130e9dbe67
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
Log Message:
-----------
fix tests
Commit: d24ba2fb747e32b73b1629a34126c8617ab58e76
https://github.com/zanata/zanata/commit/d24ba2fb747e32b73b1629a34126c8617ab58e76
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - Apply Post-Redirect-Get pattern to the copy trans actions.
- Introduce a conversation scoped bean to serve as a "flash" scope of sorts.
- Correct url rewrite rule that was preventing the conversation id from being propagated.
- Use the new "flash" scoped bean to store messages that would otherwise be lost with FacesMessages on subsequent ajax refreshes.
Commit: 37024f57647681a4cbab04a8bfa20e0b33dcded1
https://github.com/zanata/zanata/commit/37024f57647681a4cbab04a8bfa20e0b33dcded1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
A zanata-war/src/test/java/org/zanata/model/TestFixture.java
R zanata-war/src/test/java/org/zanata/webtrans/TestFixture.java
M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TransUnitsModelUnitTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java
Log Message:
-----------
move TestFixture to org.zanata.model so that it can access protected methods
Commit: a8a35b5d77ed588dc491a8c7712f500f366559cf
https://github.com/zanata/zanata/commit/a8a35b5d77ed588dc491a8c7712f500f366559cf
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
unit test and refine code
Commit: 0136107b2c9bbd76bb34ae16c9cfca8e3c364505
https://github.com/zanata/zanata/commit/0136107b2c9bbd76bb34ae16c9cfca8e3c364505
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
Log Message:
-----------
Fix on server side for large glossary: https://bugzilla.redhat.com/show_bug.cgi?id=826383
Commit: 50239907fcaa26a3fb05ec9880f457b05713f71a
https://github.com/zanata/zanata/commit/50239907fcaa26a3fb05ec9880f457b05713f71a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
having scroll bar on extra long word
Commit: ce85397a2a35281418c35f9b20cc0857a07cd60d
https://github.com/zanata/zanata/commit/ce85397a2a35281418c35f9b20cc0857a07cd60d
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
Log Message:
-----------
Merge branch 'rhbz826383' into integration/master
Commit: 4d5d42fe3182332418fa372618b448b3d6ef84c2
https://github.com/zanata/zanata/commit/4d5d42fe3182332418fa372618b448b3d6ef84c2
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Work in progress: fix firefox word wrap issue: https://bugzilla.redhat.com/show_bug.cgi?id=834145
Commit: c671b9241a8ac5b2fc03e5bb1471b805be8dc10e
https://github.com/zanata/zanata/commit/c671b9241a8ac5b2fc03e5bb1471b805be8dc10e
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Merge branch 'wordWrapInFireFox' into integration/master
Commit: 66af68917ff343d21d874428ee3f4a918384894e
https://github.com/zanata/zanata/commit/66af68917ff343d21d874428ee3f4a918384894e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
minor
Commit: 9701932b571a9c60a4bc35b52fb3fbcead593f88
https://github.com/zanata/zanata/commit/9701932b571a9c60a4bc35b52fb3fbcead593f88
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
Log Message:
-----------
modify NotificationEvent so that it can accept extra link and hanlder
Commit: 67fb0f5da99496bc5d36a4ba4d5f78a0cbcdb6ec
https://github.com/zanata/zanata/commit/67fb0f5da99496bc5d36a4ba4d5f78a0cbcdb6ec
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
R zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RevertTransUnitUpdates.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
embed TM merge undo link in notification message
Commit: 500a4cc9ea42cc6b7f73bfdf8bbc7f7887e1c178
https://github.com/zanata/zanata/commit/500a4cc9ea42cc6b7f73bfdf8bbc7f7887e1c178
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
Log Message:
-----------
create UndoLink widget to handle undo translation
Commit: 0d12ee469425f8e980b9a7223c931b8c9fda335a
https://github.com/zanata/zanata/commit/0d12ee469425f8e980b9a7223c931b8c9fda335a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
Log Message:
-----------
minor
Commit: a00fe56667f5dd2fb05f939052db0abda303a521
https://github.com/zanata/zanata/commit/a00fe56667f5dd2fb05f939052db0abda303a521
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
work in progress: xml entity validation
Commit: 8ad8bc71ec25260c12ff37e0b19f802d1e2975cd
https://github.com/zanata/zanata/commit/8ad8bc71ec25260c12ff37e0b19f802d1e2975cd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
Log Message:
-----------
remove some unused UI messages
Commit: 7506b8b6d967b390071ba98ec21a38a9dd3352f2
https://github.com/zanata/zanata/commit/7506b8b6d967b390071ba98ec21a38a9dd3352f2
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
Log Message:
-----------
minor refactor and add unit test for presenter
Commit: 815ba6a89a2f76e7451dec8e3f1158819bf980d6
https://github.com/zanata/zanata/commit/815ba6a89a2f76e7451dec8e3f1158819bf980d6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
Log Message:
-----------
ManageLanguagePage wait for ajax table loading
Commit: 572b73f364e7c542849cf031043c2774e17cf540
https://github.com/zanata/zanata/commit/572b73f364e7c542849cf031043c2774e17cf540
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
Log Message:
-----------
Add comments
Commit: 84c8c8e6fa7430999d69a269c6f989dd0c92aecb
https://github.com/zanata/zanata/commit/84c8c8e6fa7430999d69a269c6f989dd0c92aecb
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.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/shared/auth/EditorClientId.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/DummyGetTranslatorListCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
Log Message:
-----------
rhbz833673 rhbz833639 Fix inability to log out for OpenID/Kerberos, remove editor clients on workspace exit
Commit: 1fc102ae91a8280926da97c34769918bff7b35c5
https://github.com/zanata/zanata/commit/1fc102ae91a8280926da97c34769918bff7b35c5
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-24 (Sun, 24 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
work in progress: xml entity validation
Commit: a28aabbe955258800c602205aa08a4a177783796
https://github.com/zanata/zanata/commit/a28aabbe955258800c602205aa08a4a177783796
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-24 (Sun, 24 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
Log Message:
-----------
Fix south panel expend issue
Commit: 350162aa3cb4c62973d2856674590154e74be670
https://github.com/zanata/zanata/commit/350162aa3cb4c62973d2856674590154e74be670
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-24 (Sun, 24 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
Work in progress: xml entity validation
Commit: 1ce54b02e629703b63d2e52109cab15b0e2919d6
https://github.com/zanata/zanata/commit/1ce54b02e629703b63d2e52109cab15b0e2919d6
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
Log Message:
-----------
Implemented XML Entity validation: https://bugzilla.redhat.com/show_bug.cgi?id=834479
Commit: 0ccfde2c392b1468b3d143a8875c4e1af9942137
https://github.com/zanata/zanata/commit/0ccfde2c392b1468b3d143a8875c4e1af9942137
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
Merge branch 'rhbz834479' of github.com:zanata/zanata into rhbz834479
Conflicts:
zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Commit: ada9d85e16ff00b27526c9f0ca6698d1b3762fef
https://github.com/zanata/zanata/commit/ada9d85e16ff00b27526c9f0ca6698d1b3762fef
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
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
A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
Merge branch 'rhbz834479' into integration/master
Commit: 61d1afcbac606dd3f9f143390e8d8d2e96d2c062
https://github.com/zanata/zanata/commit/61d1afcbac606dd3f9f143390e8d8d2e96d2c062
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/sample-projects/trans-memory/pot/different-file.pot
M functional-test/sample-projects/trans-memory/pot/tm-source.pot
M functional-test/sample-projects/trans-memory/zh-CN/different-file.po
M functional-test/sample-projects/trans-memory/zh-CN/tm-source.po
M functional-test/src/test/java/org/zanata/ExperimentTest.java
Log Message:
-----------
update test project to have more than one page test data
Commit: ddc6c0366825912c0d4f7310b36a4a01eac21452
https://github.com/zanata/zanata/commit/ddc6c0366825912c0d4f7310b36a4a01eac21452
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
A functional-test/sample-projects/trans-memory/differentProject/zanata.xml
M functional-test/src/test/java/org/zanata/ExperimentTest.java
M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
Log Message:
-----------
test data for functional test
Commit: 98a5ddf6c2e5b02861bec8f6c0676a0e0480f6cd
https://github.com/zanata/zanata/commit/98a5ddf6c2e5b02861bec8f6c0676a0e0480f6cd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/pom.xml
M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
Log Message:
-----------
add cargo debug and update functional test client version
Commit: 77b270b85d94262f039ede253e4d4a63d64eef47
https://github.com/zanata/zanata/commit/77b270b85d94262f039ede253e4d4a63d64eef47
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
Log Message:
-----------
minor message tweek
Commit: 13405829dc7d7c186182f7a342b2f3007fadaf1e
https://github.com/zanata/zanata/commit/13405829dc7d7c186182f7a342b2f3007fadaf1e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
Log Message:
-----------
update ManageLanguagePage ajax wait
Commit: 28457775898a12aa8d3a77d17a669c7d0c59f742
https://github.com/zanata/zanata/commit/28457775898a12aa8d3a77d17a669c7d0c59f742
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
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
A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: f0b87a15e13ed21d5e24cfb42f47124955d7cbeb
https://github.com/zanata/zanata/commit/f0b87a15e13ed21d5e24cfb42f47124955d7cbeb
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
Log Message:
-----------
Merge branch 'prefill' into integration/master
Commit: dc72985a466b3ac399cb8fdbadcbcc201fb334dc
https://github.com/zanata/zanata/commit/dc72985a466b3ac399cb8fdbadcbcc201fb334dc
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
Log Message:
-----------
fix test
Commit: a1ed39bb52f7c4d702f79154412ae9a415b65cae
https://github.com/zanata/zanata/commit/a1ed39bb52f7c4d702f79154412ae9a415b65cae
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/pom.xml
Log Message:
-----------
fix cargo won't stop error
Commit: c1e59e561f4bbc496cf41ad8617af57666bf98fd
https://github.com/zanata/zanata/commit/c1e59e561f4bbc496cf41ad8617af57666bf98fd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M functional-test/pom.xml
Log Message:
-----------
fix cargo won't stop error
Commit: ffec30c5c88f3ebfc2e2b4366a648ab426b0d764
https://github.com/zanata/zanata/commit/ffec30c5c88f3ebfc2e2b4366a648ab426b0d764
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 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
Log Message:
-----------
Changed copy from TM shortcut to CTRL+ALT (1,2,3,4) to avoid key conflict: https://bugzilla.redhat.com/show_bug.cgi?id=834979
Commit: 49bd8f9b49386dfd35aa15d4c8f2aebc7a73a19e
https://github.com/zanata/zanata/commit/49bd8f9b49386dfd35aa15d4c8f2aebc7a73a19e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
Log Message:
-----------
add undo link to trans unit saved message
Commit: 3cae414df89ce54ba2dcb4460e58b011ebd1694e
https://github.com/zanata/zanata/commit/3cae414df89ce54ba2dcb4460e58b011ebd1694e
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
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/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
Log Message:
-----------
Work in progress: centralised TM copy into keyshortcut presenter
Commit: da7287f966cb3993f4c1cd2f8fb4a28ab8741437
https://github.com/zanata/zanata/commit/da7287f966cb3993f4c1cd2f8fb4a28ab8741437
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.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/service/impl/TranslationServiceImpl.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/GetTransUnitsNavigationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
rhbz831035 - Add copy trans options.
- Add very basic options for the execution of copy trans. Options in this revision include what to do on content and context mismatch (ignore, downgrade to fuzzy, or reject the translation).
- Change how copy trans executes, now looking at more than one possible translation per text flow.
- Add support for one transaction per document/locale pair.
- Add new page for copy trans to select options.
Commit: 6cafbe3919682c101ea27fdd0364098f1a406c69
https://github.com/zanata/zanata/commit/6cafbe3919682c101ea27fdd0364098f1a406c69
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.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/shared/auth/EditorClientId.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/DummyGetTranslatorListCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
Log Message:
-----------
Merge branch '1.6' into integration/master
Conflicts:
zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
Commit: f1969253f634d2cc27872d7412334996fd7f60b0
https://github.com/zanata/zanata/commit/f1969253f634d2cc27872d7412334996fd7f60b0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: 52720c0509253ba1c75dd380f9f75422769fa6e6
https://github.com/zanata/zanata/commit/52720c0509253ba1c75dd380f9f75422769fa6e6
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
Log Message:
-----------
use manual scrolling for reindex queries
Commit: 921adcecc487c349071e33f77523856a87c59fea
https://github.com/zanata/zanata/commit/921adcecc487c349071e33f77523856a87c59fea
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/project/project.xhtml
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
Log Message:
-----------
rhbz831035 - Url rewrite rule changes for copy trans page.
Also change rewrite rules and the way links are generated in the project page.
Commit: cab09a9e6bdcbf819b0677a316d8aca260c5cf62
https://github.com/zanata/zanata/commit/cab09a9e6bdcbf819b0677a316d8aca260c5cf62
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
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/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.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
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.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
Log Message:
-----------
Merge branch 'rhbz831035' into integration/master
Conflicts:
zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
zanata-war/src/main/webapp/WEB-INF/pages.xml
zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
zanata-war/src/main/webapp/iteration/view.xhtml
Commit: 29b6005154923fe627e1f7069a3d8053f2dd8b2a
https://github.com/zanata/zanata/commit/29b6005154923fe627e1f7069a3d8053f2dd8b2a
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
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/TargetContentsPresenter.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/KeyShortcutPresenter.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/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.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/TranslationPresenterTest.java
Log Message:
-----------
work in progress: centralising keyboard shortcut
Commit: 3bb24188d97264cdb691b72bb24daf7f6ca9a85a
https://github.com/zanata/zanata/commit/3bb24188d97264cdb691b72bb24daf7f6ca9a85a
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
Log Message:
-----------
Add comment on keycode used in keyboard shortcut
Commit: 706834683c1dc6825c5a5951ed77fb43d83ba0a8
https://github.com/zanata/zanata/commit/706834683c1dc6825c5a5951ed77fb43d83ba0a8
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.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
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: 5bb8d35bd4f1b21449d6e8babbd981fcb0a2f29e
https://github.com/zanata/zanata/commit/5bb8d35bd4f1b21449d6e8babbd981fcb0a2f29e
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.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/service/UserSessionService.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/shared/auth/EditorClientId.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/DummyGetTranslatorListCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
Log Message:
-----------
Merge branch 'master' into centraliseKeyboardShortcut
Commit: 2ac162ce5a6cebe51ca1bc04745ce4058cce072c
https://github.com/zanata/zanata/commit/2ac162ce5a6cebe51ca1bc04745ce4058cce072c
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
Log Message:
-----------
Work in progress: complete translationPresenter migration to new keyboard management
Commit: 7a8e4f3a5a50c26c1baa535289ffae8c12361b72
https://github.com/zanata/zanata/commit/7a8e4f3a5a50c26c1baa535289ffae8c12361b72
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.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/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
Log Message:
-----------
Work in progress: migrating editor shortcut into new keyshortcut presenter
Commit: f01ef93ff6e16ee14d745fea7c419ee9852e3dae
https://github.com/zanata/zanata/commit/f01ef93ff6e16ee14d745fea7c419ee9852e3dae
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/webapp/iteration/view.xhtml
M 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/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
Fix failing tests due to recent changes.
Also fix incorrect manual merge issues.
Commit: 11aafc9baabce3e00985e71152d4e086ac7e2ca5
https://github.com/zanata/zanata/commit/11aafc9baabce3e00985e71152d4e086ac7e2ca5
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.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
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: bccd332f4a4bfd52148717834e7d07354f905c4a
https://github.com/zanata/zanata/commit/bccd332f4a4bfd52148717834e7d07354f905c4a
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/stylesheet/base.css
Log Message:
-----------
rhbz826310 add tooltips and update strings for search administration page
Commit: 39124842a57a441aa7ee863a4ce51fcbb4f5ad88
https://github.com/zanata/zanata/commit/39124842a57a441aa7ee863a4ce51fcbb4f5ad88
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
Fix compilation error on OpenJDK platforms.
Sun JDKs seem unaffected by this.
Commit: 6a8c45b97e4d8baec7b64bf8fe6664f771aa9a52
https://github.com/zanata/zanata/commit/6a8c45b97e4d8baec7b64bf8fe6664f771aa9a52
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
Log Message:
-----------
Fix test problem by clearing hibernate cache in before and after method
Commit: 7af63dff84915f3c80cc690650ce49105e145363
https://github.com/zanata/zanata/commit/7af63dff84915f3c80cc690650ce49105e145363
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
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/KeyShortcutPresenter.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/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
Log Message:
-----------
Work in progress: centralising keyboard shortcut
Commit: 56677aeb7465a5285c0a7a1e57e70a3b6a5ae050
https://github.com/zanata/zanata/commit/56677aeb7465a5285c0a7a1e57e70a3b6a5ae050
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
Move some static strings to messages.properties
Commit: a8bff042c39e589ea7298c0646acfe79a1ee09e8
https://github.com/zanata/zanata/commit/a8bff042c39e589ea7298c0646acfe79a1ee09e8
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
Log Message:
-----------
Fix https://bugzilla.redhat.com/show_bug.cgi?id=826307 for 1.7
Commit: 07ba3e6f936bc0bbf13c9bb92f89e67183dc9541
https://github.com/zanata/zanata/commit/07ba3e6f936bc0bbf13c9bb92f89e67183dc9541
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Give editor textarea the same font as the table
Commit: 2a77a99226921d4a669ce159502dd3cf1275460a
https://github.com/zanata/zanata/commit/2a77a99226921d4a669ce159502dd3cf1275460a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
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/admin/search.xhtml
M zanata-war/src/main/webapp/stylesheet/base.css
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: d6f80e0c387f5f59af139a781ceb677b9a0c3a07
https://github.com/zanata/zanata/commit/d6f80e0c387f5f59af139a781ceb677b9a0c3a07
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Remove some redundant styling
Commit: 722b5d89750998ccc6de4821a03a862a73bc2e32
https://github.com/zanata/zanata/commit/722b5d89750998ccc6de4821a03a862a73bc2e32
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.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/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
use hibernate search in GetTransUnitListHandler
Commit: 9754c04ccec9377db7db60ec72f29047e5487859
https://github.com/zanata/zanata/commit/9754c04ccec9377db7db60ec72f29047e5487859
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
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/presenter/KeyShortcutPresenter.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/ToggleEditor.java
Log Message:
-----------
work in progress: centralising keyboard shortcut
Commit: 49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
https://github.com/zanata/zanata/commit/49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
rhbz836092 - Add assamese plural form.
Also added a default plural form (no plurals allowed by default) when no plural form is detected.
Commit: e2406f4d4655f47da865606ce86c0fb9c0ba9bc1
https://github.com/zanata/zanata/commit/e2406f4d4655f47da865606ce86c0fb9c0ba9bc1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
GUI change for on-demand copy trans.
Commit: 1fdcb698d499b9d8f63e3c853b53e38d5855b7fc
https://github.com/zanata/zanata/commit/1fdcb698d499b9d8f63e3c853b53e38d5855b7fc
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
Log Message:
-----------
Add security restrictions to copy trans pages and action classes.
Commit: 4e405272dd4f455da1609340ca1a478ff0fd1ac1
https://github.com/zanata/zanata/commit/4e405272dd4f455da1609340ca1a478ff0fd1ac1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
Log Message:
-----------
fix bug
Commit: 0074c94b6b9001ce399e88fb8b5760faef942404
https://github.com/zanata/zanata/commit/0074c94b6b9001ce399e88fb8b5760faef942404
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: fb64a3c79e222aa70c23d5416e5555246952010f
https://github.com/zanata/zanata/commit/fb64a3c79e222aa70c23d5416e5555246952010f
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
https://github.com/zanata/zanata/commit/deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Update zanata-common to 1.6.1
Commit: 7b992e7a36110a321e41b5902de4e5d5e52e3013
https://github.com/zanata/zanata/commit/7b992e7a36110a321e41b5902de4e5d5e52e3013
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
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/resources/messages.properties
Log Message:
-----------
rhbz836092 - Allowing addition of locales for which no plural information is found.
A warning will be shown when this occurs but the system won't prevent the addition of the new locale. All other locale validation rules still apply.
Commit: 0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
https://github.com/zanata/zanata/commit/0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch '1.6' of github.com:zanata/zanata into 1.6
Commit: 6baccfb516017da17584bd1e123f851b2d1bf955
https://github.com/zanata/zanata/commit/6baccfb516017da17584bd1e123f851b2d1bf955
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
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/resources/messages.properties
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: 59a8901537548d3e87812a34feca8291c7fa9cee
https://github.com/zanata/zanata/commit/59a8901537548d3e87812a34feca8291c7fa9cee
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-1.6.1-alpha-1
Commit: e7ff3dec0e6ce2ec03b7a80b522fefe57e33eba4
https://github.com/zanata/zanata/commit/e7ff3dec0e6ce2ec03b7a80b522fefe57e33eba4
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 797959740b1d2bf4bbb0d004c35561a8a371542b
https://github.com/zanata/zanata/commit/797959740b1d2bf4bbb0d004c35561a8a371542b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
refactor - rename enum names and message values to be consistent with jsf copy tran values
Commit: 4879a9fde414a2576a8282dd8e4cf40a1bcd682a
https://github.com/zanata/zanata/commit/4879a9fde414a2576a8282dd8e4cf40a1bcd682a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRadioButtonGroup.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
Log Message:
-----------
change to use radio button
Commit: f83949651a7898d4111f03cd570fe45efeb520b0
https://github.com/zanata/zanata/commit/f83949651a7898d4111f03cd570fe45efeb520b0
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/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/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.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:
-----------
compare not only res id but also msg context
Commit: 3cb21a01db4a358a71f8fe4d8adb408c8484e7c8
https://github.com/zanata/zanata/commit/3cb21a01db4a358a71f8fe4d8adb408c8484e7c8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
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
Log Message:
-----------
fix - HTextFlow.getTargets().get to use locale id
Commit: c0808c9d2efee7bba28cb3418f6564b98f72358c
https://github.com/zanata/zanata/commit/c0808c9d2efee7bba28cb3418f6564b98f72358c
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
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/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.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/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/ResourceUtils.java
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.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/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.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/MergeOptionRenderer.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/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/TransMemoryMergeHandler.java
M 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/shared/model/TransMemoryDetails.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/MergeOption.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.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/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/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/view.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/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.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
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'master' into centraliseKeyboardShortcut
Commit: e65bb107b39d896ec0b5115e7e6524eaefd383e0
https://github.com/zanata/zanata/commit/e65bb107b39d896ec0b5115e7e6524eaefd383e0
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-1.6.1
Commit: 0fedf4c9d1633a322259431433fa135f754f924d
https://github.com/zanata/zanata/commit/0fedf4c9d1633a322259431433fa135f754f924d
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 1e8f214489de64663d744185738f8c10bb821934
https://github.com/zanata/zanata/commit/1e8f214489de64663d744185738f8c10bb821934
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
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/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
rhbz826310 - update UI and progress estimation for search administration page
Commit: da5e04d729f246b83ad44d1d2f71c2881e53e8d3
https://github.com/zanata/zanata/commit/da5e04d729f246b83ad44d1d2f71c2881e53e8d3
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
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/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
Merge branch 'reindex-page' into 1.6
Commit: d72db23b7f18900c1dc428f07192044cbe5c6768
https://github.com/zanata/zanata/commit/d72db23b7f18900c1dc428f07192044cbe5c6768
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 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/editor/table/TargetContentsView.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/KeyShortcutPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
Log Message:
-----------
work in progress: implementing autosize in textarea
Commit: 55261c54418107cae433964b30609fb2c92db19c
https://github.com/zanata/zanata/commit/55261c54418107cae433964b30609fb2c92db19c
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
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/KeyShortcutPresenter.java
Log Message:
-----------
work in progress: testing in firefox
Commit: 478f13dcfc84f8b821ccb680d86159287f1b8120
https://github.com/zanata/zanata/commit/478f13dcfc84f8b821ccb680d86159287f1b8120
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
increase reindex progress bar size
Commit: 937fb5224b60126b7e987a8f2f6aaa8619b69f3c
https://github.com/zanata/zanata/commit/937fb5224b60126b7e987a8f2f6aaa8619b69f3c
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
rhbz826310 - add select and clear all for search administration page
Commit: d8c90207400a78e38b3ebb00c0113b08b4a4fa0e
https://github.com/zanata/zanata/commit/d8c90207400a78e38b3ebb00c0113b08b4a4fa0e
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
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/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
rhbz826310 - add indicator of currently processing table for search administration page
Commit: 30bb7ed679b3b15c154ddb7a3d04fbd25eb4f721
https://github.com/zanata/zanata/commit/30bb7ed679b3b15c154ddb7a3d04fbd25eb4f721
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
Log Message:
-----------
Bug 814599 - RFE: %x validation should support positional printf strings (eg %1)
Commit: af8843fc350ae737f82db0b19692e5e7de4dfee2
https://github.com/zanata/zanata/commit/af8843fc350ae737f82db0b19692e5e7de4dfee2
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
Log Message:
-----------
add test case to unit test
Commit: a80e58c1031cb167b475ba7310d6c70526c61cd6
https://github.com/zanata/zanata/commit/a80e58c1031cb167b475ba7310d6c70526c61cd6
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
Log Message:
-----------
minor - reduce log level
Commit: 44598a162280ecd1ce1d56f487a47df645ae0911
https://github.com/zanata/zanata/commit/44598a162280ecd1ce1d56f487a47df645ae0911
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Log Message:
-----------
Merge commit '0fedf4c9d1633a322259431433fa135f754f924d' into integration/master
Commit: 84640a61a1c108bb0c3543a714a6caa587574dee
https://github.com/zanata/zanata/commit/84640a61a1c108bb0c3543a714a6caa587574dee
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
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/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: b2171eb39499aca60e19be217b6c80b200b775e3
https://github.com/zanata/zanata/commit/b2171eb39499aca60e19be217b6c80b200b775e3
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
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/keys/KeyShortcut.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/TranslationPresenter.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/Editor.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/resources/org/zanata/webtrans/public/Application.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:
-----------
Centralised all keyboard shortcut into keyShortcut : https://bugzilla.redhat.com/show_bug.cgi?id=836051
Commit: 419c104a1d5bb22773a9b5a04f37ec50e6a5620b
https://github.com/zanata/zanata/commit/419c104a1d5bb22773a9b5a04f37ec50e6a5620b
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 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/InlineTargetCellEditor.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/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/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/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/Editor.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/KeyShortcutView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
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/TranslationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
Log Message:
-----------
Merge branch 'centraliseKeyboardShortcut' into integration/master
Commit: a23e41582561351f00d77a5540d00c73411b5ddf
https://github.com/zanata/zanata/commit/a23e41582561351f00d77a5540d00c73411b5ddf
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
Log Message:
-----------
rhbz707102 - Remove source locale validation when pushing documents.
Commit: 18fb256450291265aa4b2c8bd575c7aa695905a7
https://github.com/zanata/zanata/commit/18fb256450291265aa4b2c8bd575c7aa695905a7
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
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/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/InlineTargetCellEditor.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/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/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/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/Editor.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/KeyShortcutView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/webapp/admin/search.xhtml
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/TranslationPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: fadfe7202bcc4f3d63e9af03e2a7fee5eb3558e9
https://github.com/zanata/zanata/commit/fadfe7202bcc4f3d63e9af03e2a7fee5eb3558e9
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java
Log Message:
-----------
undo failure handling and notification message
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: 492ba79c48e66265bc650d6d5940a8660cfa09d5
https://github.com/zanata/zanata/commit/492ba79c48e66265bc650d6d5940a8660cfa09d5
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
Log Message:
-----------
Revert "rhbz707102 - Remove source locale validation when pushing documents."
This reverts commit a23e41582561351f00d77a5540d00c73411b5ddf.
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: eeab735f74408a25d852687ac77ebfeb2c0153c3
https://github.com/zanata/zanata/commit/eeab735f74408a25d852687ac77ebfeb2c0153c3
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
Log Message:
-----------
rhbz707102 - Add en-US by default to a Zanata instance, but don't enable it by default.
Commit: 8923fdec10618781e8fa9df65e7773ce72918a23
https://github.com/zanata/zanata/commit/8923fdec10618781e8fa9df65e7773ce72918a23
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnitResult.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
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: 4d2e2c4dbccb1a5fc01c39199524f942d7891eab
https://github.com/zanata/zanata/commit/4d2e2c4dbccb1a5fc01c39199524f942d7891eab
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
Log Message:
-----------
rhbz707102 - Fix functional tests due to changes in essential data creation.
Commit: ccfd88441ab53b12c27acc642b37f86e4a6b7dbf
https://github.com/zanata/zanata/commit/ccfd88441ab53b12c27acc642b37f86e4a6b7dbf
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/webapp/iteration/files.xhtml
Log Message:
-----------
rhbz830009 - Source locale is now selectable when uploading documents.
The default language is en-US when enabled, otherwise it will default to the first available language.
Commit: fe197492717517490bf456ab4dbffe5b29e387e7
https://github.com/zanata/zanata/commit/fe197492717517490bf456ab4dbffe5b29e387e7
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/webapp/iteration/files.xhtml
Log Message:
-----------
rhbz830009 - Source locale is now selectable when uploading documents.
The default language is en-US when enabled, otherwise it will default to the first available language.
Commit: 1f7a5769f64017a226c50895b34a0853f40c7ef9
https://github.com/zanata/zanata/commit/1f7a5769f64017a226c50895b34a0853f40c7ef9
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: 20c8a93dfca8ea29ae90abe184ced9aa85cf4f12
https://github.com/zanata/zanata/commit/20c8a93dfca8ea29ae90abe184ced9aa85cf4f12
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/presenter/SearchResultsPresenter.java
Log Message:
-----------
Work in progress: moving search and replace notification into top
Commit: e4c1e351932a9210fdcb1b6cfb0a9310bc780f78
https://github.com/zanata/zanata/commit/e4c1e351932a9210fdcb1b6cfb0a9310bc780f78
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Move lucene.version into server pom
Commit: 670b4080494e8e1a953f45c983ee7786be300967
https://github.com/zanata/zanata/commit/670b4080494e8e1a953f45c983ee7786be300967
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Revert lucene.version to 2.9.2
Commit: 93dc850985aba8174c58a93bceaf153e4c89f7ed
https://github.com/zanata/zanata/commit/93dc850985aba8174c58a93bceaf153e4c89f7ed
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/dao/ProjectIterationDAO.java
Log Message:
-----------
Include version group project search through name and slug: https://bugzilla.redhat.com/show_bug.cgi?id=837477
Commit: ec579952f5c3d09cb18950e799b06b458362809a
https://github.com/zanata/zanata/commit/ec579952f5c3d09cb18950e799b06b458362809a
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: 8a96d98b918b588cf6e5729be4664d619552f30c
https://github.com/zanata/zanata/commit/8a96d98b918b588cf6e5729be4664d619552f30c
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/dao/ProjectIterationDAO.java
Log Message:
-----------
Make case insensitive for version group search project slug, name and version slug
Commit: 0f276b09d02b4f8148879bd1e4c620edaccd990a
https://github.com/zanata/zanata/commit/0f276b09d02b4f8148879bd1e4c620edaccd990a
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/presenter/SearchResultsPresenter.java
Log Message:
-----------
Make 'select all' un-select all when uncheck: https://bugzilla.redhat.com/show_bug.cgi?id=826783
Commit: 3648abc232e519580ae3d8d217fdb0ed97f452c3
https://github.com/zanata/zanata/commit/3648abc232e519580ae3d8d217fdb0ed97f452c3
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
Log Message:
-----------
toggle registration of Enter and Esc key shortcuts depending on user config settings
Commit: fa15a55fe8033705cce4f7ffd3ebf5bb97ff696d
https://github.com/zanata/zanata/commit/fa15a55fe8033705cce4f7ffd3ebf5bb97ff696d
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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/OptionsPanelPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.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/OptionsPanelPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
Log Message:
-----------
rename user config members to describe their intent
Commit: 222158c16b30be644ccf7dc463348772f397f05f
https://github.com/zanata/zanata/commit/222158c16b30be644ccf7dc463348772f397f05f
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
Log Message:
-----------
add constant for no modifier in key shortcut
Commit: 855c986b5eb9d340f3c616fe209b5588e8205e5b
https://github.com/zanata/zanata/commit/855c986b5eb9d340f3c616fe209b5588e8205e5b
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
Log Message:
-----------
update test for UserConfigHolder
Commit: 4aa34395f122392df66ce826cb55065b78ecdb20
https://github.com/zanata/zanata/commit/4aa34395f122392df66ce826cb55065b78ecdb20
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.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/TableEditorMessages.java
Log Message:
-----------
remove redundant display flag from KeyShortcut
Commit: 9627145ed63ab8392f7765f3222245de6494f71e
https://github.com/zanata/zanata/commit/9627145ed63ab8392f7765f3222245de6494f71e
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
Log Message:
-----------
use enum for key event types in KeyShortcut
Commit: 489e2c86fd51f345f7eca2ba930a84bb9ac688ba
https://github.com/zanata/zanata/commit/489e2c86fd51f345f7eca2ba930a84bb9ac688ba
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M functional-test/pom.xml
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/RevertTransUnitUpdateLink.java
Log Message:
-----------
update undo unsuccessful message and TranslationServiceImpl to work on null history
Commit: d00bf4f23fc51ce4935585674da16025f6a071db
https://github.com/zanata/zanata/commit/d00bf4f23fc51ce4935585674da16025f6a071db
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M functional-test/pom.xml
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
Log Message:
-----------
define testng group and suite
Commit: 6b1f1472d17ab1f949029adc53d65e6c4126ed99
https://github.com/zanata/zanata/commit/6b1f1472d17ab1f949029adc53d65e6c4126ed99
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/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/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:
-----------
Work in progress: moving search and replace notification into top
Commit: 458310dbc1f28e97a53d0a9f2b3a025a7e65d8db
https://github.com/zanata/zanata/commit/458310dbc1f28e97a53d0a9f2b3a025a7e65d8db
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M functional-test/pom.xml
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/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/RevertTransUnitUpdateLink.java
Log Message:
-----------
Merge branch 'master' into rhbz831042
Conflicts:
zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
Commit: ac5fea6b762d6d43446918f6b254decb8f364fb5
https://github.com/zanata/zanata/commit/ac5fea6b762d6d43446918f6b254decb8f364fb5
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 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/ui/HasUndoHandler.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
Log Message:
-----------
Add comment in class
Commit: f9abcb8f0ae7085b9293ea141736f8b3d3419b85
https://github.com/zanata/zanata/commit/f9abcb8f0ae7085b9293ea141736f8b3d3419b85
Author: Alex Eng <aeng at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
Log Message:
-----------
Rename method name
Commit: f6df79ef146ea9caeba9317d0340aa765d5acdd2
https://github.com/zanata/zanata/commit/f6df79ef146ea9caeba9317d0340aa765d5acdd2
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
minor
Commit: 6c82d171580a43b4d5354520246b6d6f9ebdc42d
https://github.com/zanata/zanata/commit/6c82d171580a43b4d5354520246b6d6f9ebdc42d
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M functional-test/pom.xml
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 zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/RevertTransUnitUpdateLink.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/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
Merge branch 'master' into key-shortcut-aliases
Commit: 9e37b9b5f2c08e18efc422b2deec30a18d0074f0
https://github.com/zanata/zanata/commit/9e37b9b5f2c08e18efc422b2deec30a18d0074f0
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.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/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Work in progress: increase notification height and scrollbar
Commit: d1fdda526861a64880d0b505d0974949816e142a
https://github.com/zanata/zanata/commit/d1fdda526861a64880d0b505d0974949816e142a
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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/SurplusKeyListener.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
Log Message:
-----------
rhbz836051 use separate class to listen for non-shortcut key events
Commit: 1240f4baabb15fcfc764a7e0985b57fd557b2130
https://github.com/zanata/zanata/commit/1240f4baabb15fcfc764a7e0985b57fd557b2130
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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/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/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/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.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
Log Message:
-----------
rhbz836051 shorten key shortcut registration method
Commit: 7f6a8e26b520df84ca8111143e602e4cc72ae041
https://github.com/zanata/zanata/commit/7f6a8e26b520df84ca8111143e602e4cc72ae041
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-04 (Wed, 04 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
Log Message:
-----------
rhbz836051 arrange key shortcut constructor arguments for readability
Commit: 301f0edc69240843e33a517a7bfb2510369044b5
https://github.com/zanata/zanata/commit/301f0edc69240843e33a517a7bfb2510369044b5
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
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/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/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/view/KeyShortcutView.java
Log Message:
-----------
rhbz836051 replace key code and modifiers in KeyShortcut with Keys object
Commit: 6c3ffbde82e025c63d36a8653a885d2182d4ae9a
https://github.com/zanata/zanata/commit/6c3ffbde82e025c63d36a8653a885d2182d4ae9a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.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/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
Log Message:
-----------
Bug 814599 - RFE: %x validation should support positional printf strings (eg %1$s)
- added error message for specific positional variables related case
- added special check to detect various position related error
Commit: c243afada98bcb1bc3f17c2baf4681be5e1f0a4e
https://github.com/zanata/zanata/commit/c243afada98bcb1bc3f17c2baf4681be5e1f0a4e
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.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/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
Log Message:
-----------
rhbz836051 change uses of key code and modifiers in KeyShortcut to use Keys objects
Commit: 51aefaec0d92c18a4b351ab27fdaba01b6c14e8f
https://github.com/zanata/zanata/commit/51aefaec0d92c18a4b351ab27fdaba01b6c14e8f
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
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
M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.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/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
Log Message:
-----------
Merge branch 'key-shortcut-aliases' into integration/master
Commit: 47e936200af13ebe5e12730b52a398b412f2a373
https://github.com/zanata/zanata/commit/47e936200af13ebe5e12730b52a398b412f2a373
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
Log Message:
-----------
Increase notification messages to keep, moved search and replace messages into top, https://bugzilla.redhat.com/show_bug.cgi?id=831042
Commit: 3b4b75db78f3f56ad0688d16f446c231bbb51cbf
https://github.com/zanata/zanata/commit/3b4b75db78f3f56ad0688d16f446c231bbb51cbf
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
Log Message:
-----------
Fix test, removed test data
Commit: f417b70b3f3da5c9c9d6e3403739089e688b285d
https://github.com/zanata/zanata/commit/f417b70b3f3da5c9c9d6e3403739089e688b285d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
Log Message:
-----------
rhbz836946 Add plural information for new Indic languages
Commit: dbdff9c9ad1b3c1e5ed0d9381472ad669da42915
https://github.com/zanata/zanata/commit/dbdff9c9ad1b3c1e5ed0d9381472ad669da42915
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: f409aff1a023e65b2986c2e6b6856dd46fb15c15
https://github.com/zanata/zanata/commit/f409aff1a023e65b2986c2e6b6856dd46fb15c15
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
Log Message:
-----------
Fix potential OutOfMemoryError in Levenshtein algorithm
Commit: c55494276451c0e01b944e55035a2b6eb8543d35
https://github.com/zanata/zanata/commit/c55494276451c0e01b944e55035a2b6eb8543d35
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
A zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
A zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
Log Message:
-----------
Add word/token-based Levenshtein distance calculation (not activated yet)
Commit: 9d6128bbc7086227454869afeaecab78109782aa
https://github.com/zanata/zanata/commit/9d6128bbc7086227454869afeaecab78109782aa
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/NotificationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/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/resources/org/zanata/webtrans/public/Application.css
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
Log Message:
-----------
Merge branch 'rhbz831042' into integration/master
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
Compare: https://github.com/zanata/zanata/compare/b56cd95b2b36...5ce31190a7e5
More information about the zanata-commits
mailing list