[zanata/zanata-server] 748829: [zanata-release-branching] development version is ...

Tue Jun 7 00:20:38 UTC 2016

  Branch: refs/heads/ZNTA-1145
  Home:   https://github.com/zanata/zanata-server
  Commit: 7488296cb846b5b6ea017c83648412b2f90e4bdd
      https://github.com/zanata/zanata-server/commit/7488296cb846b5b6ea017c83648412b2f90e4bdd
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M frontend/pom.xml
    M functional-test/pom.xml
    M pom.xml
    M zanata-liquibase/pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [zanata-release-branching] development version is now 4.0.0-SNAPSHOT

  Commit: 2bb773f3eb4feb183c3a3e9aa6d9bf7e1ebf7c32
      https://github.com/zanata/zanata-server/commit/2bb773f3eb4feb183c3a3e9aa6d9bf7e1ebf7c32
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Log Message:
  -----------
  Merge commit 'afd183438a3eae72e15cfd855ee199e3c06501b9' into HEAD

  Commit: 5bf24bab850bb05901c3aa8a8b1d7d27e6f7fd47
      https://github.com/zanata/zanata-server/commit/5bf24bab850bb05901c3aa8a8b1d7d27e6f7fd47
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge commit 'dbe9cb6a6572752622f86e114796ccb48626de4b' into HEAD

  Commit: c6cefb40d35e4dfa19d6018119657a4e95230bd4
      https://github.com/zanata/zanata-server/commit/c6cefb40d35e4dfa19d6018119657a4e95230bd4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Control CORS with system property

  Commit: df69e4482b929208f7e31f88a6637fc256790119
      https://github.com/zanata/zanata-server/commit/df69e4482b929208f7e31f88a6637fc256790119
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M docs/user-guide/system-admin/configuration/installation.md

  Log Message:
  -----------
  Add CORS property to installation docs

  Commit: 79649a66dbf5cabc56bd3855e780de0e1f0cf35a
      https://github.com/zanata/zanata-server/commit/79649a66dbf5cabc56bd3855e780de0e1f0cf35a
  Author: arm <armagan.ersoz at gmail.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml

  Log Message:
  -----------
  fix(ZNTA-470): contact admin validation and workflow (#1141)

* contact admin text field validation has been added and the workflow of sending process has been fixed

* code style fixed

* forgot to remove unncessary comment line

* checked the visibility of the error span

* changing the way of getting error field and a few edits

  Commit: 12c300d247be63bbac3ecc81294155c2ae1aa045
      https://github.com/zanata/zanata-server/commit/12c300d247be63bbac3ecc81294155c2ae1aa045
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Log Message:
  -----------
  Merge commit 'a39a548b25eb1b65e721823c3768291f84dc1c3b' into HEAD

  Commit: e5f38f23dc7fb91801d8c6e5784eec365d45d837
      https://github.com/zanata/zanata-server/commit/e5f38f23dc7fb91801d8c6e5784eec365d45d837
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-06 (Fri, 06 May 2016)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml

  Log Message:
  -----------
  Merge commit 'b83ac7387ddb5b0f484c8eae7f13f4e94ab4db98' into HEAD

  Commit: 36095045dea24ce6b52ef7d56afb6b26c48849bb
      https://github.com/zanata/zanata-server/commit/36095045dea24ce6b52ef7d56afb6b26c48849bb
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-06 (Fri, 06 May 2016)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx

  Log Message:
  -----------
  Merge commit '55d965a4658e1dc1b31caa1df06eb3bd25703ce3' into HEAD

  Commit: 34005bb782b2b55ffb4f5f645a6d77b7fcf940c1
      https://github.com/zanata/zanata-server/commit/34005bb782b2b55ffb4f5f645a6d77b7fcf940c1
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M frontend/src/main/web/lib/components/MessageModal.jsx

  Log Message:
  -----------
  Merge commit 'c9dcb23c6215cee1ec7e4a7e5444bc776fae6403' into HEAD

  Commit: db67490fa251a0f32c6e994633831c4e4eef4e75
      https://github.com/zanata/zanata-server/commit/db67490fa251a0f32c6e994633831c4e4eef4e75
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Merge commit '39629b1d569523f184161301c2a6ec6e481dc1a9' into HEAD

  Commit: fc8fac01467e202b94dc724b759ec16faedede9f
      https://github.com/zanata/zanata-server/commit/fc8fac01467e202b94dc724b759ec16faedede9f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M zanata-war/src/main/resources/messages_ca.properties
    A zanata-war/src/main/resources/messages_en_US.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties

  Log Message:
  -----------
  Fetch updated translations from translate.zanata.org

  Commit: 3fc2784a77b769d12e4193c4288755d51e242970
      https://github.com/zanata/zanata-server/commit/3fc2784a77b769d12e4193c4288755d51e242970
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java

  Log Message:
  -----------
  feat(shortcut): add shortcut for approve and reject translation (#1148)

https://zanata.atlassian.net/browse/ZNTA-746

  Commit: 971160914253207bd458a12f4928ac301aea6d10
      https://github.com/zanata/zanata-server/commit/971160914253207bd458a12f4928ac301aea6d10
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/servlet/DuplicateParamFilter.java
    A zanata-war/src/test/java/org/zanata/servlet/DuplicateParamFilterTest.java

  Log Message:
  -----------
  Merge commit '5a6f42d9dcee3b286ad88338e7df6675ee2393ff' into HEAD

  Commit: acbdd7cba972abae40781792d928d215542f2767
      https://github.com/zanata/zanata-server/commit/acbdd7cba972abae40781792d928d215542f2767
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies

  Commit: 3a773e539c37600ddcb659f45cfd8c98f4b7f61e
      https://github.com/zanata/zanata-server/commit/3a773e539c37600ddcb659f45cfd8c98f4b7f61e
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Log Message:
  -----------
  Merge branch 'release'

  Commit: 25bff0aac7f3f39611480f8ca75a74a4387badf6
      https://github.com/zanata/zanata-server/commit/25bff0aac7f3f39611480f8ca75a74a4387badf6
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependency): Bump up commons-codec to 1.10 to match the one in parent

  Commit: 463bef8a5ac655972d487af3cfb30d28147fc4a1
      https://github.com/zanata/zanata-server/commit/463bef8a5ac655972d487af3cfb30d28147fc4a1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M docs/release-notes.md
    M functional-test/pom.xml
    M pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(merge): fix merge conflict

Merge branch 'release'

  Commit: 7dd4ea0ee9835cbad1108cd6c8a093968675734f
      https://github.com/zanata/zanata-server/commit/7dd4ea0ee9835cbad1108cd6c8a093968675734f
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  fix(merge): exclude org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec

  Commit: 71b7b3bb1e5ab4c0e1bf16672a244142704857b8
      https://github.com/zanata/zanata-server/commit/71b7b3bb1e5ab4c0e1bf16672a244142704857b8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    A docs/css/extra.css
    M mkdocs.yml

  Log Message:
  -----------
  docs: bring styles in line with Zanata app styles

See https://github.com/zanata/zanata-server/pull/1145

  Commit: 8fbc422f2a6d0883beda482b50fa2da4110b0ce2
      https://github.com/zanata/zanata-server/commit/8fbc422f2a6d0883beda482b50fa2da4110b0ce2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleSelectorAction.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/jpa/EntityManagerProducer.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/ZanataCredentials.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Merge commit 'b04d50e4cae5bc433da15e2dc8fd6e099d80622a' into HEAD

  Commit: db79c8d34c1d1529d7499ec567efe1debba2bb8f
      https://github.com/zanata/zanata-server/commit/db79c8d34c1d1529d7499ec567efe1debba2bb8f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Disable CORS headers if originWhitelist is not set

Also disable CORS response headers if Origin header is missing from
request.

  Commit: 459ffc1027b752471a108425c228eac9d133a572
      https://github.com/zanata/zanata-server/commit/459ffc1027b752471a108425c228eac9d133a572
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.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/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/account/klogin.xhtml

  Log Message:
  -----------
  Merge commit 'cc9f75b2d2c1800c9c4557b3d1a4b7ebdb8f09af' into HEAD

  Commit: df0d86865f6019265cc3650d8d60dd19370295f8
      https://github.com/zanata/zanata-server/commit/df0d86865f6019265cc3650d8d60dd19370295f8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge commit '1af5933fbaaa35534fd6a7992e67eecc50acc377' into HEAD

  Commit: 1b7bc16a3f71db42b9d8a75f3e01aaccc771b4e0
      https://github.com/zanata/zanata-server/commit/1b7bc16a3f71db42b9d8a75f3e01aaccc771b4e0
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    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/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.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/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    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/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  refactor: replace jndi config with system properties

See: https://github.com/zanata/zanata-server/pull/1171

  Commit: a2ac1325b024a9a68a07ed468e3db76f155ca8d3
      https://github.com/zanata/zanata-server/commit/a2ac1325b024a9a68a07ed468e3db76f155ca8d3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M mkdocs.yml

  Log Message:
  -----------
  Merge commit '80ddb6ccaf7cb021b53c87302b69f9c0e456ca47' into HEAD

  Commit: 754d2a4a086b84197f346d411e905295da3a4e65
      https://github.com/zanata/zanata-server/commit/754d2a4a086b84197f346d411e905295da3a4e65
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M docs/user-guide/system-admin/configuration/installation.md
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/ZNTA-1042-CORS-system-property'

  Commit: def2e569b14601df64351488006d00c764b60fd4
      https://github.com/zanata/zanata-server/commit/def2e569b14601df64351488006d00c764b60fd4
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  Merge commit 'c9a99a4fb35679ff2d0967f3dcc63ebd4e4599e0' into HEAD

  Commit: c34728c805b494c775e22295ad9dc702555d6111
      https://github.com/zanata/zanata-server/commit/c34728c805b494c775e22295ad9dc702555d6111
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge commit '6b3df3c8585a6539411c4548fb42303d4f5183b6' into HEAD

  Commit: d1277332d4ea506f083c5f10a3f97ebe66ab357a
      https://github.com/zanata/zanata-server/commit/d1277332d4ea506f083c5f10a3f97ebe66ab357a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml

  Log Message:
  -----------
  Merge branch 'release'

  Commit: 6065cb36be6140a20cbe276f981935d2c93c101e
      https://github.com/zanata/zanata-server/commit/6065cb36be6140a20cbe276f981935d2c93c101e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M docs/release-notes.md
    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/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/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    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/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  feat(language team): allow coordinator to contact members (#1144)

https://zanata.atlassian.net/browse/ZNTA-1059
https://zanata.atlassian.net/browse/ZNTA-1094
https://zanata.atlassian.net/browse/ZNTA-1097

  Commit: af525f47694d2972d39e9716a9437e295d1f3f0b
      https://github.com/zanata/zanata-server/commit/af525f47694d2972d39e9716a9437e295d1f3f0b
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    A zanata-war/src/main/resources/messages_anp.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es_AR.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_me_ME.properties
    A zanata-war/src/main/resources/messages_mk.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Merge branch 'release'

Conflicts:
	pom.xml

  Commit: e47e9ae2744280a76dacdc1337ea2315784ca9c1
      https://github.com/zanata/zanata-server/commit/e47e9ae2744280a76dacdc1337ea2315784ca9c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml

  Log Message:
  -----------
  fix(request join group): limit message field in request join group dialog (#1179)

https://zanata.atlassian.net/browse/ZNTA-846

  Commit: 525b9a759aa55f93f694c4ea720a7a2321e4034a
      https://github.com/zanata/zanata-server/commit/525b9a759aa55f93f694c4ea720a7a2321e4034a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  Merge commit '1dea181d474485bd06c2769f483717243f1139b5' into HEAD

  Commit: 3b96f9d818f884df30c3995a32732e36b9453fd7
      https://github.com/zanata/zanata-server/commit/3b96f9d818f884df30c3995a32732e36b9453fd7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/webapp/profile/create_user.xhtml

  Log Message:
  -----------
  fix(create user page): Redirect to home from cancel button in create user page (#1178)

https://zanata.atlassian.net/browse/ZNTA-872

  Commit: 0cdb5889a739e93f615f1d05074293d3bb576456
      https://github.com/zanata/zanata-server/commit/0cdb5889a739e93f615f1d05074293d3bb576456
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.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 zanata-model/src/main/java/org/zanata/model/WebHook.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeTypeDescriptor.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    A zanata-war/src/main/java/org/zanata/events/DocStatsEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/VersionStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentStatsEvent.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java

  Log Message:
  -----------
  feat(webhook): event for translation update (#1137)

* feat(translation update webhook): Add webhook event for translation update

https://zanata.atlassian.net/browse/ZNTA-938

* Refactor package and method name

* Rename webhook event type variables

* Change from int to Long for event

* Update test and data type

* Add comment when casting Long to int

* Update release notes

* Update method access modifiers and method name

* Refactor map in event

* Update method type to void when updating stats map

* Change log to debug level in webhook publisher

* Refactor TextFlowTargetState to TextFlowTargetStateChange

* Add comments in batch size for DocStatsEvent

* WIP: add webhook type

* Add webhookType for each webhook

* Refactor WebhookType

  Commit: 60f3e0f042e1ac0d90ffbdef9d5f5f55d259b1cc
      https://github.com/zanata/zanata-server/commit/60f3e0f042e1ac0d90ffbdef9d5f5f55d259b1cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release note): fix typo

  Commit: 2275dc5c9dfebc92288bf7a8ba8599bdc68f08ac
      https://github.com/zanata/zanata-server/commit/2275dc5c9dfebc92288bf7a8ba8599bdc68f08ac
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release note): fix typo

  Commit: c86e84b181dc853e190d5c3a697bfcb65234fe33
      https://github.com/zanata/zanata-server/commit/c86e84b181dc853e190d5c3a697bfcb65234fe33
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M zanata-war/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  fix(contact language team member): remove replyTo email (#1185)

https://zanata.atlassian.net/browse/ZNTA-1130

  Commit: 32568a5975d4e7cba9004c01d1929ee863ee9724
      https://github.com/zanata/zanata-server/commit/32568a5975d4e7cba9004c01d1929ee863ee9724
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M docs/user-guide/system-admin/configuration/document-storage-directory.md

  Log Message:
  -----------
  Fix zanata.file.directory documentation (#1181)

  Commit: f944df5f188a46d59e10ee981c103cd59f09d9fc
      https://github.com/zanata/zanata-server/commit/f944df5f188a46d59e10ee981c103cd59f09d9fc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M docs/user-guide/system-admin/configuration/installation.md
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java

  Log Message:
  -----------
  refactor(system property): rename zanata.originWhiteList to zanata.origin.whitelist (#1187)

https://zanata.atlassian.net/browse/ZNTA-1131

  Commit: 6ea6e8a8a1d6af7f0672eab0d971cb658eca003f
      https://github.com/zanata/zanata-server/commit/6ea6e8a8a1d6af7f0672eab0d971cb658eca003f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/system-admin/configuration/authentication.md
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/create_user.xhtml

  Log Message:
  -----------
  feat(username): System property for enforcing username (#1173)

* feat(username): System property for enforcing username

https://zanata.atlassian.net/browse/ZNTA-855

* Throw exception if username is not valid

* Update comments to external authentication

* Rephrase error message

* Add release-notes on new system property

* Add documentation in sys-admin guide

* Fix username regex

* Update release ntoes

* Refactor exception handling

* Update exception message

  Commit: deec79c1e71181e816ba2ab63084a15a24ecd914
      https://github.com/zanata/zanata-server/commit/deec79c1e71181e816ba2ab63084a15a24ecd914
  Author: David Shea <dshea at redhat.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Fix the lt Plural-Forms expression (#1175)

  Commit: 90af33613699e7d52594bb0cf9bc9250d04291c6
      https://github.com/zanata/zanata-server/commit/90af33613699e7d52594bb0cf9bc9250d04291c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M .gitignore
    M docs/images/admin-contact-link.png
    M docs/images/admin-menu-access.png
    M docs/images/create-group.png
    M docs/images/create-project.png
    A docs/images/explore-default-page.png
    A docs/images/explore-menu.png
    A docs/images/explore-search-page.png
    M docs/images/glossary-edit-trans.png
    M docs/images/glossary-edit.png
    M docs/images/glossary-new-term-modal.png
    R docs/images/glossary-options.png
    M docs/images/glossary-page.png
    M docs/images/glossary-select-language.png
    A docs/images/menu-dashboard.png
    A docs/images/menu-more.png
    M docs/release-notes.md
    M docs/user-guide/admin/contact-admin.md
    A docs/user-guide/explore/explore.md
    M docs/user-guide/groups/create-group.md
    M docs/user-guide/projects/create-project.md
    M frontend/.gitignore
    M frontend/README.md
    M frontend/pom.xml
    A frontend/src/main/web/.eslintignore
    A frontend/src/main/web/.eslintrc
    M frontend/src/main/web/.gitignore
    M frontend/src/main/web/README.md
    A frontend/src/main/web/atomicCssConfig.js
    A frontend/src/main/web/docs/actions.md
    A frontend/src/main/web/docs/build.md
    A frontend/src/main/web/docs/components.md
    A frontend/src/main/web/docs/constants.md
    A frontend/src/main/web/docs/containers.md
    A frontend/src/main/web/docs/esnext.md
    A frontend/src/main/web/docs/index.md
    A frontend/src/main/web/docs/legacy.md
    A frontend/src/main/web/docs/linting.md
    A frontend/src/main/web/docs/middleware.md
    A frontend/src/main/web/docs/readme.md
    A frontend/src/main/web/docs/reducers.md
    A frontend/src/main/web/docs/schemas.md
    A frontend/src/main/web/docs/scripts.md
    A frontend/src/main/web/docs/styleguide.md
    A frontend/src/main/web/docs/styles.md
    A frontend/src/main/web/docs/technology.md
    A frontend/src/main/web/docs/testing.md
    M frontend/src/main/web/index.html
    R frontend/src/main/web/index.js
    R frontend/src/main/web/lib/actions/GlossaryActions.js
    R frontend/src/main/web/lib/actions/UserMatrixActions.js
    R frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/lib/components/ContributionChart.jsx
    R frontend/src/main/web/lib/components/DayMatrix.jsx
    R frontend/src/main/web/lib/components/DropDown.jsx
    R frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/lib/components/MessageModal.jsx
    R frontend/src/main/web/lib/components/RecentContributions.jsx
    R frontend/src/main/web/lib/components/RootContent.jsx
    R frontend/src/main/web/lib/components/SystemGlossary.jsx
    R frontend/src/main/web/lib/components/UserProfile.jsx
    R frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    R frontend/src/main/web/lib/components/glossary/DataTable.jsx
    R frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    R frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    R frontend/src/main/web/lib/components/glossary/InputCell.jsx
    R frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    R frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    R frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    R frontend/src/main/web/lib/constants/ActionTypes.js
    R frontend/src/main/web/lib/constants/Configs.js
    R frontend/src/main/web/lib/constants/Messages.js
    R frontend/src/main/web/lib/constants/Options.js
    R frontend/src/main/web/lib/constants/Views.js
    R frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    R frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    R frontend/src/main/web/lib/stores/GlossaryStore.js
    R frontend/src/main/web/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    R frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/lib/stores/testData/glossary/entries.json
    R frontend/src/main/web/lib/stores/testData/glossary/info.json
    R frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    R frontend/src/main/web/lib/utils/DateHelper.js
    R frontend/src/main/web/lib/utils/GlossaryHelper.js
    R frontend/src/main/web/lib/utils/StringUtils.js
    R frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    R frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/npm-shrinkwrap.json
    M frontend/src/main/web/package.json
    R frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/scripts/createIconsComponent.js
    A frontend/src/main/web/scripts/generateIconList.js
    A frontend/src/main/web/scripts/writeVariablesJson.js
    R frontend/src/main/web/server.js
    A frontend/src/main/web/src/actions/common.js
    A frontend/src/main/web/src/actions/explore.js
    A frontend/src/main/web/src/actions/glossary.js
    A frontend/src/main/web/src/actions/index.js
    A frontend/src/main/web/src/actions/userMatrix.js
    A frontend/src/main/web/src/components/Base/index.jsx
    A frontend/src/main/web/src/components/Base/readme.md
    A frontend/src/main/web/src/components/Button/index.jsx
    A frontend/src/main/web/src/components/Button/readme.md
    A frontend/src/main/web/src/components/ButtonLink/index.jsx
    A frontend/src/main/web/src/components/ButtonLink/readme.md
    A frontend/src/main/web/src/components/ButtonRound/index.jsx
    A frontend/src/main/web/src/components/ButtonRound/readme.md
    A frontend/src/main/web/src/components/EditableText.js
    A frontend/src/main/web/src/components/Flex/index.jsx
    A frontend/src/main/web/src/components/Flex/readme.md
    A frontend/src/main/web/src/components/Header.jsx
    A frontend/src/main/web/src/components/Heading.jsx
    A frontend/src/main/web/src/components/Icon/index.jsx
    A frontend/src/main/web/src/components/Icon/readme.md
    A frontend/src/main/web/src/components/Icons/icons.svg
    A frontend/src/main/web/src/components/Icons/index.jsx
    A frontend/src/main/web/src/components/Icons/index.jsx.src
    A frontend/src/main/web/src/components/Icons/readme.md
    A frontend/src/main/web/src/components/Icons/svgs/Icon-admin.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-all.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-attach.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-block.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down-double.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-left.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-right.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up-double.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-clock.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-code.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-comment.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-copy.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-cross-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-cross.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-dashboard.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-document.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-dot.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-download.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-edit.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-ellipsis.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-export.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-external-link.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-filter.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-folder.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-glossary.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-help.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-history.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-import.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-inbox.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-info.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-keyboard.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-language.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-link.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-location.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-locked.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-logout.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-mail.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-maintain.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-menu.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-minus.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-next.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-notification.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-plus.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-previous.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-project.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-refresh.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-review.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-search.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-settings.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-star-outline.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-star.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-statistics.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-suggestions.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-tick-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-tick.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-translate.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-trash.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-undo.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-unlocked.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-upload.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-user.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-users.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-version.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-warning.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-zanata.svg
    A frontend/src/main/web/src/components/Link.jsx
    A frontend/src/main/web/src/components/Loader/index.jsx
    A frontend/src/main/web/src/components/Loader/readme.md
    A frontend/src/main/web/src/components/LoaderText/index.jsx
    A frontend/src/main/web/src/components/LoaderText/readme.md
    A frontend/src/main/web/src/components/Modal/ModalBody.jsx
    A frontend/src/main/web/src/components/Modal/ModalFooter.jsx
    A frontend/src/main/web/src/components/Modal/ModalHeader.jsx
    A frontend/src/main/web/src/components/Modal/ModalTitle.jsx
    A frontend/src/main/web/src/components/Modal/index.jsx
    A frontend/src/main/web/src/components/Modal/readme.md
    A frontend/src/main/web/src/components/Nav.jsx
    A frontend/src/main/web/src/components/NavIcon.jsx
    A frontend/src/main/web/src/components/NavItem.jsx
    A frontend/src/main/web/src/components/Notification.js
    A frontend/src/main/web/src/components/Overlay/index.jsx
    A frontend/src/main/web/src/components/Overlay/readme.md
    A frontend/src/main/web/src/components/OverlayTrigger/index.jsx
    A frontend/src/main/web/src/components/OverlayTrigger/readme.md
    A frontend/src/main/web/src/components/Page.jsx
    A frontend/src/main/web/src/components/Row.js
    A frontend/src/main/web/src/components/ScrollView.jsx
    A frontend/src/main/web/src/components/Select/index.jsx
    A frontend/src/main/web/src/components/Select/index.scss
    A frontend/src/main/web/src/components/Select/readme.md
    A frontend/src/main/web/src/components/TableCell.js
    A frontend/src/main/web/src/components/TableRow.js
    A frontend/src/main/web/src/components/TextInput.jsx
    A frontend/src/main/web/src/components/Tooltip/index.jsx
    A frontend/src/main/web/src/components/Tooltip/readme.md
    A frontend/src/main/web/src/components/View.jsx
    A frontend/src/main/web/src/components/index.js
    A frontend/src/main/web/src/constants/ActionTypes.js
    A frontend/src/main/web/src/constants/Messages.js
    A frontend/src/main/web/src/constants/Options.js
    A frontend/src/main/web/src/constants/styles.js
    A frontend/src/main/web/src/containers/App.js
    A frontend/src/main/web/src/containers/Explore/GroupTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/LanguageTeamTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/ProjectTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/TeaserList.jsx
    A frontend/src/main/web/src/containers/Explore/TeaserListHeader.jsx
    A frontend/src/main/web/src/containers/Explore/UserTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/index.js
    A frontend/src/main/web/src/containers/Glossary/DeleteAllEntriesModal.jsx
    A frontend/src/main/web/src/containers/Glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/src/containers/Glossary/Entry.js
    A frontend/src/main/web/src/containers/Glossary/EntryModal.js
    A frontend/src/main/web/src/containers/Glossary/ImportModal.js
    A frontend/src/main/web/src/containers/Glossary/NewEntryModal.js
    A frontend/src/main/web/src/containers/Glossary/ViewHeader.js
    A frontend/src/main/web/src/containers/Glossary/index.js
    A frontend/src/main/web/src/containers/Root.js
    A frontend/src/main/web/src/containers/UserProfile/CalendarMonthMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/CalendarPeriodHeading.jsx
    A frontend/src/main/web/src/containers/UserProfile/CategoryItemMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/CategoryMatrixTable.jsx
    A frontend/src/main/web/src/containers/UserProfile/ContentStateFilter.jsx
    A frontend/src/main/web/src/containers/UserProfile/ContributionChart.jsx
    A frontend/src/main/web/src/containers/UserProfile/DayMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/FilterableMatrixTable.jsx
    A frontend/src/main/web/src/containers/UserProfile/RecentContributions.jsx
    A frontend/src/main/web/src/containers/UserProfile/index.jsx
    A frontend/src/main/web/src/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/src/index.js
    A frontend/src/main/web/src/legacy.js
    A frontend/src/main/web/src/reducers/common.js
    A frontend/src/main/web/src/reducers/explore.js
    A frontend/src/main/web/src/reducers/glossary.js
    A frontend/src/main/web/src/reducers/index.js
    A frontend/src/main/web/src/schemas.js
    A frontend/src/main/web/src/stores/UserMatrixStore.js
    A frontend/src/main/web/src/stores/__mocks__/superagent.js
    A frontend/src/main/web/src/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/src/stores/testData/glossary/entries.json
    A frontend/src/main/web/src/stores/testData/glossary/info.json
    A frontend/src/main/web/src/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/src/styles/animations.css
    A frontend/src/main/web/src/styles/base.css
    A frontend/src/main/web/src/styles/extras.css
    A frontend/src/main/web/src/styles/styleguide.css
    A frontend/src/main/web/src/utils/DateHelper.js
    A frontend/src/main/web/src/utils/GlossaryHelper.js
    A frontend/src/main/web/src/utils/RoutingHelpers.js
    A frontend/src/main/web/src/utils/StringUtils.js
    A frontend/src/main/web/src/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/src/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/src/utils/callWithSameArgs.js
    A frontend/src/main/web/src/utils/styleUtils.js
    A frontend/src/main/web/styleguide.config.js
    A frontend/src/main/web/styleguide.html
    M frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.dev.config.js
    A frontend/src/main/web/webpack.legacy.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/DswidParamChecker.java
    M functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardGroupsTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/explore/ExplorePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    R functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    A functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java
    A functional-test/src/main/java/org/zanata/page/more/MorePage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    R functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M mkdocs.yml
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    R zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    R zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    R zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    R zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    R zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    R zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/BuildInfo.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/JsonObject.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/LanguageTeamSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/PersonSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResults.java
    A zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/groups.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    A zanata-war/src/main/webapp/a/index.xhtml
    A zanata-war/src/main/webapp/a/more.xhtml
    A zanata-war/src/main/webapp/account/logout.xhtml
    A zanata-war/src/main/webapp/account/singleopenidlogin.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    R zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    R zanata-war/src/main/webapp/profile/home.xhtml
    R zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/search.xhtml
    R zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java

  Log Message:
  -----------
  Redux app (#1125)

* feat(ZNTA-858): add global search service

* feat(ZNTA-858): modify API field names

* Update build process to work with new code

* Update node and npm

* Initial es6 and webpack fixes/enhancements

* Fix/upgrade more components

* Fix glossary errors

* Fix the maven build

* Remove unwanted console.log

* Implement most initial glossary read functionality

* Fix error with latest version of Babel

* WIP: integrating with jsf

* integrate links

* Migrade home and edit_home to use new template

* Fix logout link

* WIP: fixing npm build

* Include frontend legacy js file in build

* WIP: implementing template for glossary

* Get basic infinite scroll working without overflow

* Add BuildInfo

* WIP: Some very basic editing

* WIP: index page for glossary and profile

* Remove atomic.css as it is a build artifact

* Fix browser hash and build

* Fix buildinfo and profile link

* Fix term search

* Add action column in table

* Fix translation update cloning

* WIP: reset changes

* WIP: onMouseOver row, reset text field

* WIP: reset button

* WIP: modified terms

* WIP: update term

* WIP: update term

* Update glossary term

* WIP: import glossary

* WIP: sort

* Sorting column

* WIP: comment

* Save translations

* create new term

* Clean unused import in index.js

* Show loading terms

* Extract header component

* Extra entry to component

* WIP: saving trans

* Replace zanata-ui icons with local icons

* Add Button components to styleguide

* Replace Button components in glossary

* Replace Select component and document it

* Add loader component

* Add LoaderText component

* Move Modal from zanata-ui

* Add overlays and tooltip

* Update to work without zanata-ui

* WIP: saving trans

* Update trans

* New modal

* Saving comment on dialog

* WIP: handle performance in shouldComponentUpdate

* Fix mutable selectedTerm

* Fix warning after merge

* Fix Modal

Stop overflow of modal body

* refactor delete modal

* Adjust default ButtonRound height

* notification

* Add warning icon

* Refactor constant value

* Add style to message modal

* Notification for actions

* Move user profile to container package

* WIP: Adding docs for redux-app

* Move docs and add styleguide docs

* WIP: fixing user profile

* WIP: user profile

* WIP: Docs update

* Add tooltip in glossary

* Minor fixes

* WIP: fix prod build

* Fix build

* Fix build, add group in dashboard

* WIP: Basic integration of search/explore page

* fix on left-pad

* Fix schemas and urls

* Fix group search

* Update assets and user profile

* Add more section, language selection

* add locale ui change api

* check for login in /a root

* Add totalCount for search type

* Fix explore

* Fix search

* Remove unused template

* Re-style profile page

* Layout fix after merge

* Style for more page

* fix build

* Disable logger in prod

* fix more section

* remove login check

* fix more section

* page loader for user profile page

* Fix url navigation

* fix checkstyle

* Update npm version

* Refactor explore

* Add paging in explore page

* Organise nav on sidebar

* Fix functional test

* fix functional test

* Update docs

* fix on permission, style, search, glossary loading

* Fix broken color in user profile graph

* Update readme.md, Hide language selection in glossary when not needed

* Fix checkstyle, update ButtonLink comments

* Refactor on review comment

* fix Modal footer alignment

* Update documentation and component for overlay, overlay trigger

* Redux app reviewed (#1162)

* fix(ZNTA-54): Allow delete language (#1139)

fix(ZNTA-54): Allow delete language

https://zanata.atlassian.net/browse/ZNTA-54

* Update functional test, remove unused imports

* docs: improve English in translator-guide.md (#1140)

* test: back-port document.storage.directory change (#1136)

* refactor(ZNTA-1017): translation updates event to handle batch (#1138)

refactor(ZNTA-1017): translation updates event to handle batch

https://zanata.atlassian.net/browse/ZNTA-1017

* Use ImmutableList for event

* Refactor on code review comments

* Refactor activity and translation cache handling

* Remove Hashmap in TranslationServiceImpl saveBatch method, rename variables

* Remove entry from release notes

* Move projectIterationId to event class from DocumentLocaleKey

* Updates on component based on review comments

* [maven-release-plugin] prepare release server-3.8.4

* [maven-release-plugin] prepare for next development iteration

* [zanata-release-branching] development version is now 4.0.0-SNAPSHOT

* Fix checkstyle error

* doc(release-note): Add the item that was not filed against 3.8.4

* Add description on components and Proptypes

* Update Row description

* Remove unuse execution profile from pom.xml

* Update documentation in md files

* Update comments, refactor json object converter

* Update styles.md

* Fix comments and documentation

* update comments and document

* Update stringUtils to use lodash library

* Add icon and tooltip in header

* Update for review on java class

* Update readme.md for frontend

* Fix new entry

* add shrinkwrap.json

* Fix maintained groups label

* Implement delete all option for admin

* fix styling in mobile view

* Add explore section in documentation

  Commit: 62148e1274ea6b61ade734228478ff78f41ea4f3
      https://github.com/zanata/zanata-server/commit/62148e1274ea6b61ade734228478ff78f41ea4f3
  Author: arm <armagan.ersoz at gmail.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/exception/ProjectNotFoundException.java
    A zanata-war/src/main/java/org/zanata/exception/VersionNotFoundException.java
    A zanata-war/src/main/java/org/zanata/exception/handler/ProjectNotFoundExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/handler/VersionNotFoundExceptionHandler.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/error/missing_entity.xhtml

  Log Message:
  -----------
  fix(ZNTA-1073) : create custom exceptions + handlers (#1169)

* fix(ZNTA-1073):Fix NullPointerEx on iteration view

Throw EntityNotFoundException instead of NullPointerException when
attempt to access non-existing project through writing invalid project
slug on the iteration page

* fix(ZNTA-1073):create custom exceptions + handlers

Create ProjectNotFoundEx and VersionNotFoundEx and throw them when
trying to write invalid project or iteration slug on project view or
iteration view pages. Handle these exceptions and return warn page with
the proper warning message.

* fix(ZNTA-1073):change the structure of the ex.s

Instead of passing parameters on the warning page for the error messages,
creating constructors with slug arguments and passing project slug and
version slug parameters when throwing the exceptions. Also, rename warn
page to missing_entity.

* fix(ZNTA-1073) : Add header comment

* fix(ZNTA-1073) : remove unnecessary comment

* fix(ZNTA-1073): change the exception message

  Commit: d3deb0c6263ba13859bd4faba84cdc55368315e9
      https://github.com/zanata/zanata-server/commit/d3deb0c6263ba13859bd4faba84cdc55368315e9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/jpa/NoNestingTransactionStrategy.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    A zanata-war/src/main/java/org/zanata/util/ScopeHelper.java
    M zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java

  Log Message:
  -----------
  fix(ZNTA-1116): use transaction when reading config from DB (#1174)

* Use transaction when reading config from DB
* Ensure CDI Request scope is active
* Log warning for attempted nested transactions
* Use @Async to allow new transaction in event observer

  Commit: 6c721f5882d5e0c0a99a33b259e9fda5b2fca473
      https://github.com/zanata/zanata-server/commit/6c721f5882d5e0c0a99a33b259e9fda5b2fca473
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M frontend/pom.xml
    M functional-test/pom.xml
    M pom.xml
    M zanata-liquibase/pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.9.0-rc-2

  Commit: e766de66a6a415c98a4ab090ab7bbdba08155af4
      https://github.com/zanata/zanata-server/commit/e766de66a6a415c98a4ab090ab7bbdba08155af4
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M frontend/pom.xml
    M functional-test/pom.xml
    M pom.xml
    M zanata-liquibase/pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 838766c4ad403c9520fb88573776acd6af6fb8a8
      https://github.com/zanata/zanata-server/commit/838766c4ad403c9520fb88573776acd6af6fb8a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M frontend/src/main/web/atomicCssConfig.js
    M frontend/src/main/web/src/legacy.js
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  fix(gwt editor): fix css in gwt editor (#1189)

https://zanata.atlassian.net/browse/ZNTA-1140

  Commit: d02350341ec0dcf42d8a9ab7e1209707d245f41c
      https://github.com/zanata/zanata-server/commit/d02350341ec0dcf42d8a9ab7e1209707d245f41c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/jpa/NoNestingTransactionStrategy.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    A zanata-war/src/main/java/org/zanata/util/ScopeHelper.java
    M zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java

  Log Message:
  -----------
  Fix merge release to master (#1192)

  Commit: 28be96ad83a6ab84458ef3d6fc999a0cc7353ac7
      https://github.com/zanata/zanata-server/commit/28be96ad83a6ab84458ef3d6fc999a0cc7353ac7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release'

  Commit: 3ae5c8441da94d370029034840fd7fe60a00a39c
      https://github.com/zanata/zanata-server/commit/3ae5c8441da94d370029034840fd7fe60a00a39c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M .gitignore
    A docs/css/extra.css
    M docs/images/admin-contact-link.png
    M docs/images/admin-menu-access.png
    M docs/images/create-group.png
    M docs/images/create-project.png
    A docs/images/explore-default-page.png
    A docs/images/explore-menu.png
    A docs/images/explore-search-page.png
    M docs/images/glossary-edit-trans.png
    M docs/images/glossary-edit.png
    M docs/images/glossary-new-term-modal.png
    R docs/images/glossary-options.png
    M docs/images/glossary-page.png
    M docs/images/glossary-select-language.png
    A docs/images/menu-dashboard.png
    A docs/images/menu-more.png
    M docs/release-notes.md
    M docs/user-guide/admin/contact-admin.md
    A docs/user-guide/explore/explore.md
    M docs/user-guide/groups/create-group.md
    M docs/user-guide/projects/create-project.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 frontend/.gitignore
    M frontend/README.md
    M frontend/pom.xml
    A frontend/src/main/web/.eslintignore
    A frontend/src/main/web/.eslintrc
    M frontend/src/main/web/.gitignore
    M frontend/src/main/web/README.md
    A frontend/src/main/web/atomicCssConfig.js
    A frontend/src/main/web/docs/actions.md
    A frontend/src/main/web/docs/build.md
    A frontend/src/main/web/docs/components.md
    A frontend/src/main/web/docs/constants.md
    A frontend/src/main/web/docs/containers.md
    A frontend/src/main/web/docs/esnext.md
    A frontend/src/main/web/docs/index.md
    A frontend/src/main/web/docs/legacy.md
    A frontend/src/main/web/docs/linting.md
    A frontend/src/main/web/docs/middleware.md
    A frontend/src/main/web/docs/readme.md
    A frontend/src/main/web/docs/reducers.md
    A frontend/src/main/web/docs/schemas.md
    A frontend/src/main/web/docs/scripts.md
    A frontend/src/main/web/docs/styleguide.md
    A frontend/src/main/web/docs/styles.md
    A frontend/src/main/web/docs/technology.md
    A frontend/src/main/web/docs/testing.md
    M frontend/src/main/web/index.html
    R frontend/src/main/web/index.js
    R frontend/src/main/web/lib/actions/GlossaryActions.js
    R frontend/src/main/web/lib/actions/UserMatrixActions.js
    R frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/lib/components/ContributionChart.jsx
    R frontend/src/main/web/lib/components/DayMatrix.jsx
    R frontend/src/main/web/lib/components/DropDown.jsx
    R frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/lib/components/MessageModal.jsx
    R frontend/src/main/web/lib/components/RecentContributions.jsx
    R frontend/src/main/web/lib/components/RootContent.jsx
    R frontend/src/main/web/lib/components/SystemGlossary.jsx
    R frontend/src/main/web/lib/components/UserProfile.jsx
    R frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    R frontend/src/main/web/lib/components/glossary/DataTable.jsx
    R frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    R frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    R frontend/src/main/web/lib/components/glossary/InputCell.jsx
    R frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    R frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    R frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    R frontend/src/main/web/lib/constants/ActionTypes.js
    R frontend/src/main/web/lib/constants/Configs.js
    R frontend/src/main/web/lib/constants/Messages.js
    R frontend/src/main/web/lib/constants/Options.js
    R frontend/src/main/web/lib/constants/Views.js
    R frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    R frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    R frontend/src/main/web/lib/stores/GlossaryStore.js
    R frontend/src/main/web/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    R frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/lib/stores/testData/glossary/entries.json
    R frontend/src/main/web/lib/stores/testData/glossary/info.json
    R frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    R frontend/src/main/web/lib/utils/DateHelper.js
    R frontend/src/main/web/lib/utils/GlossaryHelper.js
    R frontend/src/main/web/lib/utils/StringUtils.js
    R frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    R frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/npm-shrinkwrap.json
    M frontend/src/main/web/package.json
    R frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/scripts/createIconsComponent.js
    A frontend/src/main/web/scripts/generateIconList.js
    A frontend/src/main/web/scripts/writeVariablesJson.js
    R frontend/src/main/web/server.js
    A frontend/src/main/web/src/actions/common.js
    A frontend/src/main/web/src/actions/explore.js
    A frontend/src/main/web/src/actions/glossary.js
    A frontend/src/main/web/src/actions/index.js
    A frontend/src/main/web/src/actions/userMatrix.js
    A frontend/src/main/web/src/components/Base/index.jsx
    A frontend/src/main/web/src/components/Base/readme.md
    A frontend/src/main/web/src/components/Button/index.jsx
    A frontend/src/main/web/src/components/Button/readme.md
    A frontend/src/main/web/src/components/ButtonLink/index.jsx
    A frontend/src/main/web/src/components/ButtonLink/readme.md
    A frontend/src/main/web/src/components/ButtonRound/index.jsx
    A frontend/src/main/web/src/components/ButtonRound/readme.md
    A frontend/src/main/web/src/components/EditableText.js
    A frontend/src/main/web/src/components/Flex/index.jsx
    A frontend/src/main/web/src/components/Flex/readme.md
    A frontend/src/main/web/src/components/Header.jsx
    A frontend/src/main/web/src/components/Heading.jsx
    A frontend/src/main/web/src/components/Icon/index.jsx
    A frontend/src/main/web/src/components/Icon/readme.md
    A frontend/src/main/web/src/components/Icons/icons.svg
    A frontend/src/main/web/src/components/Icons/index.jsx
    A frontend/src/main/web/src/components/Icons/index.jsx.src
    A frontend/src/main/web/src/components/Icons/readme.md
    A frontend/src/main/web/src/components/Icons/svgs/Icon-admin.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-all.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-attach.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-block.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down-double.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-left.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-right.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up-double.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-clock.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-code.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-comment.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-copy.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-cross-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-cross.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-dashboard.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-document.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-dot.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-download.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-edit.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-ellipsis.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-export.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-external-link.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-filter.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-folder.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-glossary.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-help.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-history.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-import.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-inbox.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-info.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-keyboard.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-language.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-link.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-location.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-locked.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-logout.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-mail.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-maintain.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-menu.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-minus.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-next.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-notification.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-plus.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-previous.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-project.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-refresh.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-review.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-search.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-settings.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-star-outline.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-star.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-statistics.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-suggestions.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-tick-circle.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-tick.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-translate.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-trash.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-undo.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-unlocked.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-upload.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-user.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-users.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-version.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-warning.svg
    A frontend/src/main/web/src/components/Icons/svgs/Icon-zanata.svg
    A frontend/src/main/web/src/components/Link.jsx
    A frontend/src/main/web/src/components/Loader/index.jsx
    A frontend/src/main/web/src/components/Loader/readme.md
    A frontend/src/main/web/src/components/LoaderText/index.jsx
    A frontend/src/main/web/src/components/LoaderText/readme.md
    A frontend/src/main/web/src/components/Modal/ModalBody.jsx
    A frontend/src/main/web/src/components/Modal/ModalFooter.jsx
    A frontend/src/main/web/src/components/Modal/ModalHeader.jsx
    A frontend/src/main/web/src/components/Modal/ModalTitle.jsx
    A frontend/src/main/web/src/components/Modal/index.jsx
    A frontend/src/main/web/src/components/Modal/readme.md
    A frontend/src/main/web/src/components/Nav.jsx
    A frontend/src/main/web/src/components/NavIcon.jsx
    A frontend/src/main/web/src/components/NavItem.jsx
    A frontend/src/main/web/src/components/Notification.js
    A frontend/src/main/web/src/components/Overlay/index.jsx
    A frontend/src/main/web/src/components/Overlay/readme.md
    A frontend/src/main/web/src/components/OverlayTrigger/index.jsx
    A frontend/src/main/web/src/components/OverlayTrigger/readme.md
    A frontend/src/main/web/src/components/Page.jsx
    A frontend/src/main/web/src/components/Row.js
    A frontend/src/main/web/src/components/ScrollView.jsx
    A frontend/src/main/web/src/components/Select/index.jsx
    A frontend/src/main/web/src/components/Select/index.scss
    A frontend/src/main/web/src/components/Select/readme.md
    A frontend/src/main/web/src/components/TableCell.js
    A frontend/src/main/web/src/components/TableRow.js
    A frontend/src/main/web/src/components/TextInput.jsx
    A frontend/src/main/web/src/components/Tooltip/index.jsx
    A frontend/src/main/web/src/components/Tooltip/readme.md
    A frontend/src/main/web/src/components/View.jsx
    A frontend/src/main/web/src/components/index.js
    A frontend/src/main/web/src/constants/ActionTypes.js
    A frontend/src/main/web/src/constants/Messages.js
    A frontend/src/main/web/src/constants/Options.js
    A frontend/src/main/web/src/constants/styles.js
    A frontend/src/main/web/src/containers/App.js
    A frontend/src/main/web/src/containers/Explore/GroupTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/LanguageTeamTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/ProjectTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/TeaserList.jsx
    A frontend/src/main/web/src/containers/Explore/TeaserListHeader.jsx
    A frontend/src/main/web/src/containers/Explore/UserTeaser.jsx
    A frontend/src/main/web/src/containers/Explore/index.js
    A frontend/src/main/web/src/containers/Glossary/DeleteAllEntriesModal.jsx
    A frontend/src/main/web/src/containers/Glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/src/containers/Glossary/Entry.js
    A frontend/src/main/web/src/containers/Glossary/EntryModal.js
    A frontend/src/main/web/src/containers/Glossary/ImportModal.js
    A frontend/src/main/web/src/containers/Glossary/NewEntryModal.js
    A frontend/src/main/web/src/containers/Glossary/ViewHeader.js
    A frontend/src/main/web/src/containers/Glossary/index.js
    A frontend/src/main/web/src/containers/Root.js
    A frontend/src/main/web/src/containers/UserProfile/CalendarMonthMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/CalendarPeriodHeading.jsx
    A frontend/src/main/web/src/containers/UserProfile/CategoryItemMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/CategoryMatrixTable.jsx
    A frontend/src/main/web/src/containers/UserProfile/ContentStateFilter.jsx
    A frontend/src/main/web/src/containers/UserProfile/ContributionChart.jsx
    A frontend/src/main/web/src/containers/UserProfile/DayMatrix.jsx
    A frontend/src/main/web/src/containers/UserProfile/FilterableMatrixTable.jsx
    A frontend/src/main/web/src/containers/UserProfile/RecentContributions.jsx
    A frontend/src/main/web/src/containers/UserProfile/index.jsx
    A frontend/src/main/web/src/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/src/index.js
    A frontend/src/main/web/src/legacy.js
    A frontend/src/main/web/src/reducers/common.js
    A frontend/src/main/web/src/reducers/explore.js
    A frontend/src/main/web/src/reducers/glossary.js
    A frontend/src/main/web/src/reducers/index.js
    A frontend/src/main/web/src/schemas.js
    A frontend/src/main/web/src/stores/UserMatrixStore.js
    A frontend/src/main/web/src/stores/__mocks__/superagent.js
    A frontend/src/main/web/src/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/src/stores/testData/glossary/entries.json
    A frontend/src/main/web/src/stores/testData/glossary/info.json
    A frontend/src/main/web/src/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/src/styles/animations.css
    A frontend/src/main/web/src/styles/base.css
    A frontend/src/main/web/src/styles/extras.css
    A frontend/src/main/web/src/styles/styleguide.css
    A frontend/src/main/web/src/utils/DateHelper.js
    A frontend/src/main/web/src/utils/GlossaryHelper.js
    A frontend/src/main/web/src/utils/RoutingHelpers.js
    A frontend/src/main/web/src/utils/StringUtils.js
    A frontend/src/main/web/src/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/src/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/src/utils/callWithSameArgs.js
    A frontend/src/main/web/src/utils/styleUtils.js
    A frontend/src/main/web/styleguide.config.js
    A frontend/src/main/web/styleguide.html
    M frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.dev.config.js
    A frontend/src/main/web/webpack.legacy.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/DswidParamChecker.java
    M functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardGroupsTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/explore/ExplorePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    R functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    A functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java
    A functional-test/src/main/java/org/zanata/page/more/MorePage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    R functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.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-liquibase/pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/WebHook.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/WebhookTypeTypeDescriptor.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/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    R zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    R zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    R zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    R zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    R zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    R zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    R zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.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/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/events/DocStatsEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    R zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/WebhookEventType.java
    A zanata-war/src/main/java/org/zanata/exception/ProjectNotFoundException.java
    A zanata-war/src/main/java/org/zanata/exception/VersionNotFoundException.java
    A zanata-war/src/main/java/org/zanata/exception/handler/ProjectNotFoundExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/handler/VersionNotFoundExceptionHandler.java
    M zanata-war/src/main/java/org/zanata/jpa/NoNestingTransactionStrategy.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestResponseInterceptor.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/BuildInfo.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/JsonObject.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/LanguageTeamSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/PersonSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResult.java
    A zanata-war/src/main/java/org/zanata/rest/search/dto/SearchResults.java
    A zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/VersionStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.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/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.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
    M zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A zanata-war/src/main/java/org/zanata/util/ScopeHelper.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/webhook/events/DocumentStatsEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    M zanata-war/src/main/resources/db/db.changelog.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/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/groups.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    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.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    A zanata-war/src/main/webapp/a/index.xhtml
    A zanata-war/src/main/webapp/a/more.xhtml
    A zanata-war/src/main/webapp/account/logout.xhtml
    A zanata-war/src/main/webapp/account/singleopenidlogin.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    A zanata-war/src/main/webapp/error/missing_entity.xhtml
    R zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    R zanata-war/src/main/webapp/profile/home.xhtml
    R zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/search.xhtml
    R zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.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/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.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-1145

  Commit: 8a9d54793c4e3620e4281a978f0063ac60354e15
      https://github.com/zanata/zanata-server/commit/8a9d54793c4e3620e4281a978f0063ac60354e15
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  Fix integration test

Compare: https://github.com/zanata/zanata-server/compare/87159b145c63...8a9d54793c4e