Branch: refs/heads/ZNTA-942-oauth
Home: https://github.com/zanata/zanata-server
Commit: e903eeebdfd39f2810650e13ed271c71ec45c6ec
https://github.com/zanata/zanata-server/commit/e903eeebdfd39f2810650e13ed271c71ec45c6ec
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
A
zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.java
Log Message:
-----------
fix(ZNTA-1174): hold OpenIdProviderType for secondary authentication
Commit: fd6fead4b85eaf632a0234ca1d8f78a0ea99f388
https://github.com/zanata/zanata-server/commit/fd6fead4b85eaf632a0234ca1d8f78a0ea99f388
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M
zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
M
zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
Log Message:
-----------
fix(ZNTA-1174): preserve dswid during OpenID authentication
Commit: 3bbb0b4f6223e4c11646e3acaa31612a6765258d
https://github.com/zanata/zanata-server/commit/3bbb0b4f6223e4c11646e3acaa31612a6765258d
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
M
zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M 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/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/HomePage.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M
zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M
zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSearch.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.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/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
Log Message:
-----------
fix(ZNTA-1174): mark JSF action classes with @Model @Transactional
Commit: 246fdc07a0118e6c681bd8f5054686511ae92374
https://github.com/zanata/zanata-server/commit/246fdc07a0118e6c681bd8f5054686511ae92374
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
A zanata-war/src/main/java/org/zanata/ui/TransactionPhaseListener.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
fix(ZNTA-1174): add TransactionPhaseListener to bring back Seam's transaction
model for JSF
Commit: 2746c28d88c6af38c6b66bdf421e026ca0b638c2
https://github.com/zanata/zanata-server/commit/2746c28d88c6af38c6b66bdf421e026ca0b638c2
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M
zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.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/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M
zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
Log Message:
-----------
fix(ZNTA-1174): add @Transactional to most services, including REST
Commit: ded1abfcb22fb2add894de20f93f463a0b6eaa9f
https://github.com/zanata/zanata-server/commit/ded1abfcb22fb2add894de20f93f463a0b6eaa9f
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M
zanata-war/src/main/java/org/zanata/exception/handler/AbstractExceptionHandler.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
Log Message:
-----------
refactor: UrlUtil.redirectTo -> UrlUtil.redirectToInternal
Commit: f9c0d880b8569ee54cb134fb22c594310908dd46
https://github.com/zanata/zanata-server/commit/f9c0d880b8569ee54cb134fb22c594310908dd46
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
M
zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M 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/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/HomePage.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M
zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M
zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSearch.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.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/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
M
zanata-war/src/main/java/org/zanata/exception/handler/AbstractExceptionHandler.java
M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
M
zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M
zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
A
zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.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/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M
zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/TransactionPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
Merge pull request #1208 from zanata/ZNTA-1174-fix-connect-OpenID
fix(ZNTA-1174): add OpenID credentials, transactions not committed
Commit: 31e5b836c12d776c251c17f5b16d2d75549be66b
https://github.com/zanata/zanata-server/commit/31e5b836c12d776c251c17f5b16d2d75549be66b
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
M
zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M 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/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/HomePage.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M
zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M
zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSearch.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M
zanata-war/src/main/java/org/zanata/exception/handler/AbstractExceptionHandler.java
M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
M
zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M
zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
A
zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.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/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M
zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/TransactionPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/release'
Commit: b4886dc915b197061bd5efa3d14b5f3db7c3f68e
https://github.com/zanata/zanata-server/commit/b4886dc915b197061bd5efa3d14b5f3db7c3f68e
Author: Sean Flanigan <sflan...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
Log Message:
-----------
Fix compilation error caused by merge
Commit: f6231d7d1013e4ce478f16fd5d1c83ee746e6e0b
https://github.com/zanata/zanata-server/commit/f6231d7d1013e4ce478f16fd5d1c83ee746e6e0b
Author: Patrick Huang <pahu...@redhat.com>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
M
zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M 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/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/HomePage.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M
zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
M zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M
zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSearch.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M
zanata-war/src/main/java/org/zanata/exception/handler/AbstractExceptionHandler.java
M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
M
zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M
zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M
zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
A
zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderTypeHolder.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/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M
zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/TransactionPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into ZNTA-942-oauth
Compare:
https://github.com/zanata/zanata-server/compare/ae792bdb9918...f6231d7d1013_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits
