[zanata-commits] [zanata/zanata] de9dfc: Fix bug: first/last string: https://bugzilla.redha...

[noreply at github.com]

  Branch: refs/heads/1.4
  Home:   https://github.com/zanata/zanata

  Commit: de9dfcc32c90f3a36abfbf6c3c9e354d3522dc1f
      https://github.com/zanata/zanata/commit/de9dfcc32c90f3a36abfbf6c3c9e354d3522dc1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-10-10 (Mon, 10 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/Resources.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
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/configure.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/configure.png

  Log Message:
  -----------
  Fix bug: first/last string: https://bugzilla.redhat.com/show_bug.cgi?id=743783, new configure icon


  Commit: c49430b06368f2571fa9cb7e958c921d789119ff
      https://github.com/zanata/zanata/commit/c49430b06368f2571fa9cb7e958c921d789119ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-10-10 (Mon, 10 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.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/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingTableModel.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
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/configure.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/configure.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png

  Log Message:
  -----------
  Merge branch 'rhbz743783' into 1.4

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


  Commit: d4b0eca297156877028f1de9d4fbc8669be3bde0
      https://github.com/zanata/zanata/commit/d4b0eca297156877028f1de9d4fbc8669be3bde0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-10-10 (Mon, 10 Oct 2011)

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

  Log Message:
  -----------
  Resolve conflict server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java when merge from rhbz743783 to 1.4


Compare: https://github.com/zanata/zanata/compare/41ce28e...d4b0eca