[zanata-commits] [zanata/zanata] 12390a: add resource id to TransUnit in webtrans

[noreply at github.com]

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

  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.


Compare: https://github.com/zanata/zanata/compare/6bb4bc0...46ff9d0