[zanata/zanata] e69ee6: Merge branch 'master' into validation

GitHub noreply at github.com
Thu Jan 19 03:37:33 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: e69ee68374a74eac8535980bc7dd833ba7795b83
      https://github.com/zanata/zanata/commit/e69ee68374a74eac8535980bc7dd833ba7795b83
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  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/StatusType.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/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  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/client/editor/table/SourcePanel.java
  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
  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/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
  M server/zanata-war/src/test/java/org/zanata/ZanataRawRestTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.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/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/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.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' into validation


  Commit: 1852aad40a619f87ccd29e9587c71d87f973fd13
      https://github.com/zanata/zanata/commit/1852aad40a619f87ccd29e9587c71d87f973fd13
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java

  Log Message:
  -----------
  update tag order algorithm to report minimal tags to reorder


Compare: https://github.com/zanata/zanata/compare/245c76a...1852aad

More information about the zanata-commits mailing list