[zanata/zanata] 2f557c: rhbz836051 use set of key combinations for key sho...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 2f557c6d1403ee59ab2d2859768e7ad7da6cabe4
      https://github.com/zanata/zanata/commit/2f557c6d1403ee59ab2d2859768e7ad7da6cabe4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java

  Log Message:
  -----------
  rhbz836051 use set of key combinations for key shortcuts


  Commit: 42fcec19448e89b2ab802cc7c7fac3b6f60e9ea2
      https://github.com/zanata/zanata/commit/42fcec19448e89b2ab802cc7c7fac3b6f60e9ea2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

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

  Log Message:
  -----------
  rhbz836051 adjust test expectations for less shortcut registrations


  Commit: f4556c698171d6773d801c83f140b80a60ca75dd
      https://github.com/zanata/zanata/commit/f4556c698171d6773d801c83f140b80a60ca75dd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Merge branch 'key-shortcut-aliases' into integration/master


Compare: https://github.com/zanata/zanata/compare/13dc6beaf34e...f4556c698171