[zanata/zanata-platform] f6f18e: Merge branch 'master' into ZNTA-2173-hide-private-...

GitHub noreply at github.com
Tue Oct 3 01:33:19 UTC 2017


  Branch: refs/heads/ZNTA-2173-hide-private-project
  Home:   https://github.com/zanata/zanata-platform
  Commit: f6f18ecd2691e0876968c18421236f586f77489a
      https://github.com/zanata/zanata-platform/commit/f6f18ecd2691e0876968c18421236f586f77489a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M .mvn/extensions.xml
    M Jenkinsfile
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.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/MockGlossaryResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M client/stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M client/zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    M client/zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    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 common/zanata-common-util/pom.xml
    M docs/release-notes.md
    M docs/user-guide/projects/project-settings.md
    M parent/pom.xml
    M pom.xml
    M server/docker/README.md
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/gwt-shared/pom.xml
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/security-common/src/main/java/org/zanata/security/annotations/AuthenticatedLiteral.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/MergeTransAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/dao/RequestDAO.java
    M server/services/src/main/java/org/zanata/database/ConnectionWrapper.java
    M server/services/src/main/java/org/zanata/database/ProxyUtil.java
    M server/services/src/main/java/org/zanata/database/ResultSetWrapper.java
    M server/services/src/main/java/org/zanata/database/StatementWrapper.java
    M server/services/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/UserService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/LocalesService.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectsService.java
    M server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/seam/framework/EntityHome.java
    M server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/java/org/zanata/seam/text/SeamTextParser.java
    M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/transaction/TransactionUtil.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.3.xml
    M server/services/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M server/services/src/test/java/org/zanata/rest/service/raw/AnonAccessAlt.java
    M server/services/src/test/java/org/zanata/rest/service/raw/OAuthAlt.java
    M server/services/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M server/services/src/test/java/org/zanata/service/impl/GlossaryUrlTest.java
    M server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M server/services/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M server/services/src/test/resources/arquillian.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-frontend/src/frontend/.babelrc
    A server/zanata-frontend/src/frontend/.flowconfig
    M server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/frontend/app/actions/glossary-actions.js
    M server/zanata-frontend/src/frontend/app/editor/actions/action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/header-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/header-actions.js
    M server/zanata-frontend/src/frontend/app/editor/actions/index.js
    M server/zanata-frontend/src/frontend/app/editor/actions/key-shortcuts-actions.js
    A server/zanata-frontend/src/frontend/app/editor/actions/settings-action-types.js
    A server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.js
    A server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.test.js
    M server/zanata-frontend/src/frontend/app/editor/actions/suggestions-action-types.js
    M server/zanata-frontend/src/frontend/app/editor/actions/suggestions-actions.js
    M server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js
    M server/zanata-frontend/src/frontend/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/frontend/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutDispatcher.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.js
    A server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SidebarContent.js
    R server/zanata-frontend/src/frontend/app/editor/containers/SidebarSettings.js
    M server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsPanel.js
    A server/zanata-frontend/src/frontend/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/frontend/app/editor/index.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/index.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.test.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.test.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-frontend/src/frontend/package.json
    M server/zanata-frontend/src/frontend/yarn.lock
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M server/zanata-model-test/src/main/java/org/zanata/rest/ResourceRequestEnvironment.java
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M server/zanata-model/pom.xml
    M server/zanata-model/src/test/java/org/zanata/model/po/HPoTargetHeaderTest.java
    M server/zanata-test-war/pom.xml
    M server/zanata-test-war/src/main/java/org/zanata/rest/RemoteTestSignalerImpl.java
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionChecker.kt
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionTracker.kt
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2173-hide-private-project




More information about the zanata-commits mailing list