[zanata/zanata-server] 2ff421: Fix null exception in more activity load: https://...

Mon Jun 29 01:06:15 UTC 2015

  Branch: refs/heads/rhbz1224912-exclude-user-filter
  Home:   https://github.com/zanata/zanata-server
  Commit: 2ff4212f0b01812bc034937e8a6094fd4d3a446e
      https://github.com/zanata/zanata-server/commit/2ff4212f0b01812bc034937e8a6094fd4d3a446e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

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

  Log Message:
  -----------
  Fix null exception in more activity load: https://bugzilla.redhat.com/show_bug.cgi?id=1231054

  Commit: 699af9e97f6edc290e91f7e8979b4f9f7602220a
      https://github.com/zanata/zanata-server/commit/699af9e97f6edc290e91f7e8979b4f9f7602220a
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

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

  Log Message:
  -----------
  Update zanata-maven-plugin version to zanta-client-version

  Commit: ca3e470ac9ae14627aea22870c3bcd7d87da9db0
      https://github.com/zanata/zanata-server/commit/ca3e470ac9ae14627aea22870c3bcd7d87da9db0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Allow admin to access inactive language page

  Commit: fbc9f805ee308b095bc14b7338de3ed168754148
      https://github.com/zanata/zanata-server/commit/fbc9f805ee308b095bc14b7338de3ed168754148
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Added bug 1203521 to 3.7

  Commit: 0691dda2ac4633aff5509c7e33ae86de2983c572
      https://github.com/zanata/zanata-server/commit/0691dda2ac4633aff5509c7e33ae86de2983c572
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #883 from zanata/zanata-maven-plugin-3.7.0

Update zanata-maven-plugin version to zanta-client-version

  Commit: 4941fe281b33a9bd3686325b162b9d510eab4dd7
      https://github.com/zanata/zanata-server/commit/4941fe281b33a9bd3686325b162b9d510eab4dd7
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: fd5613ff73465a51bb42420d62dfbce648f362de
      https://github.com/zanata/zanata-server/commit/fd5613ff73465a51bb42420d62dfbce648f362de
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #880 from zanata/rhbz1231054-more-activity-exception

Fix null exception in more activity load

  Commit: 5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
      https://github.com/zanata/zanata-server/commit/5eb8556f9b1ad3414922ef1b95a780984a8ed2cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 472925f55bd2bb0b48dedcee5faacaac2c9968e4
      https://github.com/zanata/zanata-server/commit/472925f55bd2bb0b48dedcee5faacaac2c9968e4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #884 from zanata/fix-disabled-lang-for-admin

Allow admin to access inactive language page

  Commit: 32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
      https://github.com/zanata/zanata-server/commit/32cf30338e86cf7646b9ae70ef1dcda74ae38fa8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  rhbz1234687,ZANATA-8 fix error uploading pot file from web UI

  Commit: f1deb2f062bddcaf793a8b1d79e1aba8fa4ecde5
      https://github.com/zanata/zanata-server/commit/f1deb2f062bddcaf793a8b1d79e1aba8fa4ecde5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  add to release note

  Commit: 360e1ada78a9a708371748795a2c3712ec17f001
      https://github.com/zanata/zanata-server/commit/360e1ada78a9a708371748795a2c3712ec17f001
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
      https://github.com/zanata/zanata-server/commit/1758936e4f6cfe4e2aed7ce6b4462c1865e2d319
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #881 from zanata/zanata8-ui-upload-pot

ZANATA-8 fix error uploading pot file from web UI

  Commit: 4726e0ee4a890323f606d8cb088f093a239198a5
      https://github.com/zanata/zanata-server/commit/4726e0ee4a890323f606d8cb088f093a239198a5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  rhbz1234687,ZANATA-8 fix error uploading pot file from web UI

  Commit: ad46f1202d05e42e49236bf5af65f7f0f9c2dcaa
      https://github.com/zanata/zanata-server/commit/ad46f1202d05e42e49236bf5af65f7f0f9c2dcaa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  add to release note

  Commit: 51c118273701d3ce2091a26027b9eef5ef49e27c
      https://github.com/zanata/zanata-server/commit/51c118273701d3ce2091a26027b9eef5ef49e27c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  Update report issue link

  Commit: b855987c6b63da199bbf5c136d3f970c6eb45e69
      https://github.com/zanata/zanata-server/commit/b855987c6b63da199bbf5c136d3f970c6eb45e69
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  Merge pull request #885 from zanata/update-issue-link

Update report issue link

  Commit: 13c6e48e600d79798fd2be9a3d9eb9bfc42270dd
      https://github.com/zanata/zanata-server/commit/13c6e48e600d79798fd2be9a3d9eb9bfc42270dd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 51b5dddbff45680dbf9c08e8de8fa7cc27879c65
      https://github.com/zanata/zanata-server/commit/51b5dddbff45680dbf9c08e8de8fa7cc27879c65
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M docs/user-guide/client/client.md

  Log Message:
  -----------
  Fix broken zanata-client link in docs

  Commit: 92b62a64d63fb5091c2836983132841822504bc2
      https://github.com/zanata/zanata-server/commit/92b62a64d63fb5091c2836983132841822504bc2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M docs/user-guide/client/client.md

  Log Message:
  -----------
  Merge branch 'release' into integration/master

  Commit: 29c4b0c3d8bc78fa7c3357cab14cf7af70d13147
      https://github.com/zanata/zanata-server/commit/29c4b0c3d8bc78fa7c3357cab14cf7af70d13147
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

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

  Log Message:
  -----------
  rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI

  Commit: b0459f99664e74822695942013f688ec1d8924e5
      https://github.com/zanata/zanata-server/commit/b0459f99664e74822695942013f688ec1d8924e5
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: parent is now 25-SNAPSHOT

  Commit: 9988b4bc627918adad12598111ab580868dbe604
      https://github.com/zanata/zanata-server/commit/9988b4bc627918adad12598111ab580868dbe604
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

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

  Log Message:
  -----------
  Merge pull request #887 from zanata/rhbz1235495-po-upload-fix

