[zanata-commits] [zanata/zanata] 6e99a9: Fix bug: changes didnt save in editor when changin...

[noreply at github.com]

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

  Commit: 6e99a97ec07784edd900910acd1c71847e1c1e3f
      https://github.com/zanata/zanata/commit/6e99a97ec07784edd900910acd1c71847e1c1e3f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-09-28 (Wed, 28 Sep 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationView.java

  Log Message:
  -----------
  Fix bug: changes didnt save in editor when changing between documents


  Commit: c1d65c28e903511127ea6c571c558beb6fdd1fd7
      https://github.com/zanata/zanata/commit/c1d65c28e903511127ea6c571c558beb6fdd1fd7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-09-28 (Wed, 28 Sep 2011)

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

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


  Commit: 7845948003249fea8c5e29c070e1726015da64ea
      https://github.com/zanata/zanata/commit/7845948003249fea8c5e29c070e1726015da64ea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-09-28 (Wed, 28 Sep 2011)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml

  Log Message:
  -----------
  Fix bug: % completed should be calculated with words, not messages:https://bugzilla.redhat.com/show_bug.cgi?id=741523


  Commit: 30cec4b344abb8b3a6052180dc3d0d5ea35276b7
      https://github.com/zanata/zanata/commit/30cec4b344abb8b3a6052180dc3d0d5ea35276b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-09-28 (Wed, 28 Sep 2011)

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

  Log Message:
  -----------
  clean unused variables in xhtml


  Commit: 9be435debceffa55b952012224c7c387de364d7d
      https://github.com/zanata/zanata/commit/9be435debceffa55b952012224c7c387de364d7d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-09-28 (Wed, 28 Sep 2011)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.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/TranslationEditorPresenter.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/ui/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.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/TranslationView.java
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml

  Log Message:
  -----------
  Fix conflict - merge between rhbz741523 and master


Compare: https://github.com/zanata/zanata/compare/72d1e4b...9be435d