[zanata/zanata-platform] a3d3b3: fix(ZNTA-2606): validate duplicate glossary entrie...
GitHub
noreply at github.com
Fri Jun 15 01:11:58 UTC 2018
Branch: refs/heads/validate-glossary-entry/ZNTA-2606
Home: https://github.com/zanata/zanata-platform
Commit: a3d3b3ea27d0037a86ecbec1696b6e9366ed073a
https://github.com/zanata/zanata-platform/commit/a3d3b3ea27d0037a86ecbec1696b6e9366ed073a
Author: efloden <efloden at redhat.com>
Date: 2018-06-08 (Fri, 08 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
Log Message:
-----------
fix(ZNTA-2606): validate duplicate glossary entries
Commit: 0711d65535dfe0edd194c8a193d7731c57957db7
https://github.com/zanata/zanata-platform/commit/0711d65535dfe0edd194c8a193d7731c57957db7
Author: efloden <efloden at redhat.com>
Date: 2018-06-11 (Mon, 11 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/service/GlossaryService.java
M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/index.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
Log Message:
-----------
fix: server glossary entry service to return warnings, display ant notifications
Commit: 269f9b5f01d98650845021f042702ff98f2387d0
https://github.com/zanata/zanata-platform/commit/269f9b5f01d98650845021f042702ff98f2387d0
Author: efloden <efloden at redhat.com>
Date: 2018-06-14 (Thu, 14 Jun 2018)
Changed paths:
M Jenkinsfile
M api/pom.xml
M api/zanata-common-api/pom.xml
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/pom.xml
M build-tools/src/test/java/TestJenkinsfile.java
M client/pom.xml
M client/stub-server/pom.xml
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-cli/pom.xml
M client/zanata-client-commands/pom.xml
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.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/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-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/pom.xml
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/TraceDebugFilter.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/AccountClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/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-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 common/zanata-common-util/pom.xml
R docs/images/version-translation-settings.png
R docs/user-guide/review/review-enable.md
M docs/user-guide/review/translation-review.md
M docs/user-guide/versions/version-settings.md
M mkdocs.yml
M parent/pom.xml
M 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/AbstractPage.kt
M server/functional-test/src/main/java/org/zanata/page/BasePage.java
M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.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/MultiFileUploadTest.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/pom.xml
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/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.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-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/action/DashboardAction.java
M server/services/src/main/java/org/zanata/action/VersionHome.java
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/dao/ProjectIterationDAO.java
M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.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/search/dto/GroupSearchResult.java
M server/services/src/main/java/org/zanata/rest/search/service/SearchService.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/StatisticsServiceImpl.java
M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
M server/services/src/main/java/org/zanata/service/TranslationFileService.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
M server/services/src/main/resources/db/db.changelog.xml
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/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/ProjectDAOTest.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/ProjectsServiceTest.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/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
M server/zanata-frontend/.gitignore
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/.gitignore
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
M server/zanata-frontend/src/app/actions/version-actions.js
M server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/Icons/Readme.md
M server/zanata-frontend/src/app/components/LogoLoader/index.less
M server/zanata-frontend/src/app/components/Nav/index.jsx
R server/zanata-frontend/src/app/components/Notification/Notification.story.js
R server/zanata-frontend/src/app/components/Notification/component.js
R server/zanata-frontend/src/app/components/Notification/index.js
M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
M server/zanata-frontend/src/app/components/RejectionsForm/index.js
M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/components/index.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
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/containers/UserProfile/DayMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.less
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/components/EditorSearchInput/EditorSearchInput.test.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
M server/zanata-frontend/src/app/editor/components/Suggestion.js
M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
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/header-data-reducer.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/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
M server/zanata-frontend/src/app/editor/utils/status-util.test.js
M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
M server/zanata-frontend/src/app/entrypoint/index.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/require-all.test.ts
M server/zanata-frontend/src/app/styles/ant-theme-vars.less
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/styles/frontend-jsf.less
M server/zanata-frontend/src/app/styles/frontend-nav.less
M server/zanata-frontend/src/app/styles/style.less
M server/zanata-frontend/src/app/utils/GlossaryHelper.js
M server/zanata-frontend/src/app/utils/StringUtils.test.js
M server/zanata-frontend/src/index.html
M server/zanata-frontend/src/tsconfig.json
M server/zanata-frontend/src/webpack.config.js
M server/zanata-liquibase/pom.xml
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/CopyVersionData.dbunit.xml
M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
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-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
M server/zanata-test-war/pom.xml
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/liquibase
M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
M server/zanata-war/src/main/webapp/editor/index.xhtml
M server/zanata-war/src/main/webapp/iteration/view.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/compat/StatisticsCompatibilityITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
M server/zanata-war/src/test/resources/arquillian.xml
A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
A server/zanata-war/src/test/resources/org/zanata/test-text.txt
A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into validate-glossary-entry/ZNTA-2606
Commit: 4829e28d71c5ccd0673e626e60d8e85d88f83012
https://github.com/zanata/zanata-platform/commit/4829e28d71c5ccd0673e626e60d8e85d88f83012
Author: efloden <efloden at redhat.com>
Date: 2018-06-14 (Thu, 14 Jun 2018)
Changed paths:
M Jenkinsfile
M api/pom.xml
M api/zanata-common-api/pom.xml
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/pom.xml
M build-tools/src/test/java/TestJenkinsfile.java
M client/pom.xml
M client/stub-server/pom.xml
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-cli/pom.xml
M client/zanata-client-commands/pom.xml
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.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/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-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/pom.xml
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/TraceDebugFilter.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/AccountClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
M client/zanata-rest-client/src/test/java/org/zanata/rest/client/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-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
R common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
R common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
R common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
R common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
R 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
A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
R 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
R common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
R common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
M common/zanata-common-util/pom.xml
A docs/images/version-translation-settings.png
A docs/user-guide/review/review-enable.md
M docs/user-guide/review/translation-review.md
M docs/user-guide/versions/version-settings.md
M mkdocs.yml
M parent/pom.xml
M 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/AbstractPage.kt
M server/functional-test/src/main/java/org/zanata/page/BasePage.java
M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.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/MultiFileUploadTest.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/pom.xml
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/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.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-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/action/DashboardAction.java
M server/services/src/main/java/org/zanata/action/VersionHome.java
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/dao/ProjectIterationDAO.java
M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.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/search/dto/GroupSearchResult.java
M server/services/src/main/java/org/zanata/rest/search/service/SearchService.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/StatisticsServiceImpl.java
M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M server/services/src/main/java/org/zanata/security/SecurityFunctions.java
M server/services/src/main/java/org/zanata/service/TranslationFileService.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
R server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
M server/services/src/main/resources/db/db.changelog.xml
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.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/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/ProjectDAOTest.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/ProjectsServiceTest.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/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
R server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java
M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
M server/zanata-frontend/.gitignore
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/.gitignore
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
M server/zanata-frontend/src/app/actions/version-actions.js
M server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/Icons/Readme.md
M server/zanata-frontend/src/app/components/LogoLoader/index.less
M server/zanata-frontend/src/app/components/Nav/index.jsx
A server/zanata-frontend/src/app/components/Notification/Notification.story.js
A server/zanata-frontend/src/app/components/Notification/component.js
A server/zanata-frontend/src/app/components/Notification/index.js
M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
M server/zanata-frontend/src/app/components/RejectionsForm/index.js
M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/components/index.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
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/containers/UserProfile/DayMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.less
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/components/EditorSearchInput/EditorSearchInput.test.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js
M server/zanata-frontend/src/app/editor/components/Suggestion.js
M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
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/header-data-reducer.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/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
M server/zanata-frontend/src/app/editor/utils/status-util.test.js
M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
M server/zanata-frontend/src/app/entrypoint/index.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/require-all.test.ts
M server/zanata-frontend/src/app/styles/ant-theme-vars.less
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/styles/frontend-jsf.less
M server/zanata-frontend/src/app/styles/frontend-nav.less
M server/zanata-frontend/src/app/styles/style.less
M server/zanata-frontend/src/app/utils/GlossaryHelper.js
M server/zanata-frontend/src/app/utils/StringUtils.test.js
M server/zanata-frontend/src/index.html
M server/zanata-frontend/src/tsconfig.json
M server/zanata-frontend/src/webpack.config.js
M server/zanata-liquibase/pom.xml
M server/zanata-model-test/pom.xml
R server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
R server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
M server/zanata-test-war/pom.xml
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/liquibase
M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
M server/zanata-war/src/main/webapp/editor/index.xhtml
M server/zanata-war/src/main/webapp/iteration/view.xhtml
M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
R server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
R server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.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/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
R 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
R server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
R server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
R server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
R server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
R server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
R server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
R server/zanata-war/src/test/resources/org/zanata/test-text.txt
R server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
R server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
R server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf
Log Message:
-----------
Revert "Merge branch 'master' of github.com:zanata/zanata-platform into validate-glossary-entry/ZNTA-2606"
This reverts commit 269f9b5f01d98650845021f042702ff98f2387d0, reversing
changes made to 0711d65535dfe0edd194c8a193d7731c57957db7.
Commit: 094f0ecb2770fc68934c93be77c3ac46eb556ade
https://github.com/zanata/zanata-platform/commit/094f0ecb2770fc68934c93be77c3ac46eb556ade
Author: efloden <efloden at redhat.com>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/service/GlossaryService.java
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
Log Message:
-----------
fix: functional tests, check warnings after response
Compare: https://github.com/zanata/zanata-platform/compare/a3d3b3ea27d0^...094f0ecb2770
**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