[zanata/zanata-platform] 65efb9: Merge branch 'master' of https://github.com/zanata...

GitHub noreply at github.com
Wed Jun 13 22:58:49 UTC 2018 

  Branch: refs/heads/ZNTA-2514
  Home:   https://github.com/zanata/zanata-platform
  Commit: 65efb9b0866898d8bf8859213e5adf5ad08e44e3
      https://github.com/zanata/zanata-platform/commit/65efb9b0866898d8bf8859213e5adf5ad08e44e3
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    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/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2514


  Commit: 5e3adbd0d9bfc5d0d24b24be14640c2dc3dc9832
      https://github.com/zanata/zanata-platform/commit/5e3adbd0d9bfc5d0d24b24be14640c2dc3dc9832
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 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/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.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/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/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/actions/header-actions.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/app/editor/reducers/phrase-reducer/phrase-reducer.test.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 'ZNTA-2514' of https://github.com/zanata/zanata-platform into ZNTA-2514


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

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2514) fix draggable pagel z-index


Compare: https://github.com/zanata/zanata-platform/compare/5c0299468c93...e5044349b560
      **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