[zanata/zanata] 9c482b: plural support - update image for move down button

GitHub noreply at github.com
Fri Apr 13 02:36:06 UTC 2012


  Branch: refs/heads/test-scope-profile
  Home:   https://github.com/zanata/zanata
  Commit: 9c482b40df69605759481409b00a4f49c237163e
      https://github.com/zanata/zanata/commit/9c482b40df69605759481409b00a4f49c237163e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.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/presenter/UserConfigHolder.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java

  Log Message:
  -----------
  plural support - update image for move down button


  Commit: 110c48facebdb856f3dbc31a85c391aae3a1e89b
      https://github.com/zanata/zanata/commit/110c48facebdb856f3dbc31a85c391aae3a1e89b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  plural support - work in progress: shortcut keys


  Commit: fcf730f960401eefc84c2772654aa345005eab97
      https://github.com/zanata/zanata/commit/fcf730f960401eefc84c2772654aa345005eab97
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.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/presenter/UserConfigHolder.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java


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

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    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/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/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.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/GetGlossaryDetailsResult.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/GetTransUnitsNavigationResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

  Log Message:
  -----------
  Add plural flag to TransUnit, fix ContentState evaluation, some refactoring

Add plural flag to TransUnit.
Check plural strings when evaluating ContentState in PoReader2.
Switch GWT-RPC object to use ArrayList for faster GWT compilation.
Move all nplurals calculations to ResourceUtils.
Fix thread-safety for SimpleDateFormat.


  Commit: 3da257e23378b1fe4c8578f2f569b523ab880e85
      https://github.com/zanata/zanata/commit/3da257e23378b1fe4c8578f2f569b523ab880e85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/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/ToggleEditor.java

  Log Message:
  -----------
  Plural support - implement save and move to previous entry


  Commit: 5161f12d96e252fa0a725c2623e4afd0dbedc5af
      https://github.com/zanata/zanata/commit/5161f12d96e252fa0a725c2623e4afd0dbedc5af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/TableResources.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/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.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/presenter/TranslationEditorPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/move_task_down.png
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java


  Commit: 609b0df544bd7a26a26e11e7e4178339cae8111b
      https://github.com/zanata/zanata/commit/609b0df544bd7a26a26e11e7e4178339cae8111b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
    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/TransUnitsEditModel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  plural support - navigation


  Commit: 8b6d5450e8048169b9d91cfe4e2ad27abdbdd263
      https://github.com/zanata/zanata/commit/8b6d5450e8048169b9d91cfe4e2ad27abdbdd263
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/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/ToggleEditor.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java


  Commit: d5a434c7ce5f8ec578a112fab81c68b1ba59f164
      https://github.com/zanata/zanata/commit/d5a434c7ce5f8ec578a112fab81c68b1ba59f164
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java

  Log Message:
  -----------
  fix up after merge


  Commit: 758a601603d40394c314e0f2757c1a4e7e6b5fbb
      https://github.com/zanata/zanata/commit/758a601603d40394c314e0f2757c1a4e7e6b5fbb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

  Log Message:
  -----------
  fix OptionPanelPresenterTest


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

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
    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/editor/table/TransUnitsEditModel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.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/presenter/UserConfigHolder.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/ToggleEditor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java


  Commit: ea84b83605df0ee6191b465533be6d63b78b5e7b
      https://github.com/zanata/zanata/commit/ea84b83605df0ee6191b465533be6d63b78b5e7b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java

  Log Message:
  -----------
  minor


  Commit: 63c99aacb10830aa32eef1799f0e0236dc9cdb9d
      https://github.com/zanata/zanata/commit/63c99aacb10830aa32eef1799f0e0236dc9cdb9d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 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
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    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/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/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.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/GetGlossaryDetailsResult.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/GetTransUnitsNavigationResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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


  Commit: c8daefcccf18ca35fade1a05df398925e401b127
      https://github.com/zanata/zanata/commit/c8daefcccf18ca35fade1a05df398925e401b127
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java

  Log Message:
  -----------
  Plural support - shortcut keys implementation


  Commit: b35c6baeaaa98e855bf0f329103fa43454c8a954
      https://github.com/zanata/zanata/commit/b35c6baeaaa98e855bf0f329103fa43454c8a954
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/presenter/TransUnitNavigationPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java

  Log Message:
  -----------
  minor refactoring and clean up


  Commit: e2c7ab2dd1068a5c41bcac23354cd2577d37c727
      https://github.com/zanata/zanata/commit/e2c7ab2dd1068a5c41bcac23354cd2577d37c727
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java

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


  Commit: 027404156ec9ab94419d19c1328c7be4cdb2fb4a
      https://github.com/zanata/zanata/commit/027404156ec9ab94419d19c1328c7be4cdb2fb4a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java

  Log Message:
  -----------
  plural support - navigation and shortcut key


  Commit: 990f0bc5baa38eb162f149328f8107e3ece99b16
      https://github.com/zanata/zanata/commit/990f0bc5baa38eb162f149328f8107e3ece99b16
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.java

  Log Message:
  -----------
  fix up gwt rpc sublist bug


  Commit: 1fb56652ef976d3b26c9d2cae59a45795603905e
      https://github.com/zanata/zanata/commit/1fb56652ef976d3b26c9d2cae59a45795603905e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java

  Log Message:
  -----------
  fix minor bugs


  Commit: 1aa132515084aa0e6a595d40b0e014d0bb99b55b
      https://github.com/zanata/zanata/commit/1aa132515084aa0e6a595d40b0e014d0bb99b55b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java

  Log Message:
  -----------
  plural support - fix validation trigger


  Commit: 86a5acf6de548175677eae3120f3d75018273c65
      https://github.com/zanata/zanata/commit/86a5acf6de548175677eae3120f3d75018273c65
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java

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


  Commit: 96c88aed7ae73f11d720659eb10538de3c29e930
      https://github.com/zanata/zanata/commit/96c88aed7ae73f11d720659eb10538de3c29e930
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

  Log Message:
  -----------
  plural support - focus textarea on click, remove unused event, refactor UserConfigHolder


  Commit: cd2b7039462e69d3a67bf3255a54a363ccf0089a
      https://github.com/zanata/zanata/commit/cd2b7039462e69d3a67bf3255a54a363ccf0089a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    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
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
    A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
    A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
    A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
    M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch	
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
    M server/zanata-war/src/main/resources/db/db.changelog.xml
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
    A server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
    M server/zanata-war/src/test/resources/META-INF/persistence.xml
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'plurals' into plural-lists

