[zanata/zanata-server] bacdfc: Implement merge translation from existing version:...

GitHub noreply at github.com
Tue Mar 17 06:19:36 UTC 2015 

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
      https://github.com/zanata/zanata-server/commit/bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    A docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-dialog.png
    A docs/images/version-merge-trans-progress.png
    A docs/images/version-more-action-menu.png
    M docs/release-notes.md
    A docs/user-guide/merge-translations.md
    M mkdocs.yml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Implement merge translation from existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989

Squashed commit of the following:

commit 59b3e0449a48abbdb76929534a26ea9a045bf790
Merge: 7f09ae2 4ea3f29
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 15:47:28 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

    Conflicts:
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

commit 7f09ae2a06aa02c9a942597215170f7a4a8481c7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 13:51:51 2015 +1000

    Limit to maintainer's projects to merge from in UI.

commit 2e96c942b4f2fd71dea8fd5f6725c40d09116cf9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 16:09:57 2015 +1000

    Disable merge button if there's no version available to copy

commit 8be5f3606c74ffbf7532dd92524b28c5d7684f74
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 13:07:07 2015 +1000

    Update docs printscreen and messages

commit f8680c0263d19b916850b612f669e15c2906c88c
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 11:23:42 2015 +1000

    Add docs for merge-trans feature

commit 1b6e2b2a6c48d18984153cf491edcab470c429f3
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 16 06:43:19 2015 +1000

    Fix unit test

commit 4e7d7bebc74c88a98dffbfc1d9f29cb07239df04
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:43:26 2015 +1000

    Fix load source versions for merge trans dialog

commit 9e7c75df3d7e96df1106b52a4150a6696e395fb9
Merge: f7eaffb 541fc6c
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:23:55 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

commit f7eaffb27a1def5a427865cd3fb08e53951a197d
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 15 14:21:10 2015 +1000

    Refactor and changes on PR review

commit 6d4c388833248785d3b19da52a0bc35d9b65ff00
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 16:38:32 2015 +1000

    Fix unit test

commit 032013279dfaa040571b46b1ebb2eb821bab2820
Merge: f0419d1 baef61a
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:59:58 2015 +1000

    Merge branch 'integration/master' into rhbz1133989

commit f0419d1e34877b75d82f12ded3fc2ff0427662b7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:29:04 2015 +1000

    Fix checkstyle

commit 16d58ba99edbf748ae3e59b670e9b53984cf5c1c
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 13 15:10:15 2015 +1000

    Fixed project selector issue for merge trans

commit 5d1ce6f68ab50f01da3af966d688bf48efee5853
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 12 15:57:35 2015 +1000

    WIP: implement project selector for merge translation dialog

commit fa50a891bc03a86ac5677735d24109ac243dcd75
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 12 14:09:04 2015 +1000

    Refactor query, UI and test

commit 43e9f0736fa4b68bd0cedbb829d068502c14661c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 11 18:32:42 2015 +1000

    Fix preload of progressBar component

commit 43bf35defdce8f9884c9a2cfff4ed9b0fc3b72b0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 11 16:02:20 2015 +1000

    Rename js name unique

commit d42b55873f4eba08708f4bdcaaccf2d43880a743
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 10 15:57:38 2015 +1000

    Create loading component for copy actions

commit 511ed109830792cd98df57415a829b0a761c4380
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 10 15:26:42 2015 +1000

    Create modal for merge-trans operations from version page

commit c05f4e6d1cda679ef926ed1b5b4b795b787243aa
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 9 15:13:12 2015 +1000

    Add unit test, fix shouldMerge to check for same content

commit b8065176d8d69f506cbe9ef0a7ef3a2c04a8c270
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 6 16:34:55 2015 +1000

    WIP: add unit test for merge translation

commit f8705176892deca12f548c33f47202eab9074dce
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 6 11:10:21 2015 +1000

    Add unit test for merge translations

commit fd06390f48f423b6d1ab4d9a4fc7c52c0d4cf156
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 5 15:38:07 2015 +1000

    Work in progress: add time log

commit 16b295dbc94eaa458c63b94d86b78f2f199ac122
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 5 15:04:49 2015 +1000

    Implement merge translation from and to existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989

More information about the zanata-commits mailing list