[zanata/zanata] 326e25: Refactor Xml Dtos so they are still compatible wit...

GitHub noreply at github.com
Mon Jan 23 05:44:37 UTC 2012


  Branch: refs/heads/rhbz773459
  Home:   https://github.com/zanata/zanata
  Commit: 326e25ea2f300a58a27f54050ae2bf0c0a1e7c1a
      https://github.com/zanata/zanata/commit/326e25ea2f300a58a27f54050ae2bf0c0a1e7c1a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    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/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-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/TranslationsRestTest.java
  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
  A server/zanata-war/src/test/resources/rest/translations/getTranslations.xml
  M server/zanata-war/src/test/resources/rest/translations/putResource-1.4-expected.xml
  M server/zanata-war/src/test/resources/rest/translations/putResource-1.4.xml

  Log Message:
  -----------
  Refactor Xml Dtos so they are still compatible with 1.4 API.

(rhbz781270)
- Refactored Xml Dtos so that they are not root elements yet are still compatible with the 1.4 clients.
- Added raw Rest tests to make sure that 1.4 valid requests are still served by the subsequent versions of the API. Failure of one of these tests does not necessarily mean an API incompatibility, but should at least raise a red flag.


  Commit: 409df15a7c3ab05370e8a60268245d772fca9422
      https://github.com/zanata/zanata/commit/409df15a7c3ab05370e8a60268245d772fca9422
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-16 (Mon, 16 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/AbstractTranslationCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java
  A common/zanata-common-api/src/test/java/org/zanata/common/TranslationStatsTest.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.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/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/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowImpl.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  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/webtrans/client/history/HistoryTokenTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.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/DummyGetTransUnitCommand.java

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


  Commit: 1420910b414abef6b10dad6a9972193fca668689
      https://github.com/zanata/zanata/commit/1420910b414abef6b10dad6a9972193fca668689
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-17 (Tue, 17 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/AbstractTranslationCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.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/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
  A common/zanata-common-api/src/test/java/org/zanata/common/TranslationStatsTest.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/SlugEntityBase.java
  M server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.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/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/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowImpl.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  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/rest/service/raw/AccountRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.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/history/HistoryTokenTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.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/DummyGetTransUnitCommand.java
  M server/zanata-war/src/test/resources/AllIntegrationTests.tng.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
  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 rhbz750673

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


  Commit: b7976ce5d0aa81fb089feabdf74fe7a4e5a82815
      https://github.com/zanata/zanata/commit/b7976ce5d0aa81fb089feabdf74fe7a4e5a82815
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java
  M server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.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/test/java/org/zanata/rest/service/ProjectRestTest.java

  Log Message:
  -----------
  Add Rest API restrictions to Project Iterations.

(rhbz750673)


  Commit: 4d57eb79ac88f6e720a83fd77bb793ace7380293
      https://github.com/zanata/zanata/commit/4d57eb79ac88f6e720a83fd77bb793ace7380293
  Author: Carlos Munoz <camunoz 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/dto/Project.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.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-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
  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/ProjectIterationRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.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

  Log Message:
  -----------
  Add EntityStatus enumeration.

(rhbz750673)
This new enumeration will server as both a JPA and REST status indicator for Slug entities.
On the REST api, this new field will be included in both projects and iterations when exposing these objects via the API.


  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


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

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  update validators to use localisable messages


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

  Changed paths:
    M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  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/webtrans/client/presenter/DocumentListPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java

  Log Message:
  -----------
  reduce unnecessary warnings in war test classes


  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


  Commit: 7846ae34ddbc7446946556501c94b155d73d21ca
      https://github.com/zanata/zanata/commit/7846ae34ddbc7446946556501c94b155d73d21ca
  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/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  update regex to match printf variables more precisely


  Commit: 030653ed8063238147f95b7219d0838f75150194
      https://github.com/zanata/zanata/commit/030653ed8063238147f95b7219d0838f75150194
  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/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  tweak printf validation regex


  Commit: 85d3992ae108eda641473e787ae0058e40b27b6d
      https://github.com/zanata/zanata/commit/85d3992ae108eda641473e787ae0058e40b27b6d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

  Log Message:
  -----------
  Patch fixes for copysource bug


  Commit: 7d0a9c2b23d5e72cc4d994ae1ce6584e714cec3f
      https://github.com/zanata/zanata/commit/7d0a9c2b23d5e72cc4d994ae1ce6584e714cec3f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

  Log Message:
  -----------
  Merge branch 'rhbz760431'


  Commit: ae3b37d9e40da103a8a59f1c8c80947cb82720b5
      https://github.com/zanata/zanata/commit/ae3b37d9e40da103a8a59f1c8c80947cb82720b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

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

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


  Commit: 8e6f67e106424fe557147b139b97fa27cd3d3904
      https://github.com/zanata/zanata/commit/8e6f67e106424fe557147b139b97fa27cd3d3904
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

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

  Log Message:
  -----------
  Remove target="_blank" to avoid opening new tab for Translate


  Commit: 6f876eb975d21330d8a51fa6fa1a87097cc71856
      https://github.com/zanata/zanata/commit/6f876eb975d21330d8a51fa6fa1a87097cc71856
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    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

  Log Message:
  -----------
  Add comment to Liquibase changelogs, explaining about db.changelog-1.6.xml


  Commit: e3600a15361570d6038b9ffacb23e81111b7dfb9
      https://github.com/zanata/zanata/commit/e3600a15361570d6038b9ffacb23e81111b7dfb9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-22 (Sun, 22 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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

  Log Message:
  -----------
  Fix on https://bugzilla.redhat.com/show_bug.cgi?id=760431#c12


  Commit: 3c36d187ab2269acccc9deb2f583d6babfe1a0f6
      https://github.com/zanata/zanata/commit/3c36d187ab2269acccc9deb2f583d6babfe1a0f6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-22 (Sun, 22 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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

  Log Message:
  -----------
  Merge branch 'rhbz760431'


  Commit: d5872cc6a4e49be94cced4d60a1849917f8b2567
      https://github.com/zanata/zanata/commit/d5872cc6a4e49be94cced4d60a1849917f8b2567
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-22 (Sun, 22 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/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  fix https://bugzilla.redhat.com/show_bug.cgi?id=760431


  Commit: a9c26d8fbdecc4b438284bae3ef6600cd555d5a1
      https://github.com/zanata/zanata/commit/a9c26d8fbdecc4b438284bae3ef6600cd555d5a1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-22 (Sun, 22 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java

  Log Message:
  -----------
  Fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=783348


  Commit: 4fde9ba224bcd1b456dd31f616a5c9285af4db9b
      https://github.com/zanata/zanata/commit/4fde9ba224bcd1b456dd31f616a5c9285af4db9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-22 (Sun, 22 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/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.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/InlineTargetCellEditor.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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.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/server/rpc/UpdateTransUnitHandler.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/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  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/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  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/shared/validation/HtmlXmlTagValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.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 rhbz773459

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java


Compare: https://github.com/zanata/zanata/compare/e198294...4fde9ba


More information about the zanata-commits mailing list