Also made some non-conflict resolution changes to get plural lists working.

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
	server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
	server/zanata-war/src/main/resources/db/db.changelog.xml
	server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
	server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
	server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml


  Commit: 5ad545679fca073b556d2f42957c2765a9f27082
      https://github.com/zanata/zanata/commit/5ad545679fca073b556d2f42957c2765a9f27082
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Add better titles to JSF pages


  Commit: 61eedcb035a3ad211c0be7743cc3f1a0a6d3916d
      https://github.com/zanata/zanata/commit/61eedcb035a3ad211c0be7743cc3f1a0a6d3916d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml

  Log Message:
  -----------
  plural support - work in progress


  Commit: edb8b2c34bbef7bd61fae5690873b97204f6ef7b
      https://github.com/zanata/zanata/commit/edb8b2c34bbef7bd61fae5690873b97204f6ef7b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java

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


  Commit: 75e24953e06f8e0f10973aae2cf65a7ac451259d
      https://github.com/zanata/zanata/commit/75e24953e06f8e0f10973aae2cf65a7ac451259d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/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/ui/Editor.java

  Log Message:
  -----------
  plural support - highlight find messages in target column


  Commit: fe691b05c55234358a42f450ccd505ec7b0262e0
      https://github.com/zanata/zanata/commit/fe691b05c55234358a42f450ccd505ec7b0262e0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java

  Log Message:
  -----------
  fix up editor focus on click


  Commit: 8776b5eac3ccd2878b37a651800640194e57c2c0
      https://github.com/zanata/zanata/commit/8776b5eac3ccd2878b37a651800640194e57c2c0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/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/TargetContentsPresenter.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

  Log Message:
  -----------
  Plural support - work in progress :enter key open editor


  Commit: 92754cf519a3ae740eee01afd1048ca815b3b2ba
      https://github.com/zanata/zanata/commit/92754cf519a3ae740eee01afd1048ca815b3b2ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/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/ui/Editor.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java


  Commit: b158f758b648c6dc38d30f39fbebeb8e2f7c1e6c
      https://github.com/zanata/zanata/commit/b158f758b648c6dc38d30f39fbebeb8e2f7c1e6c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    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/ui/Editor.java

  Log Message:
  -----------
  plural support - fix the force open editor bug and also some other misbehave


  Commit: 0f60796c9e2c36b435682d413ed1b171d75ddbc7
      https://github.com/zanata/zanata/commit/0f60796c9e2c36b435682d413ed1b171d75ddbc7
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Add tiled interface for Project page.

Iterations will now be seen in a "tiled" horizontal view.


  Commit: dcf3bc4dff3363aac084c77b7d0e25ee346f430d
      https://github.com/zanata/zanata/commit/dcf3bc4dff3363aac084c77b7d0e25ee346f430d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    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/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  refactor to have injected scheduler


  Commit: 9e15b0f36658574aecf0c3c272cfe0fa11d31eeb
      https://github.com/zanata/zanata/commit/9e15b0f36658574aecf0c3c272cfe0fa11d31eeb
  Author: Patrick Huang <pahuang 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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  fix text area autosizing


  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: fe0bf7627ef477cdd21bc107abfecd4406df349c
      https://github.com/zanata/zanata/commit/fe0bf7627ef477cdd21bc107abfecd4406df349c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/resources/import.sql

  Log Message:
  -----------
  Code review Changes.

