[zanata/zanata-platform] 0520d6: feat(ZNTA-2437) Min content state when retrieving ...

GitHub noreply at github.com
Tue Jun 12 05:51:40 UTC 2018


  Branch: refs/heads/ZNTA-2514
  Home:   https://github.com/zanata/zanata-platform
  Commit: 0520d6b72e3e9a75f1a0764a1bafad53078e2933
      https://github.com/zanata/zanata-platform/commit/0520d6b72e3e9a75f1a0764a1bafad53078e2933
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    A api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Min content state when retrieving translations (approved or translated)


  Commit: a913c676a9f12541f7e44ccc21c50c46db540289
      https://github.com/zanata/zanata-platform/commit/a913c676a9f12541f7e44ccc21c50c46db540289
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Make dbunit tests easier to understand

Add more explanations to ProjectDAOTest
Move constants for ProjectsData.dbunit.xml
Add ContentState guide to MultipleTextFlowTestData.dbunit.xml


  Commit: 17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
      https://github.com/zanata/zanata-platform/commit/17dbe4e8e6aa280bd8b67675faf15dfde363b6b6
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    R api/zanata-common-api/src/main/java/org/zanata/common/MinContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    R server/zanata-model-test/src/main/resources/org/zanata/test/model/MultipleTextFlowTestData.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java

  Log Message:
  -----------
  feat(ZNTA-2437) Code review changes and refactoring

Changes/Refactorings based on the code review
Removing code duplicates


  Commit: af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
      https://github.com/zanata/zanata-platform/commit/af4f0c6f4bad27a3c098fdd368e97583e19c6d8e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore

  Log Message:
  -----------
  Update .gitignore


  Commit: 48db1f267786e7963cb885030c9f7121a2a373b2
      https://github.com/zanata/zanata-platform/commit/48db1f267786e7963cb885030c9f7121a2a373b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    R server/services/src/main/java/org/zanata/rest/service/ContentStateName.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    R server/zanata-model-test/src/main/resources/org/zanata/test/model/MinContentStateRestITCase.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    R server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateData.kt
    R server/zanata-war/src/test/java/org/zanata/rest/service/raw/MinContentStateRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  feat(ZNTA-2437): replace minContentState options with approvedOnly

FileResource/Service: change minContentState to approvedOnly
TranslatedDocResource: change minContentState to markTranslatedAsApproved
Refactor MinContentStateRestITCase: bring in constants for test data
Rename MinContentStateRestITCase to TranslationResourceApprovedRestITCase
Refactor FileRawRestITCase; add test which downloads XLIFF source
Add approvedOnly option to CLI, PoWriter2, XliffWriter and PropWriter
Add approvedOnly unit tests for XliffWriter and PropWriter
Refactor PoReader2Test
Refactor PoWriter2 to add Builder
Add unit tests for PoWriter2


  Commit: fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
      https://github.com/zanata/zanata-platform/commit/fb5e2bba8e252f5eeb456ae2ccf307f59654fc68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-02 (Sat, 02 Jun 2018)

  Changed paths:
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M parent/pom.xml

  Log Message:
  -----------
  Use slf4j-simple in common modules


  Commit: 12290b80188520b12a02b6b62b014c626f42fd85
      https://github.com/zanata/zanata-platform/commit/12290b80188520b12a02b6b62b014c626f42fd85
  Author: Dragos Varovici <dvarovici.work at gmail.com>
  Date:   2018-06-03 (Sun, 03 Jun 2018)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf

  Log Message:
  -----------
  feat(ZNTA-2437) Code review fixes
FileResource: parameter documentation change
FileRawRestITCase: checking the resource
TranslationResourceRestITCase: removing duplicates


  Commit: 6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
      https://github.com/zanata/zanata-platform/commit/6da9651f6ad57b8b1599a5a8fab1c77539b4bb0f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Configure compiler to fail on warning


  Commit: 9840852c0effb613b2fe36c48b710a1cffc55a9e
      https://github.com/zanata/zanata-platform/commit/9840852c0effb613b2fe36c48b710a1cffc55a9e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java

  Log Message:
  -----------
  Make log msg less like a javac warning


  Commit: 17367257b395193eb4513aaf3000ae0b49a3ea4f
      https://github.com/zanata/zanata-platform/commit/17367257b395193eb4513aaf3000ae0b49a3ea4f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M server/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into min-content-state


  Commit: db3327e5c915b3555604175cb029fa96ff1e199f
      https://github.com/zanata/zanata-platform/commit/db3327e5c915b3555604175cb029fa96ff1e199f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf

  Log Message:
  -----------
  Fix approvedOnly handling in adapters, add more tests

