[zanata/zanata-server] 29c4b0: rhbz1235495,ZANATA-20 - fix error in uploading po ...

GitHub noreply at github.com
Mon Jun 29 01:07:40 UTC 2015 

  Branch: refs/heads/rhbz1235070-stats
  Home:   https://github.com/zanata/zanata-server
  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: 0fc402133864a2ea4fb65407f0ef8b950a7dad86
      https://github.com/zanata/zanata-server/commit/0fc402133864a2ea4fb65407f0ef8b950a7dad86
  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
    M pom.xml
    M zanata-war/pom.xml
    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/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/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/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 rhbz1235070-stats


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes


Compare: https://github.com/zanata/zanata-server/compare/0eb64ff68323...8679c63f958f

More information about the zanata-commits mailing list