Completely removed old HTextFlow and HTextFlowTarget database triggers (mysql and h2).
Reenabled history tests.
Changed implementation of contentHash to include all content strings for HTextFlow.


  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


  Commit: cfec75007e47a216478f470c889478c9dbcb9f9a
      https://github.com/zanata/zanata/commit/cfec75007e47a216478f470c889478c9dbcb9f9a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Add test for TextFlowTargetDAO.

In this revision this test only covers the query that is the base for copy trans.


  Commit: ef7fcb4f6e3ef0fb79cc9f97cd999f53d1012489
      https://github.com/zanata/zanata/commit/ef7fcb4f6e3ef0fb79cc9f97cd999f53d1012489
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Refactor tests to new plurals model.


  Commit: e870eea2b3d5f621f1c8e5f8c1af436dead8c087
      https://github.com/zanata/zanata/commit/e870eea2b3d5f621f1c8e5f8c1af436dead8c087
  Author: Carlos Munoz <camunoz 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' of github.com:zanata/zanata into plural-lists


  Commit: 265f3f5a0e0536cd21e06cc539a2f9918ac47169
      https://github.com/zanata/zanata/commit/265f3f5a0e0536cd21e06cc539a2f9918ac47169
  Author: huangp <pahuang 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/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/ui/Editor.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-parent/pom.xml

  Log Message:
  -----------
  unit test TargetContentsPresenter plus refactoring


  Commit: 635c46a409c22d815d0757390c2dc9a05e436cc8
      https://github.com/zanata/zanata/commit/635c46a409c22d815d0757390c2dc9a05e436cc8
  Author: huangp <pahuang 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
    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:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572


  Commit: 03da0483719fa69176512f96131696831356e0a3
      https://github.com/zanata/zanata/commit/03da0483719fa69176512f96131696831356e0a3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  minor


  Commit: 45d8e57e7476a1146e72abea0011f657555cbb75
      https://github.com/zanata/zanata/commit/45d8e57e7476a1146e72abea0011f657555cbb75
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml

  Log Message:
  -----------
  Add missing foreign key constraints.

Some tables were not originally created using the INNODB storage engine on MySQL. Correct that by changing the engine on the offending tables and recreating the missing foreign keys.


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

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    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/view/TransMemoryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

  Log Message:
  -----------
  Use all content fields for TM search


  Commit: 6c97e151a24af8133060da1cdf701dc7fdc44907
      https://github.com/zanata/zanata/commit/6c97e151a24af8133060da1cdf701dc7fdc44907
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml

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


  Commit: 62f04186cceec32f96d778645df190341859317b
      https://github.com/zanata/zanata/commit/62f04186cceec32f96d778645df190341859317b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    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/view/TransMemoryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml
    M server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

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


  Commit: ac928c2cff34174d4b22d8860e8e7a698d2664a2
      https://github.com/zanata/zanata/commit/ac928c2cff34174d4b22d8860e8e7a698d2664a2
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

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

  Log Message:
  -----------
  plural support - centralised setlabeltext in a single method with css


  Commit: 7c6176cf9137c0e52da5fb1dc3a3bc0af593e377
      https://github.com/zanata/zanata/commit/7c6176cf9137c0e52da5fb1dc3a3bc0af593e377
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

  Log Message:
  -----------
  unit test


  Commit: bfb2f263fd0f31b0cc3952d11e5e1c2f87af74f6
      https://github.com/zanata/zanata/commit/bfb2f263fd0f31b0cc3952d11e5e1c2f87af74f6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

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

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


  Commit: 7a4bbe7c096e34a3a8e4cd050f504cc6dfc46cea
      https://github.com/zanata/zanata/commit/7a4bbe7c096e34a3a8e4cd050f504cc6dfc46cea
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    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/ui/Editor.java

  Log Message:
  -----------
  Plural support - implement 'enter' to open first editor


  Commit: e4f5049cc08ece729601cae30728ab4778f7d42b
      https://github.com/zanata/zanata/commit/e4f5049cc08ece729601cae30728ab4778f7d42b
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

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


  Commit: 03828b021387122cd4214e54ba3a350378764bbb
      https://github.com/zanata/zanata/commit/03828b021387122cd4214e54ba3a350378764bbb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

  Log Message:
  -----------
  plural support - refactor SourceContentsPresenter


  Commit: 8d375349c205b03ce7620f88ee993e177a6bed85
      https://github.com/zanata/zanata/commit/8d375349c205b03ce7620f88ee993e177a6bed85
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    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/ui/Editor.java

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


  Commit: 5c4326e751980ee50befd488d3c2b01b7e9e30af
      https://github.com/zanata/zanata/commit/5c4326e751980ee50befd488d3c2b01b7e9e30af
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Log Message:
  -----------
  Fix REST import of plurals, show average similarity when comparing a user query with multiple contents in a TextFlow


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

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/TargetContentsPresenter.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/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

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


  Commit: 84654ca71e1eb7a63e1f54ddd451cd793a3c368b
      https://github.com/zanata/zanata/commit/84654ca71e1eb7a63e1f54ddd451cd793a3c368b
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml


  Commit: 3cdfaafe22df3cb3fa843931720c155e06e2f3fa
      https://github.com/zanata/zanata/commit/3cdfaafe22df3cb3fa843931720c155e06e2f3fa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

  Log Message:
  -----------
  readonly mode causes NPE


  Commit: e08477ab7d49ad75b4b0e02f77abd4a505e89f05
      https://github.com/zanata/zanata/commit/e08477ab7d49ad75b4b0e02f77abd4a505e89f05
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

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


  Commit: 42c38a094205c3ee84963c505aa565913fa31765
      https://github.com/zanata/zanata/commit/42c38a094205c3ee84963c505aa565913fa31765
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

  Log Message:
  -----------
  Plural support - modify open editor behavior


  Commit: a13eb277ed35279299bb6ac667d35cbb74a7cd5e
      https://github.com/zanata/zanata/commit/a13eb277ed35279299bb6ac667d35cbb74a7cd5e
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/TargetContentsPresenter.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/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

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


  Commit: 41d0b0c4f45314b1641dbe52046a34c654ce4333
      https://github.com/zanata/zanata/commit/41d0b0c4f45314b1641dbe52046a34c654ce4333
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java

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

