[zanata/zanata] fd7cce: fix glossary pushing problem

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: fd7cceafbbabecbddf25ef8246b0db8976b1af4e
      https://github.com/zanata/zanata/commit/fd7cceafbbabecbddf25ef8246b0db8976b1af4e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java

  Log Message:
  -----------
  fix glossary pushing problem


  Commit: 066c7295ce83469b5380c0646638c35c8700d4ba
      https://github.com/zanata/zanata/commit/066c7295ce83469b5380c0646638c35c8700d4ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/DataPage.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectCopyTransOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataHTMLLayout.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/CommentsUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetStatusCountHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java

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


Compare: https://github.com/zanata/zanata/compare/b5140cc7747d...066c7295ce83