[zanata/zanata-server] f374e7: Implement myTrans options when upload translation

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: f374e740fe602175e5557460527271ed54b2fc3e
      https://github.com/zanata/zanata-server/commit/f374e740fe602175e5557460527271ed54b2fc3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/resources/messages.properties
    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/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299

Squashed commit of the following:

commit 573fc4182e8113a9d98923fe0b64d7e1ad8697f3
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 07:12:00 2015 +1000

    Fix unit test

commit 31a614edb0eda39858bf3094592b26c8c994adc1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 15:17:04 2015 +1000

    Update zanata-api version to 3.7.0-SNAPSHOT

commit 5e6d63127c3dea1ef379c72dba88ca664783a61c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 14:07:42 2015 +1000

    Fix test for pushing translations

commit 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Merge: ebd1d43 b4b3c38
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 11:30:43 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

    Conflicts:
    	zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml

commit ebd1d43ede7ca44611c1110cc31c6f1d801c233d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 12:55:41 2015 +1000

    Fix unit test

commit dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
Merge: 5abeaad cc96b2f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jan 30 12:12:20 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

commit 5abeaad65f116fccb19423a7a6eeb1df9f6eeaaa
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 15:56:13 2015 +1000

    Implement myTrans options when upload translation

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