Conflicts:
	server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java


  Commit: 456fb45bf728a0718322e1ce48a9194a2cb93661
      https://github.com/zanata/zanata/commit/456fb45bf728a0718322e1ce48a9194a2cb93661
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

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


  Commit: 6b3033ecdc7090a820b32750fca8cebf8f04ce51
      https://github.com/zanata/zanata/commit/6b3033ecdc7090a820b32750fca8cebf8f04ce51
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-parent/pom.xml

  Log Message:
  -----------
  change testng version to 6.4


  Commit: 248d67c7ca8fd826a5d99857515f9dd521cdb616
      https://github.com/zanata/zanata/commit/248d67c7ca8fd826a5d99857515f9dd521cdb616
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java


  Commit: 8f80070fb3cdc9f18377382cac5887432ae46753
      https://github.com/zanata/zanata/commit/8f80070fb3cdc9f18377382cac5887432ae46753
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Change 'Translate' text depending on user's permissions.

This text ill now read "Open" for users who don't have translation permissions. Otherwise it will read "Translate".


  Commit: c530223a78ed5ed89768a53572d73778149c9b91
      https://github.com/zanata/zanata/commit/c530223a78ed5ed89768a53572d73778149c9b91
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M zanata-parent/pom.xml

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


  Commit: 80fc559c80df109ba2bf5ec70b7839168c97e8d5
      https://github.com/zanata/zanata/commit/80fc559c80df109ba2bf5ec70b7839168c97e8d5
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - integrate navigation for editor not open


  Commit: 550e22a3a96048df9e9d4bc7bc12349bb74fc7ee
      https://github.com/zanata/zanata/commit/550e22a3a96048df9e9d4bc7bc12349bb74fc7ee
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-parent/pom.xml

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


  Commit: 9a43030adb9337219ee1f3d87e905a1c9ef835da
      https://github.com/zanata/zanata/commit/9a43030adb9337219ee1f3d87e905a1c9ef835da
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  Add Gravatar support.


  Commit: 78506f4fcfe79cd0a74aa7beb4db338edb9a859d
      https://github.com/zanata/zanata/commit/78506f4fcfe79cd0a74aa7beb4db338edb9a859d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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


  Commit: 7802d91e78870fca30e0b06be1bd2aafbb8a765e
      https://github.com/zanata/zanata/commit/7802d91e78870fca30e0b06be1bd2aafbb8a765e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  update cobertura config to exclude some of the classes


  Commit: 3bc6bc4ec842070dd77a4b16b3223cffd0416d5c
      https://github.com/zanata/zanata/commit/3bc6bc4ec842070dd77a4b16b3223cffd0416d5c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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


  Commit: b65a75fef5c66e70fe504b85d40a8e8203566ce9
      https://github.com/zanata/zanata/commit/b65a75fef5c66e70fe504b85d40a8e8203566ce9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

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

  Log Message:
  -----------
  Minor layout and style changes.


  Commit: bdc88de317e2e6e32378c87bf1745090add84c94
      https://github.com/zanata/zanata/commit/bdc88de317e2e6e32378c87bf1745090add84c94
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

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

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


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

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.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:
  -----------
  Change GetTransMemoryHandler to return multiple strings per TextFlow

Also had to split TranslationMemoryGlossaryItem into SearchResultItem,
TransMemoryResultItem and GlossaryResultItem and related UI classes.

(Sorting of TM results still needs to account for multiple strings.)

