[zanata/zanata-server] 6b22e3: Merge remote-tracking branch 'origin/master' into ...

GitHub noreply at github.com
Fri Mar 18 06:50:54 UTC 2016 

  Branch: refs/heads/ZNTA-537_view_expired_exceptions
  Home:   https://github.com/zanata/zanata-server
  Commit: 6b22e3987d18b654476cfa4de9212f4380ce9558
      https://github.com/zanata/zanata-server/commit/6b22e3987d18b654476cfa4de9212f4380ce9558
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
    M CONTRIBUTING.md
    M docs/release-notes.md
    M docs/user-guide/account/account-sign-up.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/system-admin/configuration/authentication.md
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    A functional-test/src/main/java/org/zanata/page/DswidParamChecker.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/WebDriverLogException.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    A functional-test/src/main/java/org/zanata/util/WebDriverLogWait.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    A functional-test/src/test/groovy/org/zanata/util/ProcessPortInfo.groovy
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    A functional-test/src/test/resources/zanata-testing-extension/chrome/finished.js
    A functional-test/src/test/resources/zanata-testing-extension/chrome/idle.js
    A functional-test/src/test/resources/zanata-testing-extension/chrome/inject.js
    A functional-test/src/test/resources/zanata-testing-extension/chrome/manifest.json
    A functional-test/src/test/resources/zanata-testing-extension/chrome/startup.js
    A lombok.config
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/test/BadResponseFilter.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    A zanata-test-war/src/main/resources/META-INF/web-fragment.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java
    M zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    R zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    A zanata-war/src/main/java/org/zanata/action/JavaScriptTestHelper.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/ProjectAndVersionSlug.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.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/ProjectSlug.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleId.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupSlug.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/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/config/JsfModuleConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.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/ZanataServiceExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
    R zanata-war/src/main/java/org/zanata/seam/framework/Controller.java
    M zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    R zanata-war/src/main/java/org/zanata/seam/framework/Home.java
    R zanata-war/src/main/java/org/zanata/seam/framework/MutableController.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.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/jaas/InternalLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/GenericOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/MyOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/YahooOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionProvider.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/DuplicateParamFilter.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/RequestLoggingFilter.java
    A zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/util/DeltaSpikeWindowIdParam.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/ApplicationChromeFirefox.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/ApplicationGecko18.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/ApplicationSafari.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/AbstractAsyncCallback.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    R zanata-war/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
    A zanata-war/src/main/resources/META-INF/validation.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    R zanata-war/src/main/resources/seam.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    R zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.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/create_user.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/resources/script/components-script.js
    R zanata-war/src/main/webapp/resources/script/jquery-2.0.3-min.js
    R zanata-war/src/main/webapp/resources/script/test/finished.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/person-tile.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireInstance.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    A zanata-war/src/test/java/org/zanata/test/CdiUnitRunnerWithParameters.java
    A zanata-war/src/test/java/org/zanata/test/ParamTestCdiExtension.java
    M zanata-war/src/test/java/org/zanata/util/ServiceLocatorTest.java
    A zanata-war/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-537_view_expired_exceptions

More information about the zanata-commits mailing list