[zanata/zanata] 6a5e5f: Implement color legend in both searchReplace and T...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 6a5e5fc7919bee72fffc81dbd036857562c837d8
      https://github.com/zanata/zanata/commit/6a5e5fc7919bee72fffc81dbd036857562c837d8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    A zanata-war/eclipse/launch/debug-gwt-zanata.launch
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java

  Log Message:
  -----------
  Implement color legend in both searchReplace and TM: https://bugzilla.redhat.com/show_bug.cgi?id=817548


  Commit: a8932cf57fa6c40311bdf35240b2ce6ea2a8bae8
      https://github.com/zanata/zanata/commit/a8932cf57fa6c40311bdf35240b2ce6ea2a8bae8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/adapter/DTDAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/exception/FileFormatAdapterException.java
    A zanata-war/src/main/java/org/zanata/rest/files/DocumentFileUploadForm.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    A zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


Compare: https://github.com/zanata/zanata/compare/bcb06a48334a...a8932cf57fa6