[zanata/zanata-server] 576467: Add plain text content field to Trans unit variant...

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: 576467a52cc0f073e326562497f8ef4e6c089cd5
      https://github.com/zanata/zanata-server/commit/576467a52cc0f073e326562497f8ef4e6c089cd5
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Add plain text content field to Trans unit variants/

This is to make sure we can store and index a plain text version of the possibly formatted tmx segment string.


  Commit: 2c5b4e26c3f71dd84d42631e8ac46a123a0e9f38
      https://github.com/zanata/zanata-server/commit/2c5b4e26c3f71dd84d42631e8ac46a123a0e9f38
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add Rest service and draft web pages to upload translation memories.


  Commit: db97c39ad5f2b2210cb752ce2d8d7df135ebe84e
      https://github.com/zanata/zanata-server/commit/db97c39ad5f2b2210cb752ce2d8d7df135ebe84e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/tm-import' into tm-import

Conflicts:
	zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java


Compare: https://github.com/zanata/zanata-server/compare/6885e3ee57e1...db97c39ad5f2