[zanata/zanata-platform] 979f78: fix: AddLanguageTest selenium ids (#829)
GitHub
noreply at github.com
Thu May 24 07:32:53 UTC 2018
Branch: refs/heads/no-thread-sleep
Home: https://github.com/zanata/zanata-platform
Commit: 979f78865252d41cf7eb723df34706f15260690c
https://github.com/zanata/zanata-platform/commit/979f78865252d41cf7eb723df34706f15260690c
Author: Earl Floden <efloden at redhat.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
Log Message:
-----------
fix: AddLanguageTest selenium ids (#829)
* fix: AddLanguageTest selenium ids
* fix: update selenium tests for AddLanguagePage to fill all fields
Commit: b9e828783bfe204acf38ead790304e638cf7938b
https://github.com/zanata/zanata-platform/commit/b9e828783bfe204acf38ead790304e638cf7938b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M server/services/src/main/java/org/zanata/action/UserAction.java
A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
A server/services/src/main/java/org/zanata/file/DocumentStorage.java
M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
M server/services/src/main/java/org/zanata/service/UserAccountService.java
M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/ZanataJpaTest.java
M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
Log Message:
-----------
ZNTA-2492 erase a user and its data (#811)
* ZNTA-2492 erase a user and its data
* review fix
* another round
* UniqueValidator to inject EMF
* ZNTA-2492 remove locale membership when erasing
Commit: 52757b9f94895413efa02e43df9b978ad6fb2819
https://github.com/zanata/zanata-platform/commit/52757b9f94895413efa02e43df9b978ad6fb2819
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-05-22 (Tue, 22 May 2018)
Changed paths:
M Jenkinsfile
M build-tools/src/main/resources/zanata-build-tools/detekt.yml
M server/functional-test/pom.xml
M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
M server/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
M server/services/src/main/java/org/zanata/action/MergeTransAction.java
M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
M server/services/src/main/java/org/zanata/email/EmailBuilder.java
A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
A server/services/src/main/java/org/zanata/email/MessageBuilder.java
A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
A server/services/src/main/java/org/zanata/email/sendEmail.kt
M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
A server/services/src/main/java/org/zanata/log4j/logger.kt
M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.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/security/SamlAttributes.kt
M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
M server/services/src/main/java/org/zanata/service/TranslationService.java
M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
R server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
M server/services/src/main/java/org/zanata/util/TranslationUtil.java
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
M server/services/src/test/java/org/zanata/ZanataJpaTest.java
M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
A server/services/src/test/java/org/zanata/email/multipart.kt
M server/services/src/test/java/org/zanata/rest/service/raw/ArquillianRest.kt
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M server/services/src/test/resources/META-INF/persistence.xml
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
M server/zanata-model-test/pom.xml
M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.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/main/java/org/zanata/model/HApplicationConfiguration.java
M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M server/zanata-test-war/pom.xml
M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
Log Message:
-----------
feat(ZNTA-1818): generate email report for TM Merge (#818)
* Also fix TM Merge: avoid skipping unprocessed batches
* Iterate over text flows in project, not by *untranslated* text flows
* Update MergeTranslationsTaskHandle to count text flows
* Add filter Predicate in TMServiceImpl.getSearchResult
* Avoid mock TranslationService in TransMemoryMergeServiceImplJpaTest
* Reduce iterations in TransMemoryMergeServiceImplJpaTest
* Use RAMDirectoryProvider for Hibernate Search unit tests
* Refactor TransMemoryMergeServiceImpl
* Log query when TM_MAX_RESULTS is reached
* Update Kotlin
* Replace kotlin-stdlib-jre7/8 with kotlin-stdlib-jdk7/8
* Fix some null annotations
* Isolate data between tests in TranslationFinderTest
* Use stdout in Deployments.main()
* Reduce logging in Arquillian tests
* Upgrade detekt and fix/ignore complaints
* Skip detekt for frontend
* Update ProjectVersionTest
* Update FrontendAssetsTest
* Improve test failure messages
* Fix smtp.port for functional tests
* Disable FindBugs warning
* Use waitForPageSilence when creating project
* Tweak JNDI lookup to work with cargo:run
Commit: 2d32f4d589d88eb25f9f34ce060098cceb81d41f
https://github.com/zanata/zanata-platform/commit/2d32f4d589d88eb25f9f34ce060098cceb81d41f
Author: Ding-Yi Chen <dchen at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M api/zanata-common-api/pom.xml
M build-tools/pom.xml
M client/stub-server/pom.xml
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 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 server/functional-test/pom.xml
M server/gwt-editor/pom.xml
M server/gwt-shared/pom.xml
M server/gwt-test/pom.xml
M server/security-common/pom.xml
M server/services/pom.xml
M server/zanata-frontend/pom.xml
M server/zanata-liquibase/pom.xml
M server/zanata-model-test/pom.xml
M server/zanata-model/pom.xml
M server/zanata-test-war/pom.xml
M server/zanata-war/pom.xml
Log Message:
-----------
chore(version): development version is now 4.6.0-SNAPSHOT
Commit: 35156bd238206890f288bb4f70a89cd2a4ae9106
https://github.com/zanata/zanata-platform/commit/35156bd238206890f288bb4f70a89cd2a4ae9106
Author: Earl Floden <efloden at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/styles/antd.less
Log Message:
-----------
fix(ZNTA-2554): remove ant design badge component (#831)
* fix(ZNTA-2554): remove ant design badge component
* style: override new-zanata global modal styles
Commit: b48b0f4800abdddcc1ab76177f06e91f476bd094
https://github.com/zanata/zanata-platform/commit/b48b0f4800abdddcc1ab76177f06e91f476bd094
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
Log Message:
-----------
fix(ZNTA-2567) allow TM Merge (project version) to be cancelled (#838)
Commit: 6eecd8c531216584eb96100cb7e1575167a386a2
https://github.com/zanata/zanata-platform/commit/6eecd8c531216584eb96100cb7e1575167a386a2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.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
M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M 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/administration/AutoRoleAssignmentTest.java
M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.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/ManageUsersTest.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/UploadTest.java
M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.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/search/comp/LanguageSearchCTest.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/VersionGroupTest.java
M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
Log Message:
-----------
test(ZNTA-2555): fix assertion descriptions (#836)
* Fix assertion descriptions with structural replace
* Add back comment (was in middle of expression)
Commit: b7ffc797cc89b2b26feff4aa9619f9445093111b
https://github.com/zanata/zanata-platform/commit/b7ffc797cc89b2b26feff4aa9619f9445093111b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
Log Message:
-----------
fix(ZNTA-2141): escape Lucene keywords more precisely (#837)
Commit: 0a8e9429ccf6142ff36b9c044570559f9324a88f
https://github.com/zanata/zanata-platform/commit/0a8e9429ccf6142ff36b9c044570559f9324a88f
Author: Ding-Yi Chen <dchen at redhat.com>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M api/pom.xml
M client/pom.xml
M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
M common/pom.xml
M parent/pom.xml
M pom.xml
M server/pom.xml
Log Message:
-----------
fix: version
Commit: 8d992c2177352822d02ede4660318c8cea751bec
https://github.com/zanata/zanata-platform/commit/8d992c2177352822d02ede4660318c8cea751bec
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-05-23 (Wed, 23 May 2018)
Changed paths:
M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
Log Message:
-----------
Merge commit 'b7ffc797cc89b2b26feff4aa9619f9445093111b' into HEAD
Commit: c1838b120499b752792e49d91bb3ac2793889272
https://github.com/zanata/zanata-platform/commit/c1838b120499b752792e49d91bb3ac2793889272
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-05-24 (Thu, 24 May 2018)
Changed paths:
M Jenkinsfile
M api/pom.xml
M api/zanata-common-api/pom.xml
M build-tools/pom.xml
M build-tools/src/main/resources/zanata-build-tools/detekt.yml
M client/pom.xml
M client/stub-server/pom.xml
M client/zanata-cli/pom.xml
M client/zanata-client-commands/pom.xml
M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
M client/zanata-maven-plugin/demo-glossary/csv/pom.xml
M client/zanata-maven-plugin/demo-glossary/delete/pom.xml
M client/zanata-maven-plugin/pom.xml
M client/zanata-rest-client/pom.xml
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.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 parent/pom.xml
M pom.xml
M server/functional-test/pom.xml
M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.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
M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M 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/administration/AutoRoleAssignmentTest.java
M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.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/ManageUsersTest.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/UploadTest.java
M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.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/search/comp/LanguageSearchCTest.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/VersionGroupTest.java
M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
M server/gwt-editor/pom.xml
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M server/gwt-shared/pom.xml
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
M server/gwt-test/pom.xml
M server/pom.xml
M server/security-common/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/ApplicationConfiguration.java
M server/services/src/main/java/org/zanata/action/FrontendAssets.kt
M server/services/src/main/java/org/zanata/action/FrontendManifest.kt
M server/services/src/main/java/org/zanata/action/MergeTransAction.java
M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
M server/services/src/main/java/org/zanata/action/UserAction.java
M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt
M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java
A server/services/src/main/java/org/zanata/config/ServerFromEmail.java
A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java
M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt
M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java
M server/services/src/main/java/org/zanata/email/EmailBuilder.java
A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt
A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt
A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt
A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
A server/services/src/main/java/org/zanata/email/MessageBuilder.java
A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java
A server/services/src/main/java/org/zanata/email/sendEmail.kt
A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java
A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java
A server/services/src/main/java/org/zanata/file/DocumentStorage.java
M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java
A server/services/src/main/java/org/zanata/log4j/logger.kt
M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.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/security/SamlAttributes.kt
M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java
A server/services/src/main/java/org/zanata/service/TranslationCounter.kt
M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java
M server/services/src/main/java/org/zanata/service/TranslationService.java
M server/services/src/main/java/org/zanata/service/UserAccountService.java
M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
R server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt
A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt
A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java
M server/services/src/main/java/org/zanata/util/TranslationUtil.java
M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java
M server/services/src/test/java/org/zanata/ZanataJpaTest.java
M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt
M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java
M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java
M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java
M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
A server/services/src/test/java/org/zanata/email/multipart.kt
M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java
M server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java
M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M server/services/src/test/java/org/zanata/rest/service/raw/ArquillianRest.kt
M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java
R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt
M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java
A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java
A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java
M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M server/services/src/test/resources/META-INF/persistence.xml
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-liquibase/pom.xml
M server/zanata-model-test/pom.xml
M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml
M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
M server/zanata-model/pom.xml
A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java
M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
M server/zanata-test-war/pom.xml
M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
Log Message:
-----------
Merge branch 'master' into no-thread-sleep
Compare: https://github.com/zanata/zanata-platform/compare/ec008eb6c977...c1838b120499
**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