[zanata/zanata] 0b8fc2: Merge branch 'rhbz800869' into integration

GitHub noreply at github.com
Tue Apr 10 23:12:29 UTC 2012 

  Branch: refs/heads/rhbz800869
  Home:   https://github.com/zanata/zanata
  Commit: 0b8fc2b24a52ad438ffb46c430419a92dc731524
      https://github.com/zanata/zanata/commit/0b8fc2b24a52ad438ffb46c430419a92dc731524
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch 'rhbz800869' into integration


  Commit: 262ed49107f0e677868487bdcd4419007f3611c5
      https://github.com/zanata/zanata/commit/262ed49107f0e677868487bdcd4419007f3611c5
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge commit '0b8fc2b24a52ad438ffb46c430419a92dc731524' into HEAD


  Commit: 2a589bfec801c51e85ccb84c63d5ede672b9a486
      https://github.com/zanata/zanata/commit/2a589bfec801c51e85ccb84c63d5ede672b9a486
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  escape java variable example so it will display properly in ui


  Commit: faff69f040e6b233fe83a807b7397dd7dc4d4829
      https://github.com/zanata/zanata/commit/faff69f040e6b233fe83a807b7397dd7dc4d4829
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  Merge branch 'validation' into integration


  Commit: 60cac5a83f0f8b1a6847205f7378cc3b3824b9c6
      https://github.com/zanata/zanata/commit/60cac5a83f0f8b1a6847205f7378cc3b3824b9c6
  Author: Zanata Build Server <dpmason at redhat.com>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

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


  Commit: 9c9b9745ebf8177045ea409303f3746a877f2c85
      https://github.com/zanata/zanata/commit/9c9b9745ebf8177045ea409303f3746a877f2c85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java

  Log Message:
  -----------
  Merge branch 'integration' of github.com:zanata/zanata into integration


  Commit: b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
      https://github.com/zanata/zanata/commit/b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  rhbz727789 - Fix bug preventing non-admin users from creating projects.

Refactor a security rule causing the issue.


  Commit: a650875363e3ee94dfb9ecba95989b383b499c1f
      https://github.com/zanata/zanata/commit/a650875363e3ee94dfb9ecba95989b383b499c1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Apply css into iteration page, rename iteration.xhtml to view.html


  Commit: 86cf39fbc20bd3d108628e9395a217fbdb983d45
      https://github.com/zanata/zanata/commit/86cf39fbc20bd3d108628e9395a217fbdb983d45
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  Merge branch 'integration' of github.com:zanata/zanata into integration


  Commit: 27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
      https://github.com/zanata/zanata/commit/27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 2.0


  Commit: b2b673541cec43948613d9827e7eb2894162978e
      https://github.com/zanata/zanata/commit/b2b673541cec43948613d9827e7eb2894162978e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'liquibase-2.0' into integration


  Commit: f3e347c564d92fbfbe291ce6bbddc253774671e4
      https://github.com/zanata/zanata/commit/f3e347c564d92fbfbe291ce6bbddc253774671e4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java

  Log Message:
  -----------
  rhbz727789 - Implement non-admin project creation in 1.5 branch

This revision is a cherry-pick of the following commits:
e8afa8a65f47aceac35ce2ebd8cc97517badadf0
ad01b3f915e4f776cd6604f20cce3a49bf3489ee
b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
a5153d9001e120d7d3fcd15bec4eca7499a7b06a


  Commit: ac4253135252713069ecb2c9fefe174ef9d26d3c
      https://github.com/zanata/zanata/commit/ac4253135252713069ecb2c9fefe174ef9d26d3c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Log Message:
  -----------
  Merge branch '1.5' of github.com:zanata/zanata into integration

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HPerson.java


  Commit: eaa04597ec065f0f92ec55a00f2c5f01e67d2b02
      https://github.com/zanata/zanata/commit/eaa04597ec065f0f92ec55a00f2c5f01e67d2b02
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java

  Log Message:
  -----------
  Pre-load identityStore component at @Startup


  Commit: 2a92a137319c6d8823ab25a3c8f4d0a39ae449ca
      https://github.com/zanata/zanata/commit/2a92a137319c6d8823ab25a3c8f4d0a39ae449ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java

  Log Message:
  -----------
  Pre-load identityStore component at @Startup


  Commit: 50b1387718757c289bccabc62e6a570fc976fac8
      https://github.com/zanata/zanata/commit/50b1387718757c289bccabc62e6a570fc976fac8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Fix Glossary tables support for h2 database


  Commit: 1853419cccc9978abccd2025612a73eb5ec2bc68
      https://github.com/zanata/zanata/commit/1853419cccc9978abccd2025612a73eb5ec2bc68
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml

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


  Commit: 396dc0d260d8e88a393d8d26424e13c2a7085fd7
      https://github.com/zanata/zanata/commit/396dc0d260d8e88a393d8d26424e13c2a7085fd7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata into integration/master


  Commit: 5ad545679fca073b556d2f42957c2765a9f27082
      https://github.com/zanata/zanata/commit/5ad545679fca073b556d2f42957c2765a9f27082
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/account/activate.xhtml
  M server/zanata-war/src/main/webapp/account/changepassword.xhtml
  M server/zanata-war/src/main/webapp/account/login.xhtml
  M server/zanata-war/src/main/webapp/account/login_input.xhtml
  M server/zanata-war/src/main/webapp/account/logout.xhtml
  M server/zanata-war/src/main/webapp/account/password_reset.xhtml
  M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
  M server/zanata-war/src/main/webapp/account/register.xhtml
  M server/zanata-war/src/main/webapp/account/validate_email.xhtml
  M server/zanata-war/src/main/webapp/admin/glossary.xhtml
  M server/zanata-war/src/main/webapp/admin/home.xhtml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
  M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  M server/zanata-war/src/main/webapp/admin/stats.xhtml
  M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
  M server/zanata-war/src/main/webapp/edit_home_content.xhtml
  M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
  M server/zanata-war/src/main/webapp/error.xhtml
  M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
  M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
  M server/zanata-war/src/main/webapp/help/view.xhtml
  M server/zanata-war/src/main/webapp/home.xhtml
  M server/zanata-war/src/main/webapp/iteration/edit.xhtml
  M server/zanata-war/src/main/webapp/iteration/files.xhtml
  M server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/home.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/profile/edit.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/create_project.xhtml
  M server/zanata-war/src/main/webapp/project/edit.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Add better titles to JSF pages


Compare: https://github.com/zanata/zanata/compare/da70bd1...5ad5456

More information about the zanata-commits mailing list