TransMemoryQuery.toString() shortens now query strings.


  Commit: 94d2fff4d8781e56274aa62c3b721de0bb570a4b
      https://github.com/zanata/zanata/commit/94d2fff4d8781e56274aa62c3b721de0bb570a4b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java

  Log Message:
  -----------
  Plural support - fix selected source panel border


  Commit: d7984275f2f988cb503ec2b49ad022817eada1b7
      https://github.com/zanata/zanata/commit/d7984275f2f988cb503ec2b49ad022817eada1b7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.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/SourcePanel.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-parent/pom.xml

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


  Commit: a00d56a4cf23a9e8b24b55f8a18e20f3573fbb7b
      https://github.com/zanata/zanata/commit/a00d56a4cf23a9e8b24b55f8a18e20f3573fbb7b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    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/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/presenter/SourceContentsPresenter.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/ui/Editor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - fix editor behaviour, fix validation panel message display


  Commit: b64d3b6d66317336a12cd4d3893f70776bf55980
      https://github.com/zanata/zanata/commit/b64d3b6d66317336a12cd4d3893f70776bf55980
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.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:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572


  Commit: 54384ae5aaa9e8a5c460ac9e106668b134944dfe
      https://github.com/zanata/zanata/commit/54384ae5aaa9e8a5c460ac9e106668b134944dfe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.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/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.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/Pager.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.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/validation/ValidationService.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/shared/model/TransMemoryQuery.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java

  Log Message:
  -----------
  Remove unused imports


  Commit: 7c9ab805a7cd369bbb39c41dbdb87eeea1d5e44e
      https://github.com/zanata/zanata/commit/7c9ab805a7cd369bbb39c41dbdb87eeea1d5e44e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    A server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Add custom (reusable) loading component to the iteration view page.

Add a custom component that can be used to indicate that a page is loading data via ajax.


  Commit: 71948bf2375ff95b5e7609699f568bd9b0ab0299
      https://github.com/zanata/zanata/commit/71948bf2375ff95b5e7609699f568bd9b0ab0299
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Plural support - move colored border to each textfile


  Commit: edc0412a6c4abab992ba29cc89b75415727a454e
      https://github.com/zanata/zanata/commit/edc0412a6c4abab992ba29cc89b75415727a454e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

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

  Log Message:
  -----------
  Add escaping of TM queries for plurals.


  Commit: 32a28413e7c5ce33bf8bb366934e2ceda2c86aed
      https://github.com/zanata/zanata/commit/32a28413e7c5ce33bf8bb366934e2ceda2c86aed
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    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/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/presenter/TransUnitNavigationPresenter.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/resources/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.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/table/column/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.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/client/view/TransUnitNavigationView.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.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/DummyGetTransMemoryDetailsCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

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


  Commit: cae8346d96a9d840e5cfb0028468df9e551daebe
      https://github.com/zanata/zanata/commit/cae8346d96a9d840e5cfb0028468df9e551daebe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

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

  Log Message:
  -----------
  Display source column of TM using pre elements for consistency with target column


  Commit: 6d052f1be733567ae5863847fce97f8ea2bb0058
      https://github.com/zanata/zanata/commit/6d052f1be733567ae5863847fce97f8ea2bb0058
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.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/GlossaryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.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:
  -----------
  Display multiple source/target strings in translation memory table

Also change similarity from int to double.


  Commit: cf8afa890e9abec7e8f37d7e90349fff2ed32f58
      https://github.com/zanata/zanata/commit/cf8afa890e9abec7e8f37d7e90349fff2ed32f58
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    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/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.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/presenter/TranslationEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.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/validation/ValidationService.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/shared/model/TransMemoryQuery.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    A server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java

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


  Commit: 0f98fb477c1a31b7db9b75cc29f4667b3b56dc94
      https://github.com/zanata/zanata/commit/0f98fb477c1a31b7db9b75cc29f4667b3b56dc94
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    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/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/ui/Editor.java

  Log Message:
  -----------
  Plural support - fix double click to open editor


  Commit: 728c37c993fafdcdd5f9fa3f3f2f1c8fe245d18a
      https://github.com/zanata/zanata/commit/728c37c993fafdcdd5f9fa3f3f2f1c8fe245d18a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    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/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/ui/Editor.java

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


  Commit: 2cda37f3888e08026ccdac695c45bb9ca9552e63
      https://github.com/zanata/zanata/commit/2cda37f3888e08026ccdac695c45bb9ca9552e63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Plural support - open editor when click copy source, remove outline from buttons


  Commit: 6d351fb23681a62b080f8d4947cd0e2d7ad58685
      https://github.com/zanata/zanata/commit/6d351fb23681a62b080f8d4947cd0e2d7ad58685
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.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/GlossaryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.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:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572


  Commit: aefa0d3be400847991e2aef8b0bf5f5fd135f031
      https://github.com/zanata/zanata/commit/aefa0d3be400847991e2aef8b0bf5f5fd135f031
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Add border around plural forms in translation memory table


  Commit: 41837e41954d9f24cd2330351ce6abe871a1bcb5
      https://github.com/zanata/zanata/commit/41837e41954d9f24cd2330351ce6abe871a1bcb5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/TargetContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

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


  Commit: 4cb35b450c7e20a08558c894470e38f017e86faa
      https://github.com/zanata/zanata/commit/4cb35b450c7e20a08558c894470e38f017e86faa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Plural support - implement view mode navigation shortcut


  Commit: 26be2ddc622a0e87da23fb7f4f3235a2ada3e360
      https://github.com/zanata/zanata/commit/26be2ddc622a0e87da23fb7f4f3235a2ada3e360
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java

  Log Message:
  -----------
  Fix copyTrans push issue.

