Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 7d7c6c7b13d9ca902627a81142c07870d3e2f5bf
      
https://github.com/zanata/zanata-platform/commit/7d7c6c7b13d9ca902627a81142c07870d3e2f5bf
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M 
server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M 
server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M 
server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M 
server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M 
server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M 
server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) remove or refactor rows to antd


  Commit: f0933dae82f26ae8a8b0955e3ddcef17938cb287
      
https://github.com/zanata/zanata-platform/commit/f0933dae82f26ae8a8b0955e3ddcef17938cb287
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-21 (Mon, 21 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js

  Log Message:
  -----------
  refactor(ZNTA-2534) remove react-bootstrap table from editor


  Commit: 220787bef996b7cebc110557a4a41507e44ec242
      
https://github.com/zanata/zanata-platform/commit/220787bef996b7cebc110557a4a41507e44ec242
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: replace react-bootstrap components in editor with 
antd


  Commit: fc217ad7a0ab8f10bf7269ee156c36675bf71efd
      
https://github.com/zanata/zanata-platform/commit/fc217ad7a0ab8f10bf7269ee156c36675bf71efd
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-22 (Tue, 22 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: replace react-bootstrap components in editor with 
antd


  Commit: 67166e490db4b7e61f39da43723d64f59543e6ee
      
https://github.com/zanata/zanata-platform/commit/67166e490db4b7e61f39da43723d64f59543e6ee
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) revert changes to EditorSearchInput


  Commit: 498a7a49c2c82ca8b4056edb27c4fb6425f75ad4
      
https://github.com/zanata/zanata-platform/commit/498a7a49c2c82ca8b4056edb27c4fb6425f75ad4
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2534) react-bootstrap buttons in editor to antd (styling fixes 
still needed)


  Commit: ab131ce90695cbc4ace5f73f21ab370bb1ce22e8
      
https://github.com/zanata/zanata-platform/commit/ab131ce90695cbc4ace5f73f21ab370bb1ce22e8
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/Root/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) react-bootstrap buttons in editor to antd (styling fixes 
still needed)


  Commit: 9fb414999a1fbe809169a5b8a6f7911a97e53002
      
https://github.com/zanata/zanata-platform/commit/9fb414999a1fbe809169a5b8a6f7911a97e53002
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) fix activity tab fuzzy posts, minor css styling to editor


  Commit: 8b1747653efc4f09c5a2b7b5f0c5d95331a7a385
      
https://github.com/zanata/zanata-platform/commit/8b1747653efc4f09c5a2b7b5f0c5d95331a7a385
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) refactor translation footer buttons to antd


  Commit: 85a691ef7dd30317234ce65562b24ec943a2b44b
      
https://github.com/zanata/zanata-platform/commit/85a691ef7dd30317234ce65562b24ec943a2b44b
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/containers/Root/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) toggle buttons in editor to antd


  Commit: 5d4c8982fce5f5373bbc3ff4ee5228bc8a94400f
      
https://github.com/zanata/zanata-platform/commit/5d4c8982fce5f5373bbc3ff4ee5228bc8a94400f
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update editor snapshot tests


  Commit: 954eefb9c1c925a58169c6757f0f1c6d1cd8503c
      
https://github.com/zanata/zanata-platform/commit/954eefb9c1c925a58169c6757f0f1c6d1cd8503c
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js

  Log Message:
  -----------
  refactor(ZNTA-2534) migrate comment box, and editor panels to antd


  Commit: cd308893d70069a106f25bef7747d0005097cb41
      
https://github.com/zanata/zanata-platform/commit/cd308893d70069a106f25bef7747d0005097cb41
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M 
server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) remove last of react-bootstrap components from editor 
(excluding alerts). css styling fixes still required


  Commit: 6d953e614249913f3c0879eaa2d9f63deedd39ab
      
https://github.com/zanata/zanata-platform/commit/6d953e614249913f3c0879eaa2d9f63deedd39ab
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-05-30 (Wed, 30 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-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.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-rest-client/pom.xml
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.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-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/dashboard/DashboardProjectsTab.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
    A server/functional-test/src/test/resources/liquibase.properties
    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/ContactAdminAction.java
    M 
server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.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/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    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/ProjectDAO.java
    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/ActivationEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.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
    M 
server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    M 
server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M 
server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A 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/rest/service/ProjectVersionService.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/EmailService.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
    M 
server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.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/ContactAdminActionTest.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/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    A 
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/ProjectVersionTest.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/.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/components/Button/Button.story.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/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    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/components/Validation/Validation.story.js
    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/style.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/WEB-INF/layout/dashboard/projects.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M 
server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.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 ZNTA-2534


  Commit: 62a76ad3f49042f3cb22980e9e87f60f71f91af2
      
https://github.com/zanata/zanata-platform/commit/62a76ad3f49042f3cb22980e9e87f60f71f91af2
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) WIP: editor sidebar tabs


  Commit: bdb54007e89bd37bad50aca174421bcfc3b511d9
      
https://github.com/zanata/zanata-platform/commit/bdb54007e89bd37bad50aca174421bcfc3b511d9
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 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-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.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-rest-client/pom.xml
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.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-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/dashboard/DashboardProjectsTab.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
    A server/functional-test/src/test/resources/liquibase.properties
    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/ContactAdminAction.java
    M 
server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.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/LanguageContactCoordinatorAction.java
    M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java
    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/ProjectDAO.java
    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/ActivationEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M server/services/src/main/java/org/zanata/email/EmailBuilder.java
    R server/services/src/main/java/org/zanata/email/EmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.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
    M 
server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt
    A server/services/src/main/java/org/zanata/email/MessageBuilder.java
    M 
server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt
    M 
server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    A 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/rest/service/ProjectVersionService.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/EmailService.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
    M 
server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.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/ContactAdminActionTest.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/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java
    A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt
    A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt
    A 
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/ProjectVersionTest.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/.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/components/Button/Button.story.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/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    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/components/Validation/Validation.story.js
    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/style.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/WEB-INF/layout/dashboard/projects.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M 
server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.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 'ZNTA-2534' of https://github.com/zanata/zanata-platform into 
ZNTA-2534


  Commit: bf0dce856d7d3a100a27d83f1c1a9e3ce23e7066
      
https://github.com/zanata/zanata-platform/commit/bf0dce856d7d3a100a27d83f1c1a9e3ce23e7066
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M 
server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    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/containers/Admin/Review.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/styles/ant-theme-vars.less

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


  Commit: 41bd4a9b3a75f3f9936ca714b5b00e80956cc369
      
https://github.com/zanata/zanata-platform/commit/41bd4a9b3a75f3f9936ca714b5b00e80956cc369
  Author: kgough <kgo...@redhat.com>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2534) css fixes to editor


  Commit: 39a6c637a4937365da5e7968fabdad3990f1365c
      
https://github.com/zanata/zanata-platform/commit/39a6c637a4937365da5e7968fabdad3990f1365c
  Author: efloden <eflo...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  fix: TranslationInfoPanel tabs


  Commit: c09abd16b23d1fc849a45bd0c694a6774a8aaac8
      
https://github.com/zanata/zanata-platform/commit/c09abd16b23d1fc849a45bd0c694a6774a8aaac8
  Author: efloden <eflo...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx

  Log Message:
  -----------
  fix: Commentbox controlled input


  Commit: 98d85736e11585baf7173e0b418edb18a9fc7410
      
https://github.com/zanata/zanata-platform/commit/98d85736e11585baf7173e0b418edb18a9fc7410
  Author: efloden <eflo...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M 
server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M 
server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js

  Log Message:
  -----------
  chore: update editor tests


  Commit: 9717b4f90ec4dc6d61d0b2e71dc4c06e096f17a3
      
https://github.com/zanata/zanata-platform/commit/9717b4f90ec4dc6d61d0b2e71dc4c06e096f17a3
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-01 (Fri, 01 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    M 
server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.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/security/SecurityFunctions.java
    M server/services/src/main/java/org/zanata/util/HtmlUtil.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/org/zanata/email/templates/decline_language_team_request.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_admin.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    M 
server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M 
server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java
    M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    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/src/main/java/org/zanata/model/HIterationGroup.java

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


  Commit: dafdf14f9168d25a553d221f3dad7e7a4efb24d5
      
https://github.com/zanata/zanata-platform/commit/dafdf14f9168d25a553d221f3dad7e7a4efb24d5
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) styling for editor tabs


  Commit: 7b058db1c8cb763d16849c13ea20d2c06b7f08ff
      
https://github.com/zanata/zanata-platform/commit/7b058db1c8cb763d16849c13ea20d2c06b7f08ff
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) media queries for sidebar in editor


  Commit: 04c380e730362f2fc3e71351db3d070361f25004
      
https://github.com/zanata/zanata-platform/commit/04c380e730362f2fc3e71351db3d070361f25004
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) add tachyon utility classes to editor, small margin fixes 
to activity tab


  Commit: 448678243cf48e3c3360f34b37d52d6d17a035b7
      
https://github.com/zanata/zanata-platform/commit/448678243cf48e3c3360f34b37d52d6d17a035b7
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) correct location in tachyon css import, minor css fixes 
to editor sidebar


  Commit: 54d117b7353e8b8075031fe4910be443044cad88
      
https://github.com/zanata/zanata-platform/commit/54d117b7353e8b8075031fe4910be443044cad88
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M 
server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) styling fixes to react editor, update snapshots


  Commit: c14cb6e91295cecf4ed51921330a4a32c05661d4
      
https://github.com/zanata/zanata-platform/commit/c14cb6e91295cecf4ed51921330a4a32c05661d4
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/Root/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534) vertical alignment of editor breadcrumb menu


  Commit: 47a576748dd567c19790fc2aafbbd20100ba2a89
      
https://github.com/zanata/zanata-platform/commit/47a576748dd567c19790fc2aafbbd20100ba2a89
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M docs/user-guide/documents/upload-documents.md
    M parent/pom.xml
    M server/gwt-shared/pom.xml
    M server/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/resources/messages.properties
    M 
server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml

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


  Commit: a255e80e2c4b3ff6d8e237aa6ddb9df01d149709
      
https://github.com/zanata/zanata-platform/commit/a255e80e2c4b3ff6d8e237aa6ddb9df01d149709
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) fix import statement for tachyon utility classes


  Commit: 5f42051bed6ba80ce3e0923846c5c31f116e3578
      
https://github.com/zanata/zanata-platform/commit/5f42051bed6ba80ce3e0923846c5c31f116e3578
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M .gitignore
    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 server/pom.xml
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.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/webtrans/server/rpc/LoadOptionsHandler.java
    M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml
    M server/services/src/main/resources/messages.properties
    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
    M 
server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/Icons/Readme.md
    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/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/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    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/containers/ActivityTab.tsx
    M 
server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.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/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/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/StringUtils.test.js
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M 
server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M 
server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534


  Commit: ff430e4b704a43885c75c08f518a4eeac2b04332
      
https://github.com/zanata/zanata-platform/commit/ff430e4b704a43885c75c08f518a4eeac2b04332
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534


  Commit: b4a08f634b8ed177ef2a705615bfec708ae96aef
      
https://github.com/zanata/zanata-platform/commit/b4a08f634b8ed177ef2a705615bfec708ae96aef
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update snapshots


  Commit: 4fa791e438dbda18844217a11603203c5148daeb
      
https://github.com/zanata/zanata-platform/commit/4fa791e438dbda18844217a11603203c5148daeb
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css

  Log Message:
  -----------
  refactor(ZNTA-2534)fix linting issues


  Commit: a5ab1431c92f5d46398dfd6d54dbdd67e241f581
      
