[zanata/zanata-server] e47284: fix(ZNTA-1060): avoid NPE in DuplicateParamFilter

Tue May 17 02:52:12 UTC 2016

  Branch: refs/heads/remove-jndi-config
  Home:   https://github.com/zanata/zanata-server
  Commit: e472845071036dd44d29a774e05396ca4d49308d
      https://github.com/zanata/zanata-server/commit/e472845071036dd44d29a774e05396ca4d49308d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/servlet/DuplicateParamFilter.java

  Log Message:
  -----------
  fix(ZNTA-1060): avoid NPE in DuplicateParamFilter

  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: a39a548b25eb1b65e721823c3768291f84dc1c3b
      https://github.com/zanata/zanata-server/commit/a39a548b25eb1b65e721823c3768291f84dc1c3b
  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: b83ac7387ddb5b0f484c8eae7f13f4e94ab4db98
      https://github.com/zanata/zanata-server/commit/b83ac7387ddb5b0f484c8eae7f13f4e94ab4db98
  Author: Alex Eng <aeng at redhat.com>
  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:
  -----------
  fix(language list): refresh language list when add/remove language from project/version (#1155)

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

  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: 55d965a4658e1dc1b31caa1df06eb3bd25703ce3
      https://github.com/zanata/zanata-server/commit/55d965a4658e1dc1b31caa1df06eb3bd25703ce3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-06 (Fri, 06 May 2016)

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

  Log Message:
  -----------
  fix(menu drop down): drop-down user menu does not obscure the Glossary buttons (#1151)

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

  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: f8866dddc2253db02f1d8f0a9f37113d723405c0
      https://github.com/zanata/zanata-server/commit/f8866dddc2253db02f1d8f0a9f37113d723405c0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

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

  Log Message:
  -----------
  fix(ZNTA-1072): allow multiple different values for same parameter

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

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

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

  Log Message:
  -----------
  fix(glossary notification): hide details section in notification dialog (#1154)

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

  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: 5ade0006b75777d92c2af9e77f370aad91d09ddc
      https://github.com/zanata/zanata-server/commit/5ade0006b75777d92c2af9e77f370aad91d09ddc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml

  Log Message:
  -----------
  Fix standalone configuration property placeholders (#1163)

  Commit: 0793edf261706179fec35cd9e1322ca6e87d9067
      https://github.com/zanata/zanata-server/commit/0793edf261706179fec35cd9e1322ca6e87d9067
  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_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:
  -----------
  trans: Update translation

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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  fix(project status): Update message for delete project (#1150)

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

  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: 2bb3b0b9724c070f7068f357cf5fb631606d1fe6
      https://github.com/zanata/zanata-server/commit/2bb3b0b9724c070f7068f357cf5fb631606d1fe6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    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 pull request #1153 from zanata/ZNTA-1060-fix-npe

fix(ZNTA-1060): avoid NPE in DuplicateParamFilter
fix(ZNTA-1072): allow multiple different values for same parameter

  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: 5a6f42d9dcee3b286ad88338e7df6675ee2393ff
      https://github.com/zanata/zanata-server/commit/5a6f42d9dcee3b286ad88338e7df6675ee2393ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release notes): Update release notes for 3.9

  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: 956bf5c646eecb60210606be66916eab66e43394
      https://github.com/zanata/zanata-server/commit/956bf5c646eecb60210606be66916eab66e43394
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-10 (Tue, 10 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 (#1166)

  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: 91ce54abb0c639fe12053e0d1de9d470561f45a9
      https://github.com/zanata/zanata-server/commit/91ce54abb0c639fe12053e0d1de9d470561f45a9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  fix(File upload): Remove file extension for gettext type upload in UI (#1165)

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

  Commit: 876463bded1831f11a18d04fe0f20881750aa0e6
      https://github.com/zanata/zanata-server/commit/876463bded1831f11a18d04fe0f20881750aa0e6
  Author: arm <armagan.ersoz at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/jpa/EntityManagerProducer.java

  Log Message:
  -----------
  fix(ZNTA-931): change Dependent scope to Request (#1159)

Make hibernate session object independent from EM. It causes closing the
hibernate session before transaction is completed

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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(translation): check for null target when performing translation (#1167)

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

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix: NoSuchElementException in event handler (#1164)

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

  Changed paths:
    M pom.xml

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

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

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

  Log Message:
  -----------
  fix(pom): fix 3.9.0 warning (#1170)

* fix(pom): fix 3.9.0 warning

* fix(pom): sync the commons-codec to version 1.10

* fix(pom): fix the Used undeclared dependencies warning

* fix(pom): fix the trailing spaces

  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: 2488f0e0c8d3d2b4cda2b50621f20fd6ad4073ac
      https://github.com/zanata/zanata-server/commit/2488f0e0c8d3d2b4cda2b50621f20fd6ad4073ac
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/lib/components/MessageModal.jsx
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M functional-test/pom.xml
    M pom.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    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
    M zanata-war/src/main/java/org/zanata/servlet/DuplicateParamFilter.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/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
    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_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
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    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
    A zanata-war/src/test/java/org/zanata/servlet/DuplicateParamFilterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into remove-jndi-config

Compare: https://github.com/zanata/zanata-server/compare/8f7e2379e385...2488f0e0c8d3