[zanata/zanata] 076615: Reenable chat feature in workspace presenter

GitHub noreply at github.com
Sun Jun 17 23:34:15 UTC 2012


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 07661553c6b4e6f5bafa18835afe4cd2593d8abc
      https://github.com/zanata/zanata/commit/07661553c6b4e6f5bafa18835afe4cd2593d8abc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-03 (Sun, 03 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.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/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

  Log Message:
  -----------
  Reenable chat feature in workspace presenter


  Commit: cb05ffe7f005f8455ad94e5e9a3536f5bbbd4f2f
      https://github.com/zanata/zanata/commit/cb05ffe7f005f8455ad94e5e9a3536f5bbbd4f2f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-03 (Sun, 03 Jun 2012)

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

  Log Message:
  -----------
  Fix test


  Commit: 87fea6ed9610eac81448dcd5c6e9e2002bb202a8
      https://github.com/zanata/zanata/commit/87fea6ed9610eac81448dcd5c6e9e2002bb202a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'master' into EnableChat


  Commit: b5cc7a683ca49c86028c05d3eb82fc0dafccba89
      https://github.com/zanata/zanata/commit/b5cc7a683ca49c86028c05d3eb82fc0dafccba89
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

  Log Message:
  -----------
  Enable blinking on message alert


  Commit: 984dc4f555550255ac5f2045c9bd45393c9d2c0d
      https://github.com/zanata/zanata/commit/984dc4f555550255ac5f2045c9bd45393c9d2c0d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'master' into EnableChat


  Commit: f71262f752eec70afd9695cbbd9efd87037040aa
      https://github.com/zanata/zanata/commit/f71262f752eec70afd9695cbbd9efd87037040aa
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M copyright.txt
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  Merge branch 'master' into EnableChat


  Commit: 67ca4760656180a81f139d5263c12955a19ca4b5
      https://github.com/zanata/zanata/commit/67ca4760656180a81f139d5263c12955a19ca4b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: 4f6ff689679a6076421985964c7168d66e6fddb1
      https://github.com/zanata/zanata/commit/4f6ff689679a6076421985964c7168d66e6fddb1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into EnableChat

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: 42de941105b33a4256a7c5fb8c819ca8af6a0690
      https://github.com/zanata/zanata/commit/42de941105b33a4256a7c5fb8c819ca8af6a0690
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/PublishWorkspaceChatEvent.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/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceChatData.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChat.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/PublishWorkspaceChatAction.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

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


  Commit: f601d0c5815852ac26cb4907f7c1a31fe19871ba
      https://github.com/zanata/zanata/commit/f601d0c5815852ac26cb4907f7c1a31fe19871ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-17 (Sun, 17 Jun 2012)

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

  Log Message:
  -----------
  Fix test for enabling chat feature in workspace


Compare: https://github.com/zanata/zanata/compare/ef99c44c8192...f601d0c58158


More information about the zanata-commits mailing list