[zanata-commits] [zanata/zanata] a2509f: copy previous targets as fuzzy when modified text ...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: a2509f6cf0b01ea6781a9b4c0e5a4df34becb058
      https://github.com/zanata/zanata/commit/a2509f6cf0b01ea6781a9b4c0e5a4df34becb058
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  copy previous targets as fuzzy when modified text flow source content is pushed


  Commit: e1359c4ef50fc196aefbf35eb0b761a299bbd65e
      https://github.com/zanata/zanata/commit/e1359c4ef50fc196aefbf35eb0b761a299bbd65e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/CopyTransService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

  Log Message:
  -----------
  Make textflow revision match current textflow on copytrans.

Not yet unit tested.


  Commit: 0f8ffff3ebc64c0e41bf60cf3f9e53f044d741a9
      https://github.com/zanata/zanata/commit/0f8ffff3ebc64c0e41bf60cf3f9e53f044d741a9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java

  Log Message:
  -----------
  Update target transunit revision to current when content or state set from webtrans.


  Commit: 6bb4bc0633d48192179a05320389a8b0dccd1267
      https://github.com/zanata/zanata/commit/6bb4bc0633d48192179a05320389a8b0dccd1267
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-13 (Tue, 13 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

  Log Message:
  -----------
  correct dependency injection for CopyTransService


  Commit: 12390aedb8f05f45b799f2f39d9e1f4851bed065
      https://github.com/zanata/zanata/commit/12390aedb8f05f45b799f2f39d9e1f4851bed065
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    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/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  add resource id to TransUnit in webtrans


  Commit: 4f44dec21b65cc94602248da66a8e636c069fecf
      https://github.com/zanata/zanata/commit/4f44dec21b65cc94602248da66a8e636c069fecf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.ui.xml

  Log Message:
  -----------
  show resource id in webtrans ui


  Commit: 46ff9d0b4e4d10e0f689dac6d6e9c8cfc776fb5e
      https://github.com/zanata/zanata/commit/46ff9d0b4e4d10e0f689dac6d6e9c8cfc776fb5e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.ui.xml
  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/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Merge branch 'webui-resid' into 1.4

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java

Resolved, also reformatted a long line since it needed it and was making merging a pain.


  Commit: c40bc210640d13f6835d76015d4124ad968fc14b
      https://github.com/zanata/zanata/commit/c40bc210640d13f6835d76015d4124ad968fc14b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.ui.xml
  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/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java


Compare: https://github.com/zanata/zanata/compare/880411a...c40bc21