[zanata/zanata] 4c60ef: Patch fixes in https://bugzilla.redhat.com/show_bu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 4c60ef81531d41bdb2cc5a0539f8e10c0efc3bea
      https://github.com/zanata/zanata/commit/4c60ef81531d41bdb2cc5a0539f8e10c0efc3bea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Patch fixes in https://bugzilla.redhat.com/show_bug.cgi?id=760431#c9


  Commit: 9548e435a748a7119b8a92c912769e8b73e7536e
      https://github.com/zanata/zanata/commit/9548e435a748a7119b8a92c912769e8b73e7536e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    A common/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  A server/zanata-model/src/main/java/org/zanata/model/type/EntityStatusTypeType.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationsRestTest.java
  M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
  A server/zanata-war/src/test/resources/rest/account/get.json
  A server/zanata-war/src/test/resources/rest/account/get.xml
  M server/zanata-war/src/test/resources/rest/iteration/get.json
  M server/zanata-war/src/test/resources/rest/iteration/get.xml
  M server/zanata-war/src/test/resources/rest/project/get.json
  M server/zanata-war/src/test/resources/rest/project/get.xml
  A server/zanata-war/src/test/resources/rest/translations/getTranslations.xml
  A server/zanata-war/src/test/resources/rest/translations/putResource-1.4-expected.xml
  A server/zanata-war/src/test/resources/rest/translations/putResource-1.4.xml

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


Compare: https://github.com/zanata/zanata/compare/4d57eb7...9548e43