Some persistent collections were not being properly copied on setters. Also reverted the contents field to eager on all the containing entities.


  Commit: 1041bd21293f6419f4cfca796066cfa70059e920
      https://github.com/zanata/zanata/commit/1041bd21293f6419f4cfca796066cfa70059e920
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.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/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/ui/DiffMatchPatchLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.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/GlossaryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.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/DummyGetGlossaryCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java

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


  Commit: 41ec73b36af61920bc3f521197552bda35b49058
      https://github.com/zanata/zanata/commit/41ec73b36af61920bc3f521197552bda35b49058
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    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

  Log Message:
  -----------
  Plural support - fix null exception in currentDisplay


  Commit: 0210f849f72fa0e2a43370d17d23030cd04fde41
      https://github.com/zanata/zanata/commit/0210f849f72fa0e2a43370d17d23030cd04fde41
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

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


  Commit: 1c38492a5779d1f5d7142295d1a87a8daf3855ae
      https://github.com/zanata/zanata/commit/1c38492a5779d1f5d7142295d1a87a8daf3855ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Refactor static widget CellTable columns


  Commit: 1b47de22a9787bf7a5c738f4521acfacba8decb6
      https://github.com/zanata/zanata/commit/1b47de22a9787bf7a5c738f4521acfacba8decb6
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Fix layout issue on iteration view page.

