[zanata/zanata] c47d99: Add configurable email logging appender.

GitHub noreply at github.com
Tue Jul 10 04:28:04 UTC 2012


  Branch: refs/heads/2.0-gui-preview
  Home:   https://github.com/zanata/zanata
  Commit: c47d9969eb4ddcd5da96194dcd49f78a03762992
      https://github.com/zanata/zanata/commit/c47d9969eb4ddcd5da96194dcd49f78a03762992
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Add configurable email logging appender.


  Commit: 4ba07fe7d02e9b0881458a885c34621e617a8ac0
      https://github.com/zanata/zanata/commit/4ba07fe7d02e9b0881458a885c34621e617a8ac0
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

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


  Commit: c182b54e4dffa9ba581d2879332b93b6405fe39d
      https://github.com/zanata/zanata/commit/c182b54e4dffa9ba581d2879332b93b6405fe39d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

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


  Commit: 77049c49754d4c621a60bf396615ff57826d760e
      https://github.com/zanata/zanata/commit/77049c49754d4c621a60bf396615ff57826d760e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.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/TargetContentsPresenter.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

  Log Message:
  -----------
  move single row undo link to the editor


  Commit: 99acc1ce8fc5fd8bfa03850b4ac41c63e60f4d5b
      https://github.com/zanata/zanata/commit/99acc1ce8fc5fd8bfa03850b4ac41c63e60f4d5b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    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/SearchResultsPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java

  Log Message:
  -----------
  refacto RevertTransUnitUpdateLink to have callback for pre, post action


  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: 00a251ef9af0e72b5e0e7d38eebd913739bfe761
      https://github.com/zanata/zanata/commit/00a251ef9af0e72b5e0e7d38eebd913739bfe761
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

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

  Log Message:
  -----------
  minor change for S&R undone


  Commit: eddff231a89ea449eff061e5e99f368ffc5e5b13
      https://github.com/zanata/zanata/commit/eddff231a89ea449eff061e5e99f368ffc5e5b13
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

  Log Message:
  -----------
  Remove unnecessary test line.


  Commit: 13dc6beaf34ec4539230df47ad949a708b249ef8
      https://github.com/zanata/zanata/commit/13dc6beaf34ec4539230df47ad949a708b249ef8
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

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


  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


  Commit: 19a0f2a0dd98d77e18ee90c3bfb05d5ddf303f2b
      https://github.com/zanata/zanata/commit/19a0f2a0dd98d77e18ee90c3bfb05d5ddf303f2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Select all checkbox in search and replace: Fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=830006


  Commit: 183a1448d55024eb64047ebe49329c6f7fe815aa
      https://github.com/zanata/zanata/commit/183a1448d55024eb64047ebe49329c6f7fe815aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    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 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: ad870643e47c003b039f60b9eca6ccb6aab11fc9
      https://github.com/zanata/zanata/commit/ad870643e47c003b039f60b9eca6ccb6aab11fc9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidationTest.java

  Log Message:
  -----------
  split validator to normal printf and positional printf


  Commit: ce080ff002a3b92af28339d4b88c4ec42656f640
      https://github.com/zanata/zanata/commit/ce080ff002a3b92af28339d4b88c4ec42656f640
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/AbstractValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java

  Log Message:
  -----------
  rename and refactor to use interface


  Commit: a83d909e4213fd4dd3674df80d62985b984c3363
      https://github.com/zanata/zanata/commit/a83d909e4213fd4dd3674df80d62985b984c3363
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/AbstractValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidationTest.java

  Log Message:
  -----------
  validator can have mutually exclusive validators


  Commit: 3848ea2b757b7075a24dffed7ac40cb12ef86779
      https://github.com/zanata/zanata/commit/3848ea2b757b7075a24dffed7ac40cb12ef86779
  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/view/KeyShortcutView.ui.xml

  Log Message:
  -----------
  rhbz836051 add spacing and lines to key shortcut summary


  Commit: 4d1acb815875c8ca0bcf0d3b56dfd9d9a295bc77
      https://github.com/zanata/zanata/commit/4d1acb815875c8ca0bcf0d3b56dfd9d9a295bc77
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    A zanata-war/src/main/resources/org/zanata/search/stopwords.txt
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java

  Log Message:
  -----------
  rhbz825202 Calculate string similarity based on words, not characters


  Commit: 6ff52d18d52880c3ef1096326c6a15f510614bab
      https://github.com/zanata/zanata/commit/6ff52d18d52880c3ef1096326c6a15f510614bab
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  rhbz836051 adjust sizing and centering of key shortcut summary


  Commit: 02231c60ab2cbfa6ca80fbb57d392d0cdf293dbc
      https://github.com/zanata/zanata/commit/02231c60ab2cbfa6ca80fbb57d392d0cdf293dbc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml

  Log Message:
  -----------
  Apply css in undoing and undone in notification area


  Commit: e495aa1a4ca961d110e3ba382ef82fa2f91e328a
      https://github.com/zanata/zanata/commit/e495aa1a4ca961d110e3ba382ef82fa2f91e328a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.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/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/AbstractValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    A zanata-war/src/main/resources/org/zanata/search/stopwords.txt
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidationTest.java

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


  Commit: 60d974e8be2e6e4b22e5bed354f8c146e57ab51b
      https://github.com/zanata/zanata/commit/60d974e8be2e6e4b22e5bed354f8c146e57ab51b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.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/TargetContentsPresenter.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/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/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUndoHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/InlineLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.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/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.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/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/AbstractValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/search/stopwords.txt
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidationTest.java

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview


  Commit: 0fd8d792efb33ed74e0e143d0c3e6369400ebe3c
      https://github.com/zanata/zanata/commit/0fd8d792efb33ed74e0e143d0c3e6369400ebe3c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.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/DashboardPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.ui.xml

  Log Message:
  -----------
  Add empty dashboard view


  Commit: 76157f1b2f868ad6283a972907b714cd502373b9
      https://github.com/zanata/zanata/commit/76157f1b2f868ad6283a972907b714cd502373b9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java

  Log Message:
  -----------
  increase functional test language page wait time to 20 sec


  Commit: 9d381dac98990ee6f04c62a967380c5d95065920
      https://github.com/zanata/zanata/commit/9d381dac98990ee6f04c62a967380c5d95065920
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

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

  Log Message:
  -----------
  Bug 812730 - TM merge wording change


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.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
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    A zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    A zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png

  Log Message:
  -----------
  add icons for key shortcuts and project-wide search


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

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

  Log Message:
  -----------
  fix app presenter test


  Commit: 0ed796ca4bcd002f570f3d7afcda6a505af09fcf
      https://github.com/zanata/zanata/commit/0ed796ca4bcd002f570f3d7afcda6a505af09fcf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

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

  Log Message:
  -----------
  Fix 'select all' bug in search and replace: https://bugzilla.redhat.com/show_bug.cgi?id=830006


  Commit: cd2051cff32d52ae55dbc87b615427db7cca2c6f
      https://github.com/zanata/zanata/commit/cd2051cff32d52ae55dbc87b615427db7cca2c6f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.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
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    A zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    A zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

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


  Commit: 1563a9e4f53b85a4c30650656d6d9f69cf300ccd
      https://github.com/zanata/zanata/commit/1563a9e4f53b85a4c30650656d6d9f69cf300ccd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/WebTranPage.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/KeyShortcut.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
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    A zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    A zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into 2.0-gui-preview

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
	zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java


Compare: https://github.com/zanata/zanata/compare/5ce31190a7e5...1563a9e4f53b


More information about the zanata-commits mailing list