Branch: refs/heads/ZNTA-1771-tmx
Home: https://github.com/zanata/zanata-platform
Commit: 4d1e8af3f95e5a01f5734e6835600d8d7b9ff639
https://github.com/zanata/zanata-platform/commit/4d1e8af3f95e5a01f5734e6835600d8d7b9ff639
Author: Alex Eng <a...@redhat.com>
Date: 2017-07-31 (Mon, 31 Jul 2017)
Changed paths:
M .gitattributes
M Jenkinsfile
R LICENSE.LESSER.txt
R LICENSE.txt
M api/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
M api/zanata-common-api/src/main/java/org/zanata/rest/RestUtil.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/CopyTransStatus.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryInfo.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryLocaleInfo.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryResults.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/LocaleDetails.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/QualifiedName.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/ResultList.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/VersionInfo.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/ContainerTranslationStatistics.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/TranslationStatistics.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/BaseContributionStatistic.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/ContributionStatistics.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/LocaleStatistics.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/AsynchronousProcessResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/CopyTransResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/SourceDocResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java
M
api/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
A client/README.md
R client/README.txt
M
client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.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/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/RawPullCommand.java
M
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.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/push/PushCommandTest.java
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/SourceDocResourceClient.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/AsyncProcessClientTest.java
M
client/zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
M common/zanata-common-util/src/main/java/org/zanata/CommonUtil.gwt.xml
A license-gpl.md
A license.md
M server/docker/README.md
M server/docker/rundb.sh
M server/functional-test/etc/trace-tests.groovy
M server/functional-test/pom.xml
M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
A
server/functional-test/src/main/java/org/zanata/page/account/EnterNewPasswordPage.java
M
server/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
M
server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M
server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
A
server/functional-test/src/main/java/org/zanata/page/languages/RequestToJoinPopup.java
M
server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
M
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
A
server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
M
server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
M
server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
M
server/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
M
server/functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
A
server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
M
server/functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M
server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java
M
server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M
server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
M server/functional-test/src/test/java/org/zanata/util/EmailQuery.java
M server/functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
A
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rpc/GetDownloadAllFilesProgressResult.java
M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
M server/pom.xml
A server/zanata-frontend/.gitattributes
M server/zanata-frontend/src/frontend/app/actions/common-actions.js
M server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
A server/zanata-frontend/src/frontend/app/actions/version-action-types.js
A server/zanata-frontend/src/frontend/app/actions/version-actions.js
A server/zanata-frontend/src/frontend/app/actions/version-actions.test.js
A
server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
A
server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
A
server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
A server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
M server/zanata-frontend/src/frontend/app/components/Nav/index.jsx
A
server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
A
server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js
A
server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js
A
server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js
M server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
M server/zanata-frontend/src/frontend/app/components/index.js
M
server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
M
server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
A
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
A
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
A
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
A
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.css
A server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
A
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js
M server/zanata-frontend/src/frontend/app/containers/Root.js
A server/zanata-frontend/src/frontend/app/containers/TMX/index.css
M server/zanata-frontend/src/frontend/app/containers/TMX/index.js
M
server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
A
server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
A
server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
A
server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
A
server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
R
server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/ValidationOptions.story.js
R
server/zanata-frontend/src/frontend/app/editor/components/ValidationOptions/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/components.story.js
M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
M
server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
M
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
A server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
A server/zanata-frontend/src/frontend/app/jsf/index.js
M server/zanata-frontend/src/frontend/app/legacy.js
M server/zanata-frontend/src/frontend/app/reducers/index.js
M server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
A server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
A server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
M server/zanata-frontend/src/frontend/app/styles/style.less
A server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
M server/zanata-frontend/src/frontend/app/utils/UrlHelper.js
A server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
A server/zanata-frontend/src/frontend/jest.config.json
M server/zanata-frontend/src/frontend/makefile
M server/zanata-frontend/src/frontend/package.json
M server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js
M server/zanata-frontend/src/frontend/yarn.lock
M server/zanata-model/pom.xml
M
server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M server/zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M server/zanata-model/src/test/java/org/zanata/model/HTextFlowTest.java
M server/zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
M server/zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
M server/zanata-model/src/test/java/org/zanata/tmx/TMXUtilTest.java
M server/zanata-war/pom.xml
R server/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
M server/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M server/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M server/zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M
server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M
server/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M server/zanata-war/src/main/java/org/zanata/action/VersionHome.java
M server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
M
server/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
A server/zanata-war/src/main/java/org/zanata/async/AsyncTaskKey.java
A server/zanata-war/src/main/java/org/zanata/async/GenericAsyncTaskKey.java
A
server/zanata-war/src/main/java/org/zanata/async/UserTriggeredTaskHandle.java
M
server/zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
M
server/zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
M
server/zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
M
server/zanata-war/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
M server/zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
M
server/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
M
server/zanata-war/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
M
server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
A
server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
M
server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
A
server/zanata-war/src/main/java/org/zanata/rest/service/AsyncProcessService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
R server/zanata-war/src/main/java/org/zanata/rest/service/URIHelper.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
R server/zanata-war/src/main/java/org/zanata/rest/service/package-info.java
M server/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
M
server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
M
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
M
server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
M server/zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
M
server/zanata-war/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
M server/zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
M
server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
M server/zanata-war/src/main/resources/db/changelogs/db.changelog-4.2.xml
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M
server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M server/zanata-war/src/main/webapp/a/index.xhtml
M
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
M server/zanata-war/src/main/webapp/account/inactive_account.xhtml
M server/zanata-war/src/main/webapp/account/login.xhtml
M server/zanata-war/src/main/webapp/account/password_reset.xhtml
M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
M server/zanata-war/src/main/webapp/account/register.xhtml
M server/zanata-war/src/main/webapp/editor/index.xhtml
M server/zanata-war/src/main/webapp/iteration/view.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
A server/zanata-war/src/main/webapp/resources/assets/css/application.css
A server/zanata-war/src/main/webapp/resources/assets/css/style.css
A
server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/selection.json
A
server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.eot
A
server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.svg
A
server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.ttf
A
server/zanata-war/src/main/webapp/resources/assets/fonts/zanata-v6/zanata.woff
A server/zanata-war/src/main/webapp/resources/assets/img/fedora-logo.svg
A server/zanata-war/src/main/webapp/resources/assets/img/google-logo.svg
A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo-text.svg
A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.ico
A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.png
A server/zanata-war/src/main/webapp/resources/assets/img/logo/logo.svg
A server/zanata-war/src/main/webapp/resources/assets/img/openid-logo.svg
A server/zanata-war/src/main/webapp/resources/assets/img/yahoo-logo.svg
A server/zanata-war/src/main/webapp/resources/assets/script.js
M server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M
server/zanata-war/src/test/java/org/zanata/arquillian/DeploymentsSanityTest.java
M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
M server/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
M
server/zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
M server/zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
M server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
M server/zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
A server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
M server/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M
server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
M
server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M
server/zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
M
server/zanata-war/src/test/java/org/zanata/eventservice/SequentialConnectionIdGeneratorTest.java
M server/zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
M
server/zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
M server/zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
M
server/zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
M server/zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
M server/zanata-war/src/test/java/org/zanata/model/CacheReliabilityTest.java
M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
M
server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
M
server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
M
server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
M
server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M server/zanata-war/src/test/java/org/zanata/provider/DBUnitProvider.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
A
server/zanata-war/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M server/zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/TranslatorCreditTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
A
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncProcessRawRestITCase.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/GlossaryRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectVersionRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.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/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRawRestITCase.java
M
server/zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java
M
server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
M
server/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
R server/zanata-war/src/test/java/org/zanata/test/LambdaMatcher.java
M server/zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M server/zanata-war/src/test/java/org/zanata/util/FileUtilTest.java
M server/zanata-war/src/test/java/org/zanata/util/QueryBuilderTest.java
M
server/zanata-war/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/EventProcessorTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListOptionsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SideMenuPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitReplaceInfoTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/DistinctColorListImplTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceUnitTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SaveEventQueueTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/SinglePageDataModelImplTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/TranslatorInteractionServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserSessionServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicateTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfXSIExtensionValidationTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/TabValidationTest.java
M
server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/XMLEntityValidationTests.java
M server/zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
M
server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
Log Message:
-----------
Merge branch 'master' into ZNTA-1771-tmx
Commit: 4cf5f5de1a79636d86f7116711497fe1b3578fae
https://github.com/zanata/zanata-platform/commit/4cf5f5de1a79636d86f7116711497fe1b3578fae
Author: Alex Eng <a...@redhat.com>
Date: 2017-08-01 (Tue, 01 Aug 2017)
Changed paths:
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/HasTMMergeCriteria.java
A
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
M server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
M server/zanata-frontend/src/frontend/app/actions/version-actions.js
M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
M server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
M server/zanata-frontend/src/frontend/app/containers/Root.js
M server/zanata-frontend/src/frontend/app/containers/TMX/index.js
M
server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarMonthMatrix.jsx
M
server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx
M
server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
M server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
M server/zanata-frontend/src/frontend/app/jsf/index.js
M server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
M server/zanata-frontend/src/frontend/app/styles/style.less
M server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M
server/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M
server/zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
M
server/zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/admin/home.xhtml
M server/zanata-war/src/main/webapp/iteration/view.xhtml
M server/zanata-war/src/main/webapp/project/project.xhtml
M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
M
server/zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
A
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
M
server/zanata-war/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java
Log Message:
-----------
chore: integrate with project tmx
chore: integrate with admin tmx
Compare:
https://github.com/zanata/zanata-platform/compare/d3d67a18493d...4cf5f5de1a79
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits