[zanata/zanata-server] f75a66: Squashed commit of the following:
GitHub
noreply at github.com
Wed Jan 14 03:42:37 UTC 2015
Branch: refs/heads/master
Home: https://github.com/zanata/zanata-server
Commit: f75a66b6146d06a46728bc234db8675c0e6a75b8
https://github.com/zanata/zanata-server/commit/f75a66b6146d06a46728bc234db8675c0e6a75b8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/test/java/org/ForceLoadClass.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
Log Message:
-----------
Squashed commit of the following:
commit 46f51a368ab7daf3ca7289cbccfc4c5bd040a625
Merge: a76a174 b09e616
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Wed Jan 14 11:14:37 2015 +1000
Merge remote-tracking branch 'origin/master' into fix-formatting
Conflicts:
functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
commit a76a1742ebc68da04f1bd7b69da4a56ef4c22986
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Fri Dec 5 11:43:08 2014 +1000
Fix formatting
More information about the zanata-commits
mailing list