[zanata/zanata] b5ba2f: Fix GlossaryTerm with TermComment relationship and...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: b5ba2f6854350df3ffd5eb1f8f4a96faa67b57e1
      https://github.com/zanata/zanata/commit/b5ba2f6854350df3ffd5eb1f8f4a96faa67b57e1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
    M common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
    M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml

  Log Message:
  -----------
  Fix GlossaryTerm with TermComment relationship and test


  Commit: 0a3eff6b3a08076b13facc7f8920b2e076e76a7f
      https://github.com/zanata/zanata/commit/0a3eff6b3a08076b13facc7f8920b2e076e76a7f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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

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


Compare: https://github.com/zanata/zanata/compare/1c58dd6...0a3eff6