[zanata-commits] [zanata/zanata] f30989: Include 'Esc' key option to close editor in config...

[noreply at github.com]

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

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

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.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/TableConstants.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/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java

  Log Message:
  -----------
  Include 'Esc' key option to close editor in config panel, consolidate all shortcut keys rules into CheckKey


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

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.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/TableConstants.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/presenter/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java

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

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/TableEditorPresenter.java


Compare: https://github.com/zanata/zanata/compare/8709847...4af3297