[zanata/zanata-server] 1d6ec8: Merge remote-tracking branch 'origin/master' into ...
GitHub
noreply at github.com
Mon May 5 23:56:07 UTC 2014
Branch: refs/heads/gwt260
Home: https://github.com/zanata/zanata-server
Commit: 1d6ec806dc18a5ab4bbab8983ebd987269338dfd
https://github.com/zanata/zanata-server/commit/1d6ec806dc18a5ab4bbab8983ebd987269338dfd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-05-06 (Tue, 06 May 2014)
Changed paths:
A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
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-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.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/SearchIndexManager.java
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/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/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.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/SourcePanel.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/AttentionKeyShortcutView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.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/LoadOptionsHandler.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
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
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/project/project.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
R 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
A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gwt260
Conflicts:
zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
More information about the zanata-commits
mailing list