https://github.com/zanata/zanata-platform/commit/a5ab1431c92f5d46398dfd6d54dbdd67e241f581
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M 
common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M 
common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M 
common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M 
server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M 
server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M 
server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/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/PropertiesLatinOneAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M 
server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    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/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M 
server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M 
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A 
server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534


  Commit: d83619b39231843041ca514c731b0ea23b09565a
      
https://github.com/zanata/zanata-platform/commit/d83619b39231843041ca514c731b0ea23b09565a
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534


  Commit: d674e1c8185087588c29cb5dcc4bbafcdb68a2f4
      
https://github.com/zanata/zanata-platform/commit/d674e1c8185087588c29cb5dcc4bbafcdb68a2f4
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M server/pom.xml
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    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/ProjectVersion/TMMergeProjectSources.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge branch 'master' into ZNTA-2534


  Commit: 5d6a180cba603af8539acc2c7bb5cf366907200f
      
https://github.com/zanata/zanata-platform/commit/5d6a180cba603af8539acc2c7bb5cf366907200f
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M 
server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js

  Log Message:
  -----------
  refactor(ZNTA-2534) remove card component from editor glossary term modal


  Commit: db96f3330532aba96a46d8c01f1eb6cd22de300b
      
https://github.com/zanata/zanata-platform/commit/db96f3330532aba96a46d8c01f1eb6cd22de300b
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M Jenkinsfile
    M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
    M 
api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
    M build-tools/src/test/java/TestJenkinsfile.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M 
client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M 
client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java
    M 
client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M 
common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A 
common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot
    A 
common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po
    M common/zanata-adapter-properties/pom.xml
    M 
common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    R 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
    A 
common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    M common/zanata-adapter-xliff/pom.xml
    M 
common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M 
common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf
    A 
common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf
    M parent/pom.xml
    M server/etc/scripts/configure-app-server.js
    M server/etc/scripts/runJbossCli.groovy
    M server/etc/scripts/types.d.ts
    M server/functional-test/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/BasePage.java
    M 
server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M 
server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 
server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M 
server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
    M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
    M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
    M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
    M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M 
server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M 
server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M server/services/src/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/PropertiesLatinOneAdapterTest.java
    M 
server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java
    A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt
    M 
server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
    M server/zanata-frontend/.gitignore
    M server/zanata-frontend/src/.gitignore
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    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/ProjectVersion/TMMergeProjectSources.js
    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.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M 
server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/antd.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/index.html
    M server/zanata-model-test/pom.xml
    A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    A 
server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M 
server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/editor/index.xhtml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java
    A 
server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    A 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java
    M server/zanata-war/src/test/resources/arquillian.xml
    A 
server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po
    A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po
    A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po
    A server/zanata-war/src/test/resources/org/zanata/test-text.txt
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf
    A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf

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


  Commit: 1c9ca8258df72ec3375bab5fe014271f9d3aa205
      
https://github.com/zanata/zanata-platform/commit/1c9ca8258df72ec3375bab5fe014271f9d3aa205
  Author: kgough <kgo...@redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap

  Log Message:
  -----------
  refactor(ZNTA-2534) update editor snapshots


  Commit: 47dc61cbf5b2792c74b6b4919b50b06c7ddd6a38
      
https://github.com/zanata/zanata-platform/commit/47dc61cbf5b2792c74b6b4919b50b06c7ddd6a38
  Author: Kathryn Gough <kgo...@redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M 
server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M 
server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M 
server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M 
server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M 
server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
    M 
server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M 
server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M 
server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
    M server/zanata-frontend/src/app/editor/components/IconButton/index.js
    M 
server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
    M 
server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M 
server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
    M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
    M 
server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M 
server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M 
server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
    M 
server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
    M 
server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M 
server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #830 from zanata/ZNTA-2534

refactor(ZNTA-2534) editor components to antd


Compare: 
https://github.com/zanata/zanata-platform/compare/64756d047e63...47dc61cbf5b2
      **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.
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to