[zanata/zanata-server] fd9509: feat(statistic): Exclude copied translation from u...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: fd950955676d356e838fc2b654997a4c4386e622
      https://github.com/zanata/zanata-server/commit/fd950955676d356e838fc2b654997a4c4386e622
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityTypeTypeDescriptor.java
    M zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/TranslationUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    R zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/TranslationUtilTest.java

  Log Message:
  -----------
  feat(statistic): Exclude copied translation from user stats

https://github.com/zanata/zanata-server/pull/900
https://bugzilla.redhat.com/show_bug.cgi?id=1235070

Squashed commit of the following:

commit 56de5bcfa5bd2e0e0a2fccfe9f4a080a675c3d8c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 9 12:54:07 2015 +1000

    Fix indentation format

commit c9942efed283e8ac0c3c82cbaebc7732ae886ac5
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 20:59:49 2015 +1000

    Merge entityType with TranslationEntityType

commit db993dd410f4fa447088f1e434f769291c9050c3
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jul 7 16:06:27 2015 +1000

    Merge db-changelog 3.8 to 3.7

commit 8f4031047a5ae931d43a3279b3b38dc04699d1c1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 2 15:58:13 2015 +1000

    Add metadata of how translation is being input:

    https://bugzilla.redhat.com/show_bug.cgi?id=1235070

    Squashed commit of the following:

    commit 4af776a092935490089944e8ea84a66316303c8b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 12:02:17 2015 +1000
   fix unit test

    commit 289ea093666888121d212a70dec320683d0157d0
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 2 08:43:26 2015 +1000
   Set entity properties for HTextFlowTargetHistory when copy version

    commit 618c5e057fd46749ed0bf61713f7b53809764207
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 1 13:11:58 2015 +1000
   Set automatedEntry when update in HTextFlowTarget

    commit e0d3eada4565ef0e1f8e3afbe791668ce8824920
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jun 30 08:13:13 2015 +1000
   Add javadoc for new type

    commit d493b441e61a74954ba9bab19e2c7168979d42ba
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:07:07 2015 +1000
   Update release notes

    commit 0fc402133864a2ea4fb65407f0ef8b950a7dad86
    Merge: 0eb64ff 158ad02
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 11:06:26 2015 +1000
   Merge branch 'integration/master' into rhbz1235070-stats

    commit 0eb64ff68323140c333388d6606ecba071e07272
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jun 29 10:55:39 2015 +1000
   Merge MessageGenerator with TranslationUtil

    commit f74a132f551edac954f7d0a660fe79ee54ecd598
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 16:03:59 2015 +1000
   Add automatedEntry condition for user statistic query

    commit 23deb7ace51ba8f6a14069039b3ae407ebcc7fe8
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jun 26 13:24:15 2015 +1000
   Add revision comment in editor history

    commit bd98cc73c36adf836d98b90615e368ad231d0463
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 16:27:22 2015 +1000
   Add sourceType for all translation update

    commit dbb4efbbe49f59fd13e7a820fc3dbbf66400b20e
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 15:12:32 2015 +1000
   Add entityType, sourceType, entityId and automatedEntry to HTextFlowTarget and HTextFlowTargetHistory

    commit ae9cd703553dbb63b1cb6e1f8d9cf760084620a1
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jun 25 11:40:25 2015 +1000
   Add revision comment from TM Merge action