[zanata/zanata-server] 2598c3: rhbz961163 prevent Shift+W g triggering key-shortc...

GitHub noreply at github.com
Fri May 24 00:18:30 UTC 2013


  Branch: refs/heads/seam230final
  Home:   https://github.com/zanata/zanata-server
  Commit: 2598c302924447edd20413e75e9b99ec594eb0b0
      https://github.com/zanata/zanata-server/commit/2598c302924447edd20413e75e9b99ec594eb0b0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java

  Log Message:
  -----------
  rhbz961163 prevent Shift+W g triggering key-shortcut mode


  Commit: f624e364069ed517a881bb927cd56a4277981d48
      https://github.com/zanata/zanata-server/commit/f624e364069ed517a881bb927cd56a4277981d48
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 3222f795ffd7db51a8aa6a79a0bafbd5ad91ac33
      https://github.com/zanata/zanata-server/commit/3222f795ffd7db51a8aa6a79a0bafbd5ad91ac33
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

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

  Log Message:
  -----------
  disable test for now pending alias key rewrite


  Commit: c17b3932b0b0c06b55c2e87d81d5f9b133038c4d
      https://github.com/zanata/zanata-server/commit/c17b3932b0b0c06b55c2e87d81d5f9b133038c4d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

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

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: cdaad347305a50bd1682c14ea16218ab64b3ae8b
      https://github.com/zanata/zanata-server/commit/cdaad347305a50bd1682c14ea16218ab64b3ae8b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AttentionKeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutDisplay.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/KeyShortcutPresenterTest.java

  Log Message:
  -----------
  WIP rhbz961564 remove alias key and add stubs for attention key implementation


  Commit: c4fb479347a6391c40bf39d540d34a9eed2db6b3
      https://github.com/zanata/zanata-server/commit/c4fb479347a6391c40bf39d540d34a9eed2db6b3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java

  Log Message:
  -----------
  rhbz959115 Avoid DB access during TransactionSuccessEvent


  Commit: 3cd3fc01ea5f7fc9e982c293fc9b1de4e2eb7334
      https://github.com/zanata/zanata-server/commit/3cd3fc01ea5f7fc9e982c293fc9b1de4e2eb7334
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java

  Log Message:
  -----------
  use builder for AppPresenter key shortcuts


  Commit: af6d7408c8af3eee6aa9cbbef5dcdf3c65af4a15
      https://github.com/zanata/zanata-server/commit/af6d7408c8af3eee6aa9cbbef5dcdf3c65af4a15
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java

  Log Message:
  -----------
  use builder for GlossaryPresenter key shortcuts


  Commit: 8affc41e0c5d9bcc742fe044b49d4fe287eab0b0
      https://github.com/zanata/zanata-server/commit/8affc41e0c5d9bcc742fe044b49d4fe287eab0b0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java

  Log Message:
  -----------
  use builder for SearchResultsPresenter key shortcuts


  Commit: e152657843006b181537c95b3efe10dd1c124005
      https://github.com/zanata/zanata-server/commit/e152657843006b181537c95b3efe10dd1c124005
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java

  Log Message:
  -----------
  use builder for WorkspaceUsersPresenter key shortcuts


  Commit: dbd79af96b5904c7bbb055d545ec9b7938678f5a
      https://github.com/zanata/zanata-server/commit/dbd79af96b5904c7bbb055d545ec9b7938678f5a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java

  Log Message:
  -----------
  use builder for TransMemoryPresenter key shortcuts


  Commit: 281f4cb314541c46dd98819604af609ec0086573
      https://github.com/zanata/zanata-server/commit/281f4cb314541c46dd98819604af609ec0086573
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java

  Log Message:
  -----------
  remove obsolete KeyShortcut constructor


  Commit: 60cb6b7c1e94de17de444dfd1df2dac4d1b36430
      https://github.com/zanata/zanata-server/commit/60cb6b7c1e94de17de444dfd1df2dac4d1b36430
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java

  Log Message:
  -----------
  rhbz961564 add attention keys to KeyShortcut


  Commit: fb61fea7ebe382852ac0d2ef13fe67acf8d896da
      https://github.com/zanata/zanata-server/commit/fb61fea7ebe382852ac0d2ef13fe67acf8d896da
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java

  Log Message:
  -----------
  rhbz961564 remove 'alias' from Keys


  Commit: 15c67b491b6171fd3470c25d07271a6544f05152
      https://github.com/zanata/zanata-server/commit/15c67b491b6171fd3470c25d07271a6544f05152
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: a7f0355e4e8a9b89875b4df411b8a2a544f7fdf4
      https://github.com/zanata/zanata-server/commit/a7f0355e4e8a9b89875b4df411b8a2a544f7fdf4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java

  Log Message:
  -----------
  rhbz961564 add convenience constructor for single-key Keys


  Commit: d10135a6aaa26d1b0f398046ad9e4adcb42f5e62
      https://github.com/zanata/zanata-server/commit/d10135a6aaa26d1b0f398046ad9e4adcb42f5e62
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AttentionKeyShortcutPresenter.java

  Log Message:
  -----------
  rhbz961564 gut attention key presenter pending change of behaviour


  Commit: 2f7f2feeb681344dca25a506743d73cfc29501cf
      https://github.com/zanata/zanata-server/commit/2f7f2feeb681344dca25a506743d73cfc29501cf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcutManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.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/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java

  Log Message:
  -----------
  rhbz961564 add shortcut managers within shortcut presenter


  Commit: 87db98181ce22dc6bf3011d7935b9708f2243d17
      https://github.com/zanata/zanata-server/commit/87db98181ce22dc6bf3011d7935b9708f2243d17
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcutManager.java

  Log Message:
  -----------
  rhbz961564 update docs for shortcut manager


  Commit: cc291e4766360c143491bd499d8c4722ab1fe94a
      https://github.com/zanata/zanata-server/commit/cc291e4766360c143491bd499d8c4722ab1fe94a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  rhbz961564 fix tests and reactivate disabled test


  Commit: e4fb4d3e026114ed945db6086e86cd26861cab1e
      https://github.com/zanata/zanata-server/commit/e4fb4d3e026114ed945db6086e86cd26861cab1e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java

  Log Message:
  -----------
  rhbz961564 reactivate orange keyboard icon when in attention mode


  Commit: f91b62cb7c6ccc9076c022a259708b8fdd285785
      https://github.com/zanata/zanata-server/commit/f91b62cb7c6ccc9076c022a259708b8fdd285785
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimedAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Timer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactory.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactoryImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.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/KeyShortcutPresenterTest.java

  Log Message:
  -----------
  rhbz961564 add attention mode timeout controlled by presenter


  Commit: 2fd651d81dacbeac054db1e4e6bdd2ef92b0bb79
      https://github.com/zanata/zanata-server/commit/2fd651d81dacbeac054db1e4e6bdd2ef92b0bb79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  fix layout issue in document list: https://bugzilla.redhat.com/show_bug.cgi?id=959819


  Commit: 07fc60e4459000829179ec942f4d5bfcace1ded0
      https://github.com/zanata/zanata-server/commit/07fc60e4459000829179ec942f4d5bfcace1ded0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  rhbz961564 test invocation and timeout of attention mode


  Commit: 4d42c796bc61901314e47634dd0728783c0a242e
      https://github.com/zanata/zanata-server/commit/4d42c796bc61901314e47634dd0728783c0a242e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java

  Log Message:
  -----------
  rhbz961564 display attention key shortcuts in shortcut summary


  Commit: 4efdce5631b5ff0fe42ede7c8e8fd1669776475a
      https://github.com/zanata/zanata-server/commit/4efdce5631b5ff0fe42ede7c8e8fd1669776475a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-2.3.2


  Commit: 654dc20b6602f7ee9e8d48aaef26f0f3d801bd07
      https://github.com/zanata/zanata-server/commit/654dc20b6602f7ee9e8d48aaef26f0f3d801bd07
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 01e59540151e259dfe76b91807de9925a7cdd2df
      https://github.com/zanata/zanata-server/commit/01e59540151e259dfe76b91807de9925a7cdd2df
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java

  Log Message:
  -----------
  reload editor when click View in editor link from search replace view