The menu was being hidden by the language list table due to a css positioning misconfiguration.


  Commit: 4fc0805d3d2ced355146df5410a747b2091c07ff
      https://github.com/zanata/zanata/commit/4fc0805d3d2ced355146df5410a747b2091c07ff
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.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/presenter/TranslationPresenter.java

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


  Commit: ceb451665a64a893f5db95f11375134aeeb7003b
      https://github.com/zanata/zanata/commit/ceb451665a64a893f5db95f11375134aeeb7003b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - change validation service to update widget interface


  Commit: 1a4f83df06bde56b896228f4df35c797c3c954c3
      https://github.com/zanata/zanata/commit/1a4f83df06bde56b896228f4df35c797c3c954c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Change TM Copy button to copy all plural forms, and cancel button to cancel all changes to a TextFlowTarget


  Commit: c2a0ce0db1ecd58ba5af5de206fdfef87b363972
      https://github.com/zanata/zanata/commit/c2a0ce0db1ecd58ba5af5de206fdfef87b363972
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.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/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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


  Commit: 4f0ced0973b04fe682f9af897c21afddf14afd03
      https://github.com/zanata/zanata/commit/4f0ced0973b04fe682f9af897c21afddf14afd03
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Fix broken test


  Commit: cd24c1966030371287830d127c224f45b1b47fc9
      https://github.com/zanata/zanata/commit/cd24c1966030371287830d127c224f45b1b47fc9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  work in progress - change editor to remain open inside one transunit


  Commit: 68c5f914d9d1e1ebcb54375b2b85cc53e8c6deb8
      https://github.com/zanata/zanata/commit/68c5f914d9d1e1ebcb54375b2b85cc53e8c6deb8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java


  Commit: ffd8065c66f5a377cabcd9b45166753c7638a9aa
      https://github.com/zanata/zanata/commit/ffd8065c66f5a377cabcd9b45166753c7638a9aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml

  Log Message:
  -----------
  Plural support - Implement validation button in validationPanel


  Commit: b0f18fe80f43bcd2b3c2fe67afed7f263f63b61f
      https://github.com/zanata/zanata/commit/b0f18fe80f43bcd2b3c2fe67afed7f263f63b61f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml


  Commit: 5b68218227950a7a4f36650167428c020db57158
      https://github.com/zanata/zanata/commit/5b68218227950a7a4f36650167428c020db57158
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - implement validation triggers when text changed


  Commit: 6f01eaf00e14a176640ab8e97df9f277bb2ede9f
      https://github.com/zanata/zanata/commit/6f01eaf00e14a176640ab8e97df9f277bb2ede9f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    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/ToggleEditor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - change how validation panel got inserted into editor


  Commit: 10183fb6303ad2ad41241cb19010d738aab84a86
      https://github.com/zanata/zanata/commit/10183fb6303ad2ad41241cb19010d738aab84a86
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  opening up all editors for one transunit


  Commit: f6b14c01c0cd74bb1c1c6cf19cd72477a9852971
      https://github.com/zanata/zanata/commit/f6b14c01c0cd74bb1c1c6cf19cd72477a9852971
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.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

  Log Message:
  -----------
  workaround for history exception plus new editor change


  Commit: 7767b7b52ff3f9fff6ef6f0bc920b441777e0aa0
      https://github.com/zanata/zanata/commit/7767b7b52ff3f9fff6ef6f0bc920b441777e0aa0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    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/TargetContentsPresenter.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/ToggleEditor.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  refactor and fix TargetContentsPresenterTest


  Commit: 9b811c1ecfa9a6026661f70712fcda6786b8fef7
      https://github.com/zanata/zanata/commit/9b811c1ecfa9a6026661f70712fcda6786b8fef7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java

  Log Message:
  -----------
  ignore some history related tests after workaround fix


  Commit: bf49ad897f5a94e4b9b02c86637dc2954abca41b
      https://github.com/zanata/zanata/commit/bf49ad897f5a94e4b9b02c86637dc2954abca41b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  minor unit test


  Commit: f05cdd5e885cc2b5cfb4c7187b6993e7fc363a05
      https://github.com/zanata/zanata/commit/f05cdd5e885cc2b5cfb4c7187b6993e7fc363a05
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/move_task_down.png

  Log Message:
  -----------
  remove unused image and resource reference


  Commit: 601393548e6d2af1ecee9a7a322d59f3b18e8e09
      https://github.com/zanata/zanata/commit/601393548e6d2af1ecee9a7a322d59f3b18e8e09
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Plural support - fire validation event for selected trans unit


  Commit: f95707510f49c8f897a1aa8e30842436048a35a0
      https://github.com/zanata/zanata/commit/f95707510f49c8f897a1aa8e30842436048a35a0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java

  Log Message:
  -----------
  Plural support - Fix validation firing event


  Commit: 2524ddda5ed99347253b7637019b3aec1c9fc429
      https://github.com/zanata/zanata/commit/2524ddda5ed99347253b7637019b3aec1c9fc429
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - fire validation upon requestValidation event


  Commit: af76530ca1c7a28c171b8e5278aee5bb8ab95a96
      https://github.com/zanata/zanata/commit/af76530ca1c7a28c171b8e5278aee5bb8ab95a96
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Plural support - fix test


  Commit: 707881a62ecb7d0a7f6bf3fc881e0c37e8c87976
      https://github.com/zanata/zanata/commit/707881a62ecb7d0a7f6bf3fc881e0c37e8c87976
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  add javamelody


  Commit: af7ccce56a7e0b00f248ad8010c4d658cfa5c679
      https://github.com/zanata/zanata/commit/af7ccce56a7e0b00f248ad8010c4d658cfa5c679
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    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/ui/Editor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

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


  Commit: 68c2278ae3ca6d7797674621aa9aa276812e194b
      https://github.com/zanata/zanata/commit/68c2278ae3ca6d7797674621aa9aa276812e194b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Redesign right column hover action


  Commit: 844f000af91964c5137e0d62ba36fe390e26b5f8
      https://github.com/zanata/zanata/commit/844f000af91964c5137e0d62ba36fe390e26b5f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Changed css style for iteration page


  Commit: 6354d8e5d7728d01ca2f1ce681a29fadbd60aeb3
      https://github.com/zanata/zanata/commit/6354d8e5d7728d01ca2f1ce681a29fadbd60aeb3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  javamelody restricted to admin access


  Commit: bb43ad44e070cddabc4ec33ac5939ed528d5b872
      https://github.com/zanata/zanata/commit/bb43ad44e070cddabc4ec33ac5939ed528d5b872
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css

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


  Commit: 53a8ceeaa3e70a6992b955f535957784f2f3bbd0
      https://github.com/zanata/zanata/commit/53a8ceeaa3e70a6992b955f535957784f2f3bbd0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java

  Log Message:
  -----------
  Resize TM source and target column


  Commit: 8904f5a0fe9d35af8948e4e9fb6dae11afdeee18
      https://github.com/zanata/zanata/commit/8904f5a0fe9d35af8948e4e9fb6dae11afdeee18
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/move_task_down.png
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-parent/pom.xml

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


  Commit: 84dbb52cc921ace9c0e9ff8ab368e19fcd5bff49
      https://github.com/zanata/zanata/commit/84dbb52cc921ace9c0e9ff8ab368e19fcd5bff49
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java

  Log Message:
  -----------
  Correct issue with History objects.

