[zanata/zanata] 89a060: Merge branch 'rhbz773459'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 89a0609c8c18e4737e21669be1ac0b7ad2e6656a
      https://github.com/zanata/zanata/commit/89a0609c8c18e4737e21669be1ac0b7ad2e6656a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.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/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitUpdatedEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  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/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasTransUnitUpdatedData.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Merge branch 'rhbz773459'

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/editor/table/TableEditorTableDefinition.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java


  Commit: 681bb9832327eda581fc1ddfa6e47afb8b64a0e6
      https://github.com/zanata/zanata/commit/681bb9832327eda581fc1ddfa6e47afb8b64a0e6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  A common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
  R server/zanata-war/src/main/java/org/zanata/util/HashUtil.java

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


Compare: https://github.com/zanata/zanata/compare/eaae695...681bb98