[zanata/zanata] 5b6821: Plural support - implement validation triggers whe...

GitHub noreply at github.com
Wed Apr 11 07:50:35 UTC 2012


  Branch: refs/heads/search-replace
  Home:   https://github.com/zanata/zanata
  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: 07a778fa48c7aa28ebbc24216dfb3ce09b20268d
      https://github.com/zanata/zanata/commit/07a778fa48c7aa28ebbc24216dfb3ce09b20268d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.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/HashUtil.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/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/type/ContentTypeType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
  A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs
  M server/zanata-war/pom.xml
  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/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/security/ZanataJpaIdentityStore.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/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.6a.xml
  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/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/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/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/search/LevenshteinUtilTest.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
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into search-replace

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
	server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
	server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
        one rule in search-replace branch that I don't remember adding, left in


  Commit: 2d5fd89319e11b10ae39a7e74d8aaa53a603af5b
      https://github.com/zanata/zanata/commit/2d5fd89319e11b10ae39a7e74d8aaa53a603af5b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java

  Log Message:
  -----------
  fix incompatible use of TransUnit in search-replace feature


Compare: https://github.com/zanata/zanata/compare/3d4efc1...2d5fd89


More information about the zanata-commits mailing list