[zanata/zanata] c4f9f5: Move query string into DiffMatchPatchLabelColumn f...

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: c4f9f546e98ef75cedf4644ed7788ea354bea326
      https://github.com/zanata/zanata/commit/c4f9f546e98ef75cedf4644ed7788ea354bea326
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

  Log Message:
  -----------
  Move query string into DiffMatchPatchLabelColumn from TranslationMemoryGlossaryItem


  Commit: ed67e6a03db1bdd1f208827748c19c0408bd3cd3
      https://github.com/zanata/zanata/commit/ed67e6a03db1bdd1f208827748c19c0408bd3cd3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

  Log Message:
  -----------
  Execute TM searches against content0 for now


  Commit: 02fc73fa54a89cb24ae602e0c36dd6321ca70875
      https://github.com/zanata/zanata/commit/02fc73fa54a89cb24ae602e0c36dd6321ca70875
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

  Log Message:
  -----------
  Merge branch 'plurals' into rhbz803572


  Commit: 3ff0b5823404bc1778b17915b5e85c1fa5d01a64
      https://github.com/zanata/zanata/commit/3ff0b5823404bc1778b17915b5e85c1fa5d01a64
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.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/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/Editor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java


Compare: https://github.com/zanata/zanata/compare/9e15b0f...3ff0b58