rhbz1235495,ZANATA-20 - fix error in uploading po file from web UI

  Commit: 766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
      https://github.com/zanata/zanata-server/commit/766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/rest/ZanataJacksonJsonProvider.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/AbstractResource.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/EntityHomeWrapper.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyContextInjectionInterceptor.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyProviderFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyResourceFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/package-info.java
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/resources/META-INF/seam-deployment.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_tr.properties
    A zanata-war/src/main/resources/org/zanata/seam/resteasy/resteasy-2.3.xsd
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/test/java/org/zanata/MockResourceFactory.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 71d284ba8f988efaf6f15f6ceb86b18fcb562bd4
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 16:42:49 2015 +1000

    minor change

commit 5e952150d6c358aca438fa274c35c62933c05936
Merge: 772525a b817e15
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:55:21 2015 +1000

    Merge branch 'integration/master' into resteasy3

    Conflicts:
    	zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    	zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    	zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java

commit 772525afbbfc13d199f2fc204184d29d8d49dfaa
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:49:01 2015 +1000

    use jboss module instead of packaging the jar (javax.inject-api)

commit 11e8fca4df8ba81eab500251d3ec22ef6b78abe9
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 11:59:46 2015 +1000

    fix functional test

commit 1c34b8beee15681af8f0bd0e3679a83b983c9975
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 14:15:11 2015 +1000

    fix all static analysis error and added enforcer rule for stax-api conflict

commit 459b17f7be51c1ae46ff96f58e8784728ebbb076
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:54:03 2015 +1000

    fix duplicate class finder error

commit 9c0b497bba438f52125146cea35c0b92c3927136
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:08:52 2015 +1000

    fix dependency check

commit 20f4ce8b7eaf8d29045117675694be024aa9562a
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 11:36:11 2015 +1000

    override built-in RESTEasy Jackson provider to NOT use JAXB annotation

commit 5a15bcca4324e03c4a8e9e9a8607cc8a08e74c7d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jun 16 15:01:46 2015 +1000

    fix integration test

commit f1a74e9950335af483ac4ae54bdd0e5198004601
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jun 11 11:48:47 2015 +1000

    Fix a failing test.

commit efabd4e03c445d5b5a72ead88c2a5e1248cf9b83
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Jun 5 11:03:50 2015 +1000

    Fixes for Resteasy3

    Disble Java EE modules from EAP/Wildfly
    Enable Providers via Seam2
    Adjust Arquillian packaging.

commit 2b08324f1a978c513315be5518e2aee08b911af9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 14:51:58 2015 +1000

    Make enforcer happy

commit f1e89355ca30510a169c2403bc557404d099bdcd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 13:08:31 2015 +1000

    Upgrade to RESTEasy 3

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

  Changed paths:
    M zanata-war/src/main/webapp/profile/create_user.xhtml

  Log Message:
  -----------
  Add 'required' for email field in account create page

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

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/search/SearchPage.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    R zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Update search page:

https://bugzilla.redhat.com/show_bug.cgi?id=1233524

Squashed commit of the following:

commit a315251f4fceba4d89e7a8e330e7785b014ca6de
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 16:33:33 2015 +1000

    Fix functional test

commit 5c0653240cb74c05d5ea9a535e64c2e9633282d6
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 13:28:18 2015 +1000

    Update release notes

commit 739f262151bd8179bf738986440c70840409849d
Merge: 67a6e84 766cfc0
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 26 13:25:01 2015 +1000

    Merge branch 'integration/master' into update-search

commit 67a6e842dfd23927ed481b414037bc2559b4a74e
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jun 22 13:14:56 2015 +1000

    fix functional test

commit 3d51cf3d33f86d9e8fdba880ca1684f6643c94f7
Merge: 1d168cf e15076e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jun 19 11:09:55 2015 +1000

    Merge branch 'integration/master' into update-search

commit 1d168cf905427a3f7c73271d7d2ce2107ac47b1d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jun 9 16:06:24 2015 +1000

    update search screen

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

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/client/client.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/search/SearchPage.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    R zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/ZanataSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/rest/ZanataJacksonJsonProvider.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/AbstractResource.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/EntityHomeWrapper.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyContextInjectionInterceptor.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyProviderFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyResourceFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/package-info.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/resources/META-INF/seam-deployment.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_tr.properties
    A zanata-war/src/main/resources/org/zanata/seam/resteasy/resteasy-2.3.xsd
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    A zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/test/java/org/zanata/MockResourceFactory.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1224912-exclude-user-filter

Compare: https://github.com/zanata/zanata-server/compare/68eb55194e2d...7ce3e91b08cc