[zanata/zanata-platform] b00504: fix(ZNTA-2589) consistency of nav icons

GitHub noreply at github.com
Mon Jun 18 00:15:43 UTC 2018


  Branch: refs/heads/react-upgrade-16/ZNTA-2610
  Home:   https://github.com/zanata/zanata-platform
  Commit: b005043042702f5805f4cb1d5bbbf020e3d29af0
      https://github.com/zanata/zanata-platform/commit/b005043042702f5805f4cb1d5bbbf020e3d29af0
  Author: kgough <kgough at redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav icons


  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: d5abeda17b8ba0f66c426d295734f96693c9db4b
      https://github.com/zanata/zanata-platform/commit/d5abeda17b8ba0f66c426d295734f96693c9db4b
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less

  Log Message:
  -----------
  fix(ZNTA-2589) set fixed width and height on logoloader to ensure nav icons are same size across frontend


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

  Changed paths:
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2589) ensure antd dropdowns have a white/transparent background for visibility


  Commit: 5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
      https://github.com/zanata/zanata-platform/commit/5fbf19adb8f0e44fd4c15cc2e01354b8ef903622
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-nav.less

  Log Message:
  -----------
  fix(ZNTA-2589) WIP: nav-icon size


  Commit: 9f6d01c1f7cd85a3fae89661d8783df87538ca60
      https://github.com/zanata/zanata-platform/commit/9f6d01c1f7cd85a3fae89661d8783df87538ca60
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-09 (Sat, 09 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-nav.less

  Log Message:
  -----------
  fix(ZNTA-2589) consistency of nav-icon size across react and jsf pages


  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: ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
      https://github.com/zanata/zanata-platform/commit/ebea4bdd19e6612fc05dd84bcaf1e5196f2e6adb
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2607) TMX modal styling


  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: c28c34cf09acab475f1e0acfcbd145be160d50eb
      https://github.com/zanata/zanata-platform/commit/c28c34cf09acab475f1e0acfcbd145be160d50eb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

  Log Message:
  -----------
  fix(ZNTA-2605): fix contact admin on Google log in (#878)


  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: e8bef20abd78c22b7773cda9be35481fee99a2cd
      https://github.com/zanata/zanata-platform/commit/e8bef20abd78c22b7773cda9be35481fee99a2cd
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #860 from zanata/ZNTA-2589

fix(ZNTA-2589) consistency of nav icons


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

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml

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


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

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #895 from zanata/ZNTA-2607-release

fix(ZNTA-2607) TMX modal styling


  Commit: 7003ea99e4915070427273c7bb06fed7a7b55ede
      https://github.com/zanata/zanata-platform/commit/7003ea99e4915070427273c7bb06fed7a7b55ede
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix: resolve merge conflicts, minor changes to TMX modal styling


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

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #898 from zanata/release-to-master-0618

fix release-to-master conflicts


  Commit: adbb537c564027b31fb69316513bc53f5ce4c637
      https://github.com/zanata/zanata-platform/commit/adbb537c564027b31fb69316513bc53f5ce4c637
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix: project url in glossary page (#901)

https://zanata.atlassian.net/browse/ZNTA-2609


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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

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


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

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java

  Log Message:
  -----------
  fix: AddLanguageTest selenium id for notifications (#896)


  Commit: f48d462d9e571222104b0c20b09656d69d2fad80
      https://github.com/zanata/zanata-platform/commit/f48d462d9e571222104b0c20b09656d69d2fad80
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix: small styling improvements to frontend


  Commit: a38ee266c0e6cb0bc8025d838297226f240d6bfc
      https://github.com/zanata/zanata-platform/commit/a38ee266c0e6cb0bc8025d838297226f240d6bfc
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix: small styling improvements to frontend


  Commit: 4899be912eba3a93eb65c9151e8a67c42f62c44f
      https://github.com/zanata/zanata-platform/commit/4899be912eba3a93eb65c9151e8a67c42f62c44f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js

  Log Message:
  -----------
  fix(ZNTA-2626): hide translation-comment search (can't show/edit) (#899)


  Commit: 94897146080c175bc48f170e75569a29e3cbcf4a
      https://github.com/zanata/zanata-platform/commit/94897146080c175bc48f170e75569a29e3cbcf4a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release'


  Commit: d35aedd5ca8446911848d4b4fd6cc3272e0a247a
      https://github.com/zanata/zanata-platform/commit/d35aedd5ca8446911848d4b4fd6cc3272e0a247a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix: loader text in button (#905)

https://zanata.atlassian.net/browse/ZNTA-2627


  Commit: 66aa56007220be1b29e5e933d6b2a7fa67c02e2f
      https://github.com/zanata/zanata-platform/commit/66aa56007220be1b29e5e933d6b2a7fa67c02e2f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/pom.xml

  Log Message:
  -----------
  Update to Kotlin 1.2.50; enable -Xprogressive (#907)


  Commit: cba730cb846e5222fba2d4fafe5834680558c25f
      https://github.com/zanata/zanata-platform/commit/cba730cb846e5222fba2d4fafe5834680558c25f
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs


  Commit: 14e7b05a5bb81a06dca5450b28f860c27732ec77
      https://github.com/zanata/zanata-platform/commit/14e7b05a5bb81a06dca5450b28f860c27732ec77
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs


  Commit: c6aa4e961ff61b7986245fb5458f9416361387ef
      https://github.com/zanata/zanata-platform/commit/c6aa4e961ff61b7986245fb5458f9416361387ef
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix(release-ui) focus and hover styling for antd inputs


  Commit: 5c200d4af8b1e8de1e3a36533a315ce74ee7c805
      https://github.com/zanata/zanata-platform/commit/5c200d4af8b1e8de1e3a36533a315ce74ee7c805
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  fix: input focus for explore page search


  Commit: ee3103729d625c9aed3be592b03fc656e9177e80
      https://github.com/zanata/zanata-platform/commit/ee3103729d625c9aed3be592b03fc656e9177e80
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

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

  Log Message:
  -----------
  fix: input border color for glossary header


  Commit: 9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357
      https://github.com/zanata/zanata-platform/commit/9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #908 from zanata/rel-ft-fix

fix: small ui changes


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

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge commit '9d7acbcd980c9c3ea30d325dbcbe7f83c1ab2357' into HEAD


  Commit: 8a39d53eb180993b0614b713400ca4b506f80a31
      https://github.com/zanata/zanata-platform/commit/8a39d53eb180993b0614b713400ca4b506f80a31
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 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/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/BasePage.java
    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/pom.xml
    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/main/resources/messages.properties
    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/LogoLoader/index.less
    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/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    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/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.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/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    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/account/google_password_reset_request.xhtml
    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' of github.com:zanata/zanata-platform into react-upgrade-16/ZNTA-2610


Compare: https://github.com/zanata/zanata-platform/compare/4f18653fc0a9...8a39d53eb180
      **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