Also fix ZNTA-2601: in .TS, only use type=unfinished when appropriate


  Commit: 5572692dd39b47b709920763867870b962fbc8cd
      https://github.com/zanata/zanata-platform/commit/5572692dd39b47b709920763867870b962fbc8cd
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling


  Commit: 963fe462d20398bc471e0eb750ecf70a6443e9fc
      https://github.com/zanata/zanata-platform/commit/963fe462d20398bc471e0eb750ecf70a6443e9fc
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  fix*ZNTA-2620) user profile button styling


  Commit: c98bd78d0e445723e4b9601a28bb92c842f5c1ec
      https://github.com/zanata/zanata-platform/commit/c98bd78d0e445723e4b9601a28bb92c842f5c1ec
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/src/test/java/TestJenkinsfile.java

  Log Message:
  -----------
  chore(ZNTA-2390): run all tests if PR description contains allFuncTests (#846)


  Commit: 9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
      https://github.com/zanata/zanata-platform/commit/9aefb1bb05e9b9fe3e8f372ff2ba84143e46e30c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/index.html

  Log Message:
  -----------
  fix: js warning in frontend (#897)


  Commit: c287e55a8548ab961c5fb06a5e88fc90490963dd
      https://github.com/zanata/zanata-platform/commit/c287e55a8548ab961c5fb06a5e88fc90490963dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  fix(ZNTA-2532) fix liquibase configuration (#853)

* Test: ensure build fails if liquibase does
* Configure liquibase and appserver to use basedir/target/documents
* Download mysql/slf4j if required


  Commit: 2c10d4f295f111fb19c2f842c57b1519509e46d5
      https://github.com/zanata/zanata-platform/commit/2c10d4f295f111fb19c2f842c57b1519509e46d5
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase

  Log Message:
  -----------
  Merge commit 'c287e55a8548ab961c5fb06a5e88fc90490963dd' into HEAD


  Commit: 92fb27d10ff41c083d7d553161de66ed2e1cc4fc
      https://github.com/zanata/zanata-platform/commit/92fb27d10ff41c083d7d553161de66ed2e1cc4fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge pull request #834 from dragosv/min-content-state

feat(ZNTA-2437) add option to get Approved translations only


  Commit: d7c7d1eb627c09015dd7e6dd4c125aab416cd518
      https://github.com/zanata/zanata-platform/commit/d7c7d1eb627c09015dd7e6dd4c125aab416cd518
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java

  Log Message:
  -----------
  Add some missing assertions (#835)

* Add some missing assertions
* Remove useless assertThat calls


  Commit: 13ec976997819c3165f89c2101c2535b68f34778
      https://github.com/zanata/zanata-platform/commit/13ec976997819c3165f89c2101c2535b68f34778
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  Merge pull request #894 from zanata/ZNTA-2620

fix(ZNTA-2620) user profile button styling


  Commit: c4b90fb52254de18a056aca3ecea146ae742f27a
      https://github.com/zanata/zanata-platform/commit/c4b90fb52254de18a056aca3ecea146ae742f27a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  Merge commit '13ec976997819c3165f89c2101c2535b68f34778' into HEAD


  Commit: f433f4204ac8868cf58f1293459106fab6d10ac0
      https://github.com/zanata/zanata-platform/commit/f433f4204ac8868cf58f1293459106fab6d10ac0
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-87): notify failed translation saves in alpha editor (#877)

* feat(ZNTA-87): notify failed translation saves in alpha editor

* fix: update individual phrase details inProgressSave

* fix: check undefined translation (saving as untranslated), show error status


  Commit: 628765e06864973e17825408dc79b7dd10719fe0
      https://github.com/zanata/zanata-platform/commit/628765e06864973e17825408dc79b7dd10719fe0
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-war/src/main/webapp/editor/index.xhtml

  Log Message:
  -----------
  fix(ZNTA-821): alpha editor to use zanata language setting as lang attribute (#862)

* fix(ZNTA-821): alpha editor to use zanata language setting as html lang attribute

* fix: try catch unsupported locales for react-intl locale data


  Commit: c5b5d8018d969a43cfdfad1d40b6fa5c84355f23
      https://github.com/zanata/zanata-platform/commit/c5b5d8018d969a43cfdfad1d40b6fa5c84355f23
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2514


Compare: https://github.com/zanata/zanata-platform/compare/d13c0481b2f7...c5b5d8018d96
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the zanata-commits mailing list