Correct an issue that was causing a LazyLoadException in certain cases when trying to generate history objects.


  Commit: f708732fff2709f064ae3d39df08caa62b4f924f
      https://github.com/zanata/zanata/commit/f708732fff2709f064ae3d39df08caa62b4f924f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    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/TableResources.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/resources/NavigationMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/move_task_down.png
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-parent/pom.xml

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

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java


  Commit: d021440b46b9d5320f171f63928cd230d817d2ed
      https://github.com/zanata/zanata/commit/d021440b46b9d5320f171f63928cd230d817d2ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java

  Log Message:
  -----------
  fix unit test


  Commit: 2ec4d6f1738bcaaad7cc7e9c289deee3f2f50d7f
      https://github.com/zanata/zanata/commit/2ec4d6f1738bcaaad7cc7e9c289deee3f2f50d7f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java

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


  Commit: 1af3bfcfc5d972fea45723cc8613b00066993f04
      https://github.com/zanata/zanata/commit/1af3bfcfc5d972fea45723cc8613b00066993f04
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java

  Log Message:
  -----------
  minor fix


  Commit: 1d43f6c40d1f76f947120139e794158b1e59132a
      https://github.com/zanata/zanata/commit/1d43f6c40d1f76f947120139e794158b1e59132a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs

  Log Message:
  -----------
  eclipse format for intellij


  Commit: 49fe754baf4886bcf11ccf0687ea38cf8c50324c
      https://github.com/zanata/zanata/commit/49fe754baf4886bcf11ccf0687ea38cf8c50324c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs

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


  Commit: ba01ea07f9b609ef54d7e85a7cf8b98df2624fb8
      https://github.com/zanata/zanata/commit/ba01ea07f9b609ef54d7e85a7cf8b98df2624fb8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml

  Log Message:
  -----------
  improve java melody usage


  Commit: 1c58dd6a62e6f342949091707be9d45ab06e3bf2
      https://github.com/zanata/zanata/commit/1c58dd6a62e6f342949091707be9d45ab06e3bf2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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

  Log Message:
  -----------
  typo fix


  Commit: b5ba2f6854350df3ffd5eb1f8f4a96faa67b57e1
      https://github.com/zanata/zanata/commit/b5ba2f6854350df3ffd5eb1f8f4a96faa67b57e1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
    M common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
    M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml

  Log Message:
  -----------
  Fix GlossaryTerm with TermComment relationship and test


  Commit: 0a3eff6b3a08076b13facc7f8920b2e076e76a7f
      https://github.com/zanata/zanata/commit/0a3eff6b3a08076b13facc7f8920b2e076e76a7f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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

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


  Commit: 6c4e2a170b37b5cf23d8b12a9178f39496d91b33
      https://github.com/zanata/zanata/commit/6c4e2a170b37b5cf23d8b12a9178f39496d91b33
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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

  Log Message:
  -----------
  Glossary - fix issues reported for copy glossary term:https://bugzilla.redhat.com/show_bug.cgi?id=788294#c4


  Commit: 6c57d71f3102158992aa8766a2e1c7d826a3ecd4
      https://github.com/zanata/zanata/commit/6c57d71f3102158992aa8766a2e1c7d826a3ecd4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

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

  Log Message:
  -----------
  Merge branch 'rhbz788294' into integration/master


  Commit: d579be3d433585374bd3bec2d3f73fbbf44d3d34
      https://github.com/zanata/zanata/commit/d579be3d433585374bd3bec2d3f73fbbf44d3d34
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml

  Log Message:
  -----------
  Apply css in admin menu for monitoring section


  Commit: 73112b9c8c63c88c74841ef961e12c9f592ea734
      https://github.com/zanata/zanata/commit/73112b9c8c63c88c74841ef961e12c9f592ea734
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/pom.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge remote branch 'origin/test-scope-profile' into integration/master


  Commit: a33731bcfc87799e70d0abca09538b2f7719e59b
      https://github.com/zanata/zanata/commit/a33731bcfc87799e70d0abca09538b2f7719e59b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
    M client/zanata-adapter-xliff/pom.xml
    M client/zanata-client-ant-po/pom.xml
    M client/zanata-client-ant-properties/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-common-api/pom.xml
    M common/zanata-common-util/pom.xml
    M common/zanata-rest-client/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-war/pom.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Move more test dependencies into test-deps profile


  Commit: 2a1c1b123ec0003555c971bb9230f0b727c51370
      https://github.com/zanata/zanata/commit/2a1c1b123ec0003555c971bb9230f0b727c51370
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    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
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
    M common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
    A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
    M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch	
    A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs
    M server/zanata-war/pom.xml
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/PoUtility.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/ContentFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FuzzyFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/OperatorFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/PhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/SourcePhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TargetPhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.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/TableEditorView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopySourceEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.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/DocumentListPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    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/presenter/TransUnitNavigationPresenter.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
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasSelectableSource.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.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/client/view/TransUnitNavigationView.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/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.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/GetTransUnitsNavigationResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
    M server/zanata-war/src/main/resources/db/db.changelog.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/resources/messages.properties
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    A server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    M server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.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/DummyGetTransMemoryDetailsCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
    M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml
    M server/zanata-war/src/test/resources/META-INF/persistence.xml
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-parent/pom.xml

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


  Commit: 90325cb0059eb3c977ba78bb132e1fbc41d96231
      https://github.com/zanata/zanata/commit/90325cb0059eb3c977ba78bb132e1fbc41d96231
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/pom.xml
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Clean up test dependencies


Compare: https://github.com/zanata/zanata/compare/ec22e00...90325cb


More information about the zanata-commits mailing list