[zanata/zanata-server] c8facd: Implement contribution statistics: https://bugzill...

GitHub noreply at github.com
Fri Oct 31 01:27:24 UTC 2014 

  Branch: refs/heads/rhbz1122776
  Home:   https://github.com/zanata/zanata-server
  Commit: c8facd74dd113929ee3db4911eb28934aed29476
      https://github.com/zanata/zanata-server/commit/c8facd74dd113929ee3db4911eb28934aed29476
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Implement contribution statistics: https://bugzilla.redhat.com/show_bug.cgi?id=1092193

Squashed commit of the following:

commit 47aa02d4b3aca64775a202e1366cd95993e9a2b4
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 24 11:26:30 2014 +1000

    Refactor, add comments on contribution statistic implementation

commit af0b47198a2cd077aa3a6fa4fc7ee248ef28ede3
Merge: 122c7d8 d2d8e22
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 22 15:52:29 2014 +1000

    Merge branch 'integration/master' into rhbz1092193

commit 122c7d863336832f432810968b09a81c413389b0
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 14 13:18:53 2014 +1000

    Unit test for contribution stats

commit 83b9364a6f5e502321e7dcab7d8c7a579cca44d0
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 10 15:43:32 2014 +1000

    Create query for contribution statistic

commit d750548e79eebbffd07e8ba4d63202d105823045
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 9 14:16:32 2014 +1000

    Create rest endpoint for contribution statistics


  Commit: 0c97c6bcf9b639c4edaa28e3dcb45fadb728e85f
      https://github.com/zanata/zanata-server/commit/0c97c6bcf9b639c4edaa28e3dcb45fadb728e85f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Fix loading on webook, add message when removing webhook


  Commit: 3e4b87c4fb0173c1fc057a1d926fb61d3d94af54
      https://github.com/zanata/zanata-server/commit/3e4b87c4fb0173c1fc057a1d926fb61d3d94af54
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java


  Commit: 94138d59290d8b81098d1ce8e32b49a8dccee848
      https://github.com/zanata/zanata-server/commit/94138d59290d8b81098d1ce8e32b49a8dccee848
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/model/statistic/AbstractStatistic.java
    A zanata-war/src/main/java/org/zanata/model/statistic/MessageStatistic.java
    A zanata-war/src/main/java/org/zanata/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/VersionStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    R zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    R zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    R zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java

  Log Message:
  -----------
  Refactor org.zanata.ui.model.statistic to org.zanata.model.statistic, change webhook event to translated+approved and approved


  Commit: 4c549566988d59ed7d3a634077198a8ea9550695
      https://github.com/zanata/zanata-server/commit/4c549566988d59ed7d3a634077198a8ea9550695
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java

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


Compare: https://github.com/zanata/zanata-server/compare/d15e2d7704ea...4c549566988d

More information about the zanata-commits mailing list