[zanata/zanata] 4b171f: add javamelody storage-directory
GitHub
noreply at github.com
Mon May 28 22:24:41 UTC 2012
Branch: refs/heads/LayoutSelection
Home: https://github.com/zanata/zanata
Commit: 4b171f1156274d0490a6afce27cfd4b7bece5821
https://github.com/zanata/zanata/commit/4b171f1156274d0490a6afce27cfd4b7bece5821
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
add javamelody storage-directory
Commit: 382ad6011a964c2324063fbc87c435401dca0e68
https://github.com/zanata/zanata/commit/382ad6011a964c2324063fbc87c435401dca0e68
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M zanata-model/pom.xml
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
Log Message:
-----------
add javamelody storage and update server.pom
Commit: fb450e293676285c5a4e33a5925d0a2f12a31a48
https://github.com/zanata/zanata/commit/fb450e293676285c5a4e33a5925d0a2f12a31a48
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
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/service/impl/CopyTransServiceImpl.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
rhbz825076 - Proper handling of duplicate text flows in copy trans.
Copy trans now handles text flows with duplicate content in the same document while doing copy trans.
Hide a few properties on entities that should not ve visible but were made so by lombok.
Commit: f724eb8aea5f090b69c8fecdc1c26594af65376e
https://github.com/zanata/zanata/commit/f724eb8aea5f090b69c8fecdc1c26594af65376e
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-24 (Thu, 24 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/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:
-----------
adjust preview/replace selected layout and behaviour
Commit: 618f5fc3c9f54469fb9c19f8ecf5e1750d96898f
https://github.com/zanata/zanata/commit/618f5fc3c9f54469fb9c19f8ecf5e1750d96898f
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
Log Message:
-----------
fix code indentation
Commit: e67b310787526604a622ea8a5473e6706f5088b2
https://github.com/zanata/zanata/commit/e67b310787526604a622ea8a5473e6706f5088b2
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-24 (Thu, 24 May 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/webtrans/client/presenter/AppPresenter.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/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/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-jboss/WEB-INF/web.xml
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: 25308ba5d529f553ebda70a5aba0f2d8f917d2f1
https://github.com/zanata/zanata/commit/25308ba5d529f553ebda70a5aba0f2d8f917d2f1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
making javamelody storage location a configurable property
Commit: 8e7926a4710096de3129b08bd52ef0d6e76fcf88
https://github.com/zanata/zanata/commit/8e7926a4710096de3129b08bd52ef0d6e76fcf88
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
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/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
Log Message:
-----------
add separate preview state for replace info model, prevent no-op rpc calls, add copyright notices
Commit: a17b393a30896519adbdcef7aea84d76c4039865
https://github.com/zanata/zanata/commit/a17b393a30896519adbdcef7aea84d76c4039865
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
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
Log Message:
-----------
add plural forms to reduce gwt compiler warnings
Commit: 588b747645d7a8323787fe5cfe93de1e9e7733fe
https://github.com/zanata/zanata/commit/588b747645d7a8323787fe5cfe93de1e9e7733fe
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M zanata-war/pom.xml
A zanata-war/src/etc/properties-service-sample.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
Log Message:
-----------
add properties-service.xml sample file
Commit: db612503aedb710f87cf2dc104e4e686797bd48c
https://github.com/zanata/zanata/commit/db612503aedb710f87cf2dc104e4e686797bd48c
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
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/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/ui/SearchResultsDocumentTable.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into integration/master
Commit: 6cd5d28fda4cd586fd95fa43a8c169942d8bb7b8
https://github.com/zanata/zanata/commit/6cd5d28fda4cd586fd95fa43a8c169942d8bb7b8
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CellTableResources.css
Log Message:
-----------
use less obtrusive colours in celltable headers
Commit: aefef9c2fee463803475f6cf95853998a04e4a74
https://github.com/zanata/zanata/commit/aefef9c2fee463803475f6cf95853998a04e4a74
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-25 (Fri, 25 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/CellTableResources.css
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/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
split preview/replace column into separate columns
Commit: 78f01bd67128ed8bcc0b677b76a0291d910b052d
https://github.com/zanata/zanata/commit/78f01bd67128ed8bcc0b677b76a0291d910b052d
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-25 (Fri, 25 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
Log Message:
-----------
fix project read-only check
Commit: e222b420047173c0d5dd9e3e84cf44c924648474
https://github.com/zanata/zanata/commit/e222b420047173c0d5dd9e3e84cf44c924648474
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-25 (Fri, 25 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/view/SearchResultsView.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
disable replace buttons in read-only mode
Commit: 49d66e5c7e5564cb1c7676a7efedfdb396a58b67
https://github.com/zanata/zanata/commit/49d66e5c7e5564cb1c7676a7efedfdb396a58b67
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-27 (Sun, 27 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
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/gin/WebTransClientModule.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
A 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/resources/WebTransMessages.java
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/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
Log Message:
-----------
add global key shortcut handler and some shortcuts for search page. Alt+K to show shortcuts.
Commit: e9f0e70faa6aad7a90bd85b4a40021d9c8b5f597
https://github.com/zanata/zanata/commit/e9f0e70faa6aad7a90bd85b4a40021d9c8b5f597
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
Log Message:
-----------
show no-results label before any search has run
Commit: d332c1fcd872a5b0cbbed815cf9cece17b741ca5
https://github.com/zanata/zanata/commit/d332c1fcd872a5b0cbbed815cf9cece17b741ca5
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-27 (Sun, 27 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/server/rpc/GetProjectTransUnitListsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java
Log Message:
-----------
show searched phrase in search results message
Commit: c518449c38492b4b7433539beed50837e5fb97d1
https://github.com/zanata/zanata/commit/c518449c38492b4b7433539beed50837e5fb97d1
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/shared/rpc/GetDocumentList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
Log Message:
-----------
limite project-wide search to url-filtered documents
Commit: b3d800f7c05eb27051fab64eb56733b75e5c6162
https://github.com/zanata/zanata/commit/b3d800f7c05eb27051fab64eb56733b75e5c6162
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-05-27 (Sun, 27 May 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/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
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/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/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/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/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/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/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
Log Message:
-----------
Rename SessionId to EditorClientId, generate EditorClientId per connection (not per HTTP session)
Commit: da210ee814c6f4b5b89a3ce12681f75de67167e7
https://github.com/zanata/zanata/commit/da210ee814c6f4b5b89a3ce12681f75de67167e7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
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/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/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/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.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/TargetContentsPresenter.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/gin/WebTransClientModule.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
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/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/ui/CellTableResources.css
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/view/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/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.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/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/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/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 integration/master
Commit: e732a7241a744deca54b0d5946a3f84959eea59f
https://github.com/zanata/zanata/commit/e732a7241a744deca54b0d5946a3f84959eea59f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.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
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/shared/rpc/GetDocumentList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
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
Compare: https://github.com/zanata/zanata/compare/a1694d8...3d7c82c
More information about the zanata-commits
mailing list