[zanata/zanata] aed691: Fix remaining hours label by using words unit

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: aed6918571a4f6f9bce2af87b104c613f6784671
      https://github.com/zanata/zanata/commit/aed6918571a4f6f9bce2af87b104c613f6784671
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/RemainingHoursColumn.java

  Log Message:
  -----------
  Fix remaining hours label by using words unit


  Commit: 8359fa1383fc2de0fb623ac1b6fb9588d253641c
      https://github.com/zanata/zanata/commit/8359fa1383fc2de0fb623ac1b6fb9588d253641c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.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/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserSessionService.java
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java

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


  Commit: 292e7a6e5d3c693b82be0032f19e3ffe59750b6d
      https://github.com/zanata/zanata/commit/292e7a6e5d3c693b82be0032f19e3ffe59750b6d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  fix test


Compare: https://github.com/zanata/zanata/compare/71cff54bf3df...292e7a6e5d3c