[zanata/zanata-server] 374452: Merge branch 'master' into ZNTA-938

[GitHub]

  Branch: refs/heads/ZNTA-938
  Home:   https://github.com/zanata/zanata-server
  Commit: 374452127f894d9115b27e33084cd9818eda8874
      https://github.com/zanata/zanata-server/commit/374452127f894d9115b27e33084cd9818eda8874
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    A docs/css/extra.css
    M docs/release-notes.md
    M docs/user-guide/system-admin/configuration/authentication.md
    M docs/user-guide/system-admin/configuration/document-storage-directory.md
    M docs/user-guide/system-admin/configuration/installation.md
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    A zanata-war/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.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/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    R zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticatedAccountSessionScopeHolder.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.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/ZanataCentralLoginModule.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/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/KLoginServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M zanata-war/src/main/java/org/zanata/util/FacesNavigationUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_members_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/account/klogin.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    R zanata-war/src/test/java/org/zanata/config/JndiBackedConfigITCase.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-938