[zanata-commits] [zanata/zanata] c949db: Fix on Ghost translation after search for 1.4 bran...

[noreply at github.com]

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

  Commit: c949db8dc17ebf2078d36d9867833a3b3692fd68
      https://github.com/zanata/zanata/commit/c949db8dc17ebf2078d36d9867833a3b3692fd68
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 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/editor/filter/TransFilterPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.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/ui/ClearableTextBox.java

  Log Message:
  -----------
  Fix on Ghost translation after search for 1.4 branch: https://bugzilla.redhat.com/show_bug.cgi?id=751264


  Commit: a443a9db473e6fb1911672ee807cc1d3523e2072
      https://github.com/zanata/zanata/commit/a443a9db473e6fb1911672ee807cc1d3523e2072
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java


Compare: https://github.com/zanata/zanata/compare/3ccf32e...a443a9d