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

GitHub noreply at github.com
Tue Jun 19 01:09:43 UTC 2012


  Branch: refs/heads/2.0-gui-preview
  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: 7699cdc390091e68843d35654636ae3d4c504539
      https://github.com/zanata/zanata/commit/7699cdc390091e68843d35654636ae3d4c504539
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-06-05 (Tue, 05 Jun 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/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Work in progress: move notification messages into popup, remove from top menu


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Work in progress: adding timestamp into message


  Commit: 7ab4dfb587ee5e94f8baf604656b7d10d692be89
      https://github.com/zanata/zanata/commit/7ab4dfb587ee5e94f8baf604656b7d10d692be89
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/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/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.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/NotificationPresenterTest.java

  Log Message:
  -----------
  Work in progress: fixing test


  Commit: 5677884077d25decbaac0003345b6a3c0f646b75
      https://github.com/zanata/zanata/commit/5677884077d25decbaac0003345b6a3c0f646b75
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  work in progress: fixing test


  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: b38ca683fb98ae1ddaedb91bf12d6d307fc5f1a1
      https://github.com/zanata/zanata/commit/b38ca683fb98ae1ddaedb91bf12d6d307fc5f1a1
  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 rhbz828624


  Commit: 172388019dbc03398f3d3e207006e5fa9c49e5ba
      https://github.com/zanata/zanata/commit/172388019dbc03398f3d3e207006e5fa9c49e5ba
  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/webtrans/client/resources/WebTransMessages.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/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java

  Log Message:
  -----------
  Moved Info and Warning msg into notification, add timestamp into messages


  Commit: f6a7382bf27bf9e35d58d36e93c321c95268a598
      https://github.com/zanata/zanata/commit/f6a7382bf27bf9e35d58d36e93c321c95268a598
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-06-07 (Thu, 07 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/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  add tests for simple project-wide search execution


  Commit: f803d87a8fcd7b6d3bec53d380842f6fae25a199
      https://github.com/zanata/zanata/commit/f803d87a8fcd7b6d3bec53d380842f6fae25a199
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-06-07 (Thu, 07 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/view/SearchResultsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

  Log Message:
  -----------
  add test for select-all checkbox in SearchResultsPresenter


  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: 56a7b5e94732632a8a420e1270bed43050502bdd
      https://github.com/zanata/zanata/commit/56a7b5e94732632a8a420e1270bed43050502bdd
  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 rhbz828624


  Commit: f2d24015c532b1ef5af13f70a0db2cee68c56755
      https://github.com/zanata/zanata/commit/f2d24015c532b1ef5af13f70a0db2cee68c56755
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rhbz831035 - Add on-demand copyTrans.

First implementation, might present http timeouts if there is too much data to query. Future implementations should add background process and progress feedback to be scalable.


  Commit: 3131aaa5a9314a8dc8cb50063434e045ef5083f3
      https://github.com/zanata/zanata/commit/3131aaa5a9314a8dc8cb50063434e045ef5083f3
  Author: Carlos Munoz <camunoz 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
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java

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


  Commit: bfb4f495c10c154fd4e91b6f4f34c3df0eead620
      https://github.com/zanata/zanata/commit/bfb4f495c10c154fd4e91b6f4f34c3df0eead620
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

  Log Message:
  -----------
  Reduce logging volume


  Commit: c0b2dd926f522f98c64d3f73ee3da8314a971b08
      https://github.com/zanata/zanata/commit/c0b2dd926f522f98c64d3f73ee3da8314a971b08
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java

  Log Message:
  -----------
  fix potential bug - codemirror syntax highlight will cause browser freeze when performing on empty/null string


  Commit: c6d34feaf13daa3afc53f6cd9ac5df14d73a891b
      https://github.com/zanata/zanata/commit/c6d34feaf13daa3afc53f6cd9ac5df14d73a891b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/jboss-service-snippet.xml
    R zanata-war/src/etc/properties-service-sample.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Bug 831482 - Define system properties service MBean in JBoss


  Commit: 3edf1acc777962a00357527fab59bf78dc2953dc
      https://github.com/zanata/zanata/commit/3edf1acc777962a00357527fab59bf78dc2953dc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  rhbz826318 Add cache headers for GWT resources


  Commit: ef99c44c8192676d07c0428ba99bf4d8c6ed8f07
      https://github.com/zanata/zanata/commit/ef99c44c8192676d07c0428ba99bf4d8c6ed8f07
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

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

  Log Message:
  -----------
  update pom versions for next development iteration


  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


  Commit: cf9429644e55dbcf864411e293add49b6a4c5a04
      https://github.com/zanata/zanata/commit/cf9429644e55dbcf864411e293add49b6a4c5a04
  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/editor/table/TableEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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/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/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.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/NotificationPresenterTest.java

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


  Commit: de5ff2547dc6d755878906b8b1d6b367605da568
      https://github.com/zanata/zanata/commit/de5ff2547dc6d755878906b8b1d6b367605da568
  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/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml

  Log Message:
  -----------
  Resize time label in notification view


  Commit: 9c5dbc2d49870aa8e8b1c4ea59e0b00cc54103cc
      https://github.com/zanata/zanata/commit/9c5dbc2d49870aa8e8b1c4ea59e0b00cc54103cc
  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/action/ProjectIterationHome.java

  Log Message:
  -----------
  Fix error message: https://bugzilla.redhat.com/show_bug.cgi?id=737736#c2


  Commit: cb7a674abd19dce1a277ce2842d276f8af6f589f
      https://github.com/zanata/zanata/commit/cb7a674abd19dce1a277ce2842d276f8af6f589f
  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/action/ProjectIterationHome.java

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


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

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/jboss-service-snippet.xml
    R zanata-war/src/etc/properties-service-sample.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/GWTCacheControlFilter.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/events/PublishWorkspaceChatEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasErrorNotificationLabel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/WorkspaceUsersPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.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/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/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/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    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/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.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/client/presenter/WorkspaceUsersPresenterTest.java

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


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

  Changed paths:
    M zanata-war/etc/gui-preview/logo2.png
    M zanata-war/etc/gui-preview/logo2.xcf
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kchart.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    A zanata-war/src/main/resources/images/javamelody.png
    M zanata-war/src/main/resources/images/logo2.png
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Redesign admin page


Compare: https://github.com/zanata/zanata/compare/813fe157b313...30a24a2bdc66


More information about the zanata-commits mailing list