This will prevent multiple code mirror instances has focues cursor


  Commit: 6c1fb9480f27f072aa13b48d05f2e23e0205de49
      https://github.com/zanata/zanata-server/commit/6c1fb9480f27f072aa13b48d05f2e23e0205de49
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml


  Commit: 3fe0e5ba2c48c1b6e54875101e1bf25fe2cbfc6a
      https://github.com/zanata/zanata-server/commit/3fe0e5ba2c48c1b6e54875101e1bf25fe2cbfc6a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AttentionKeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  rhbz961564 display attention key shortcuts when shortcut mode is active


  Commit: 714755f853817c57a0e2247df24397ef68f019c2
      https://github.com/zanata/zanata-server/commit/714755f853817c57a0e2247df24397ef68f019c2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-19 (Sun, 19 May 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java

  Log Message:
  -----------
  Merge branch 'release' into attention-key


  Commit: ba524f24fa11217695c57749a901ddca115e59d5
      https://github.com/zanata/zanata-server/commit/ba524f24fa11217695c57749a901ddca115e59d5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcutManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimedAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Timer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactory.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactoryImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AttentionKeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.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/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/presenter/WorkspaceUsersPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java

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


  Commit: e4448d467b6c9b88f25db4cc10be319ada3e624a
      https://github.com/zanata/zanata-server/commit/e4448d467b6c9b88f25db4cc10be319ada3e624a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.0.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  add adapter parameters string to HRawDocument


  Commit: e225fa3c38ce91ee47b101bdf4da89e55b2f48e2
      https://github.com/zanata/zanata-server/commit/e225fa3c38ce91ee47b101bdf4da89e55b2f48e2
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Change arquillian jboss home.


  Commit: d295a6fb0621f4f9565043221cb7b1ef69db93dd
      https://github.com/zanata/zanata-server/commit/d295a6fb0621f4f9565043221cb7b1ef69db93dd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/AliasKeyChangedEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/AttentionModeActivationEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcutManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimedAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/Timer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactory.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/keys/TimerFactoryImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AttentionKeyShortcutPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.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/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/presenter/WorkspaceUsersPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.0.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/integration/master' into seam230final

Conflicts:
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/891c1d1e20d0...d295a6fb0621


More information about the zanata-commits mailing list