[zanata/zanata-platform] 659bcf: feat(ZNTA-2300): editor concurrent save resolution

GitHub noreply at github.com
Wed Jul 18 01:12:10 UTC 2018


  Branch: refs/heads/ZNTA-2075
  Home:   https://github.com/zanata/zanata-platform
  Commit: 659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
      https://github.com/zanata/zanata-platform/commit/659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat(ZNTA-2300): editor concurrent save resolution


  Commit: e35cb8ed7227c94d898151677a41591b56a21a34
      https://github.com/zanata/zanata-platform/commit/e35cb8ed7227c94d898151677a41591b56a21a34
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

  Changed paths:
    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/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: create redux action for save conflict


  Commit: 4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
      https://github.com/zanata/zanata-platform/commit/4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
  Author: efloden <efloden at 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
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/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

  Log Message:
  -----------
  feat: convert ConcurrentModal to tsx, handle redux state for modal


  Commit: 7c831048c9fbf1c869a351d75468e13d3b1373b4
      https://github.com/zanata/zanata-platform/commit/7c831048c9fbf1c869a351d75468e13d3b1373b4
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/CorePage.java
    M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
    M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.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/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M server/pom.xml
    M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.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/index.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/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/DocsDropdown/DocsDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.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/components/Validation/Validation.story.js
    A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    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/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/FeatureToggles.ts
    A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationAction.ts
    A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
    A server/zanata-frontend/src/app/validators/ValidationMessages.ts
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
    A server/zanata-frontend/src/app/validators/index.ts
    A server/zanata-frontend/src/app/validators/messages/en.json
    A server/zanata-frontend/src/app/validators/messages/fr.json
    A server/zanata-frontend/src/app/validators/messages/index.ts
    A server/zanata-frontend/src/app/validators/messages/ja.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: d0a64fa87eb5d473240629da59db25df35cf5d73
      https://github.com/zanata/zanata-platform/commit/d0a64fa87eb5d473240629da59db25df35cf5d73
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  antd css fixes: minor ui fixes for consistency across frontend


  Commit: e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
      https://github.com/zanata/zanata-platform/commit/e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Changed paths:
    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/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: implement save original translation selection from conflict modal


  Commit: 8d221faf27d040143d2cf30f262e0c06807dbf1b
      https://github.com/zanata/zanata-platform/commit/8d221faf27d040143d2cf30f262e0c06807dbf1b
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  WIP: antd select for glossary languages


  Commit: d4d8a498af0bc46ea703700ba07bb98d231abd7c
      https://github.com/zanata/zanata-platform/commit/d4d8a498af0bc46ea703700ba07bb98d231abd7c
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  feat(ZNTA-2544): add 'Export user data' button


  Commit: 6613df9679f85cca436f6193a494cab4972598ed
      https://github.com/zanata/zanata-platform/commit/6613df9679f85cca436f6193a494cab4972598ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    M server/zanata-model/pom.xml
    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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

  Log Message:
  -----------
  Add GraphQL


  Commit: 87789a08ddddbce24979739da99a988889f3d919
      https://github.com/zanata/zanata-platform/commit/87789a08ddddbce24979739da99a988889f3d919
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: handle save as latest or original


  Commit: a9b728a24a22d4f0db698433504036b6de504ff8
      https://github.com/zanata/zanata-platform/commit/a9b728a24a22d4f0db698433504036b6de504ff8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts

  Log Message:
  -----------
  fix(ZNTA-2483): Fix context in TS file write (#922)


  Commit: 50309f08ca31f1d33f8167eee9a3c772459d5c1b
      https://github.com/zanata/zanata-platform/commit/50309f08ca31f1d33f8167eee9a3c772459d5c1b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Update docs/release-notes.md for version 4.5.0


  Commit: 2f7f1941c545af2283418731476f1a3ac79e9ca6
      https://github.com/zanata/zanata-platform/commit/2f7f1941c545af2283418731476f1a3ac79e9ca6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/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/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.5.0


  Commit: 86a6cade8bc43aba75c7d6fea7b25d63181f56ee
      https://github.com/zanata/zanata-platform/commit/86a6cade8bc43aba75c7d6fea7b25d63181f56ee
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/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/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.5.1-SNAPSHOT


  Commit: f6978427b28d366a658e9a735707fc94658ee248
      https://github.com/zanata/zanata-platform/commit/f6978427b28d366a658e9a735707fc94658ee248
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts

  Log Message:
  -----------
  Merge branch 'release'


  Commit: b76836c6741dbd5762138210b5bc08e7e2e0c42c
      https://github.com/zanata/zanata-platform/commit/b76836c6741dbd5762138210b5bc08e7e2e0c42c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M parent/pom.xml
    M server/pom.xml

  Log Message:
  -----------
  Update ASM to fix upper bound dependencies error

Configure enforceBytecodeVersion to ignore module-info.class
Update animal-sniffer to support module-info.class
Update duplicate-finder to support module-info.class


  Commit: c6f2cfc078fd4b9b02f46bf929cd34d5a89321b6
      https://github.com/zanata/zanata-platform/commit/c6f2cfc078fd4b9b02f46bf929cd34d5a89321b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    R server/services/src/main/java/org/zanata/rest/graphQL/GraphQLRestService.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/util/json.kt
    R server/services/src/test/java/org/zanata/rest/graphQL/GraphQLRestServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Complete initial version of ExportRestService

Add HPerson.projectLocaleMemberships
Eliminate some cases of GraphQLIgnore
Override GraphQL type names for "H" entities
Add scalar type defs for LocaleId and ContentType
Rename GraphQLRestService to ExportRestService
Convert to Kotlin
Split up tests for ExportRestService and GraphQLService
Replace DBUnit in test with bespoke entities
Extract GraphQL 'data' for ExportRestService response
Return data as JSON
Change REST path for exporting user data
Ensure CDI proxy constructor is non-private
Avoid non-compliant package name *.graphQL


  Commit: 90f293a373d39c5ec11c6e9046ace88c616b5749
      https://github.com/zanata/zanata-platform/commit/90f293a373d39c5ec11c6e9046ace88c616b5749
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    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/HProjectMember.java

  Log Message:
  -----------
  Eliminate Guava Beta API usage


  Commit: 9b28be1e92cb69f17c93009584aae88f4d3adb00
      https://github.com/zanata/zanata-platform/commit/9b28be1e92cb69f17c93009584aae88f4d3adb00
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java

  Log Message:
  -----------
  Fix badly merged test


  Commit: 87ce1510d1a3c23fc067bf8bef022f69f9bd6a44
      https://github.com/zanata/zanata-platform/commit/87ce1510d1a3c23fc067bf8bef022f69f9bd6a44
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    M server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java

  Log Message:
  -----------
  Clean up static analysis warnings


  Commit: ef30f354607089ef90624dd9a3ab05ae2ed66f4f
      https://github.com/zanata/zanata-platform/commit/ef30f354607089ef90624dd9a3ab05ae2ed66f4f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx

  Log Message:
  -----------
  feat: include latest username, modified date in conflict response
display in conflict modal UI


  Commit: 0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
      https://github.com/zanata/zanata-platform/commit/0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  refactor: extract conflictData interface


  Commit: 124926fd9fed6d2492a3890161f3b967c4999685
      https://github.com/zanata/zanata-platform/commit/124926fd9fed6d2492a3890161f3b967c4999685
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

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

  Log Message:
  -----------
  fix: tslint error


  Commit: 16820c2c21748cb80f80769a28707686ca4141fc
      https://github.com/zanata/zanata-platform/commit/16820c2c21748cb80f80769a28707686ca4141fc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  refactor: eliminate some Guava (#921)

* Eliminate some Guava from tests
* Simplify using lambdas
* Allow empty lambdas in Checkstyle
* Comment out allowEmptyCatches
* Refactor collection code
* Refactor ProjectHomeAction


  Commit: e33f25eba17ce2536ea72023c5df63eb3dabfef5
      https://github.com/zanata/zanata-platform/commit/e33f25eba17ce2536ea72023c5df63eb3dabfef5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M docs/release-notes.md
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into ZNTA-2544


  Commit: 6f731166c73162a136bc7f941051ab68ce852510
      https://github.com/zanata/zanata-platform/commit/6f731166c73162a136bc7f941051ab68ce852510
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java

  Log Message:
  -----------
  Add MACHINE_TRANS to AUTOMATED_ENTRIES (#915)


  Commit: f4da8ce4ed1062caece059f5c64cb9090a4dde93
      https://github.com/zanata/zanata-platform/commit/f4da8ce4ed1062caece059f5c64cb9090a4dde93
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java

  Log Message:
  -----------
  Move PersonProjectMemberships to org.zanata.service


  Commit: 9897499eb71993452d765a085c4e882c6b3d85ca
      https://github.com/zanata/zanata-platform/commit/9897499eb71993452d765a085c4e882c6b3d85ca
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  refactor: use date type on server, convert in frontend


  Commit: 1bd511244d55da5166112265c3af595afd12327b
      https://github.com/zanata/zanata-platform/commit/1bd511244d55da5166112265c3af595afd12327b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts

  Log Message:
  -----------
  Fix some TypeScript errors


  Commit: a4bb9d2c7b24cb56c710dba4437c7f5fd88521b7
      https://github.com/zanata/zanata-platform/commit/a4bb9d2c7b24cb56c710dba4437c7f5fd88521b7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Re-enable TypeScript type checking


  Commit: 2a03023756c921dfef47bcf54d79139f8ba86a6f
      https://github.com/zanata/zanata-platform/commit/2a03023756c921dfef47bcf54d79139f8ba86a6f
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix(ZNTA-2638) remove borders from antd buttons using btn-link styling


  Commit: eda3bb2f88d2552b9570cdf12ab590461a3ef258
      https://github.com/zanata/zanata-platform/commit/eda3bb2f88d2552b9570cdf12ab590461a3ef258
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.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/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.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/validators/impl/PrintfXSIExtensionValidation.ts

  Log Message:
  -----------
  Fix TypeScript compiler errors


  Commit: 9742788a5fd8d1d7bf811eabf78448892b82ae44
      https://github.com/zanata/zanata-platform/commit/9742788a5fd8d1d7bf811eabf78448892b82ae44
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  feat(ZNTA-2544) remove duplicate button from dashboard settings


  Commit: f376a5991a58713f1922bd0c57be354e8622a72c
      https://github.com/zanata/zanata-platform/commit/f376a5991a58713f1922bd0c57be354e8622a72c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java

  Log Message:
  -----------
  Remove unused import


  Commit: 91c1a6ff6beceab147739417e3c73a2ca9c98b9a
      https://github.com/zanata/zanata-platform/commit/91c1a6ff6beceab147739417e3c73a2ca9c98b9a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge pull request #920 from zanata/ZNTA-2544

feat(ZNTA-2544): Download user information button added to profile


  Commit: 8085822c2a949835daaec1061ff905855d4afe3b
      https://github.com/zanata/zanata-platform/commit/8085822c2a949835daaec1061ff905855d4afe3b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Tweak tslint settings


  Commit: a3bb48de5d3dcff6dd2b83423ebe393aef5fbfa4
      https://github.com/zanata/zanata-platform/commit/a3bb48de5d3dcff6dd2b83423ebe393aef5fbfa4
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/resources/messages.properties
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

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


  Commit: 5626fc36b1868bc8fbfd527c3628c6fb20bd54e4
      https://github.com/zanata/zanata-platform/commit/5626fc36b1868bc8fbfd527c3628c6fb20bd54e4
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.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/PullStrategy.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/pull/XmlStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    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/AccountDAO.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    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/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' into frontend-ui-fixes


  Commit: 224ebd78a1da91545f6f08e640ab103ba1ab89e1
      https://github.com/zanata/zanata-platform/commit/224ebd78a1da91545f6f08e640ab103ba1ab89e1
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js

  Log Message:
  -----------
  fix(ZMTA-2279) revert antd select refactor, update icons to antd


  Commit: 5745a5224b8f92455da257eab467911733cd550c
      https://github.com/zanata/zanata-platform/commit/5745a5224b8f92455da257eab467911733cd550c
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #930 from zanata/ZNTA-2638

fix(ZNTA-2638) remove borders from antd buttons using btn-link styling


  Commit: 51b7e79f1d7e75a3aadc84c6e5331a07928177c8
      https://github.com/zanata/zanata-platform/commit/51b7e79f1d7e75a3aadc84c6e5331a07928177c8
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into frontend-ui-fixes


  Commit: 030765331d616d33d3b5e3e9bf9992627d774770
      https://github.com/zanata/zanata-platform/commit/030765331d616d33d3b5e3e9bf9992627d774770
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #916 from zanata/frontend-ui-fixes

antd css fixes: minor ui fixes for consistency across frontend


  Commit: ea322898e96650a1f7d12d1eb9e55ba44abd44e9
      https://github.com/zanata/zanata-platform/commit/ea322898e96650a1f7d12d1eb9e55ba44abd44e9
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  fix(ZNTA-2279) fix position of glossary languageSelect icon and count


  Commit: 683b064220347b7e8ca1a65d422f0f70969aea07
      https://github.com/zanata/zanata-platform/commit/683b064220347b7e8ca1a65d422f0f70969aea07
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.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/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.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/require-all.test.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  Merge pull request #929 from zanata/fix-typescript-settings

Fix TypeScript settings


  Commit: f92fe831cf2d3d6379340e80a1056c7e28368f01
      https://github.com/zanata/zanata-platform/commit/f92fe831cf2d3d6379340e80a1056c7e28368f01
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  fix(ZNTA-2279) alignment of languageSelect icon and count with select


  Commit: 28a31a6727546878242e4f7778275290e87ddd58
      https://github.com/zanata/zanata-platform/commit/28a31a6727546878242e4f7778275290e87ddd58
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove react-bootstrap css from frontend components


  Commit: 6639cf9fafc1c1b289c5bcffc317248bb4a00617
      https://github.com/zanata/zanata-platform/commit/6639cf9fafc1c1b289c5bcffc317248bb4a00617
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove unused css (WIP)


  Commit: 92decc569d9313c07ae15b9d657bc964342ffb7f
      https://github.com/zanata/zanata-platform/commit/92decc569d9313c07ae15b9d657bc964342ffb7f
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.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/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: frontend pages, remove react-bootstrap


  Commit: 5313f278e353c03649eaa4a8caa0fc8d1cda1df6
      https://github.com/zanata/zanata-platform/commit/5313f278e353c03649eaa4a8caa0fc8d1cda1df6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/Nav/index.jsx

  Log Message:
  -----------
  fix: nav link (#934)

https://zanata.atlassian.net/browse/ZNTA-2600


  Commit: f04c6ba930255012d1cfd13d56b7fb00aed737b6
      https://github.com/zanata/zanata-platform/commit/f04c6ba930255012d1cfd13d56b7fb00aed737b6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/Nav/index.jsx

  Log Message:
  -----------
  Merge commit '5313f278e353c03649eaa4a8caa0fc8d1cda1df6' into HEAD


  Commit: fb042f30f8ec46ab128e9bb5a67dd1973e81b9b6
      https://github.com/zanata/zanata-platform/commit/fb042f30f8ec46ab128e9bb5a67dd1973e81b9b6
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove react-bootstrap styling from frontend containers (WIP)


  Commit: d547a37fbf383ff7033138d07cc1c7e00c6b6380
      https://github.com/zanata/zanata-platform/commit/d547a37fbf383ff7033138d07cc1c7e00c6b6380
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.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/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.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/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/reducers/admin-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/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Enable TypeScript's strict option, ts-ignore old violations (#938)


  Commit: c0febe7d6a348143e7025e3d67b5a30677bd1fcd
      https://github.com/zanata/zanata-platform/commit/c0febe7d6a348143e7025e3d67b5a30677bd1fcd
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove unused css from style.less, refactor EditableText component and WIP: glossary container


  Commit: 3452b3c2ae7c45ec8ed614584e191aa83e981c48
      https://github.com/zanata/zanata-platform/commit/3452b3c2ae7c45ec8ed614584e191aa83e981c48
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
    M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.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/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.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/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/reducers/admin-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/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

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


  Commit: 14107a8346105b593cada9ba73ce9a117cee5bb4
      https://github.com/zanata/zanata-platform/commit/14107a8346105b593cada9ba73ce9a117cee5bb4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  chore: fix Jest configuration for TypeScript (#940)

Upgrade Jest
Convert jest.config.json to jest.config.js
Remove unnecessary quotes from jest.config.js
Add JSDoc types to jest.config.js
Change Jest's testRegex to include TypeScript tests
Fix broken test: Pager.test.jsx


  Commit: 7a48f9c1f7bc95af606659052747af99d8e4d4c0
      https://github.com/zanata/zanata-platform/commit/7a48f9c1f7bc95af606659052747af99d8e4d4c0
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.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/PullStrategy.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/pull/XmlStrategy.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
    M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
    A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
    R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
    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/AccountDAO.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/file/FilePersistService.java
    M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
    M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    M server/services/src/main/java/org/zanata/rest/service/FileService.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/TranslationFileService.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
    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/PlainTextAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
    M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storybook.less
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/EditableText/index.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/Link/index.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    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.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.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/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.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/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/Root/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.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/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/require-all.test.ts
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/index.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
      https://github.com/zanata/zanata-platform/commit/f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

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

  Log Message:
  -----------
  fix: typescript strict checks


  Commit: bc03058f42acb3324c7c3bdc71a65787c6ddaeaa
      https://github.com/zanata/zanata-platform/commit/bc03058f42acb3324c7c3bdc71a65787c6ddaeaa
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml

  Log Message:
  -----------
  fix(test): upgrade account tests to Kotlin and fix (#931)

* fix(test): upgrade account tests to Kotlin and fix
Includes the Experiment and TransMemory lone tests.
* fix(test): fix indent


  Commit: 9a32abaf3cfb0ae36d08a01805ebd27a88c5b63d
      https://github.com/zanata/zanata-platform/commit/9a32abaf3cfb0ae36d08a01805ebd27a88c5b63d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt

  Log Message:
  -----------
  fix(test): convert dashboard tests to Kotlin (#936)

* fix(test): convert dashboard tests to Kotlin
* fix(test): remove backticks and throws, use lateinit


  Commit: 2e1f36e99d51ff04938fa60a437d0c56a308b314
      https://github.com/zanata/zanata-platform/commit/2e1f36e99d51ff04938fa60a437d0c56a308b314
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  Merge pull request #918 from zanata/ZNTA-2279

refactor(ZNTA-2279): antd icons and select styling for glossary


  Commit: 57b0c6e5a848e7c9363ed10104a7f4fb6f633159
      https://github.com/zanata/zanata-platform/commit/57b0c6e5a848e7c9363ed10104a7f4fb6f633159
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    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/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml

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


  Commit: d62c1721203b473b92f253fe91afc1c63976b4d0
      https://github.com/zanata/zanata-platform/commit/d62c1721203b473b92f253fe91afc1c63976b4d0
  Author: efloden <efloden at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  fix: java findbugs - exposing internal representation of Date


  Commit: af16123d9dca03b1afdf3d076246a54f1c8a5090
      https://github.com/zanata/zanata-platform/commit/af16123d9dca03b1afdf3d076246a54f1c8a5090
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove react-bootstrap from frontend


  Commit: 7894538f31aaa6687df0c2d28d4cd37873b77dc4
      https://github.com/zanata/zanata-platform/commit/7894538f31aaa6687df0c2d28d4cd37873b77dc4
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    M server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Languages/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/entrypoint/index.js

  Log Message:
  -----------
  refactor(ZNTA-2529) remove bstrapReact wrapper from frontend


  Commit: a8732db4b3f396be95dabe0123c553955989fff6
      https://github.com/zanata/zanata-platform/commit/a8732db4b3f396be95dabe0123c553955989fff6
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) react-bootstrap nav to antd less file


  Commit: 1db8b85668e0386654457f9d7923e29a1eb3bf56
      https://github.com/zanata/zanata-platform/commit/1db8b85668e0386654457f9d7923e29a1eb3bf56
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) update frontend snapshot tests


  Commit: de1e5adfbb6ce8e91a0d9e30759a5255ce86a311
      https://github.com/zanata/zanata-platform/commit/de1e5adfbb6ce8e91a0d9e30759a5255ce86a311
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing test in frontend - DraggableVersionPanels


  Commit: b8bd62a02d9d7ca42340655a446b3294283da667
      https://github.com/zanata/zanata-platform/commit/b8bd62a02d9d7ca42340655a446b3294283da667
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java

  Log Message:
  -----------
  fix: functional test (#942)


  Commit: 0acef8f4d93a2435415fcade553b414aa11a4261
      https://github.com/zanata/zanata-platform/commit/0acef8f4d93a2435415fcade553b414aa11a4261
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) add spacing variables to ant-theme-vars.less


  Commit: 3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
      https://github.com/zanata/zanata-platform/commit/3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    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/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  fix: use latest versionNum when resolving with original


  Commit: 988161a9561460a1d2c4b7b004c60e8219fab471
      https://github.com/zanata/zanata-platform/commit/988161a9561460a1d2c4b7b004c60e8219fab471
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js

  Log Message:
  -----------
  fix: save as latest action params


  Commit: bf5935d36e8e4385dc702f6b03a38b3911d278ab
      https://github.com/zanata/zanata-platform/commit/bf5935d36e8e4385dc702f6b03a38b3911d278ab
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  chore(ZNTA-2610): upgrade react to 16.4.0 (#882)

* chore(ZNTA-2610): upgrade react to 16.4.0, upgrade affected dependancies

* fix: resolve new react warnings

* fix: use storybook-addon-intl to provide intl decorator

* fix: remove use of storybook-addon-actions

* fix: disable GlossaryTermModal storyshot

* fix: Glossary EntryModal replace incompatible component

* fix: include Validation.story.js merge conflict resolution

* chore: update snapshots

* fix: typescript strict checks

* chore: upgrade enzyme, refactor tests


  Commit: a10977c50847bb43ca92ef5c0a24f180f0e569fa
      https://github.com/zanata/zanata-platform/commit/a10977c50847bb43ca92ef5c0a24f180f0e569fa
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.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/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.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/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: 86e5691a6564e340c3458beef84dc87411dffab9
      https://github.com/zanata/zanata-platform/commit/86e5691a6564e340c3458beef84dc87411dffab9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

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

  Log Message:
  -----------
  refactor: ConcurrentModal to stateless component


  Commit: 7d4ded8e9a7e630b33382e3b85123f2bdf6aab62
      https://github.com/zanata/zanata-platform/commit/7d4ded8e9a7e630b33382e3b85123f2bdf6aab62
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: remove all bootstrap css from explore container


  Commit: 7912fe617e47d69de54efac6068da7678e32009c
      https://github.com/zanata/zanata-platform/commit/7912fe617e47d69de54efac6068da7678e32009c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    A server/zanata-frontend/src/app/components/Notification/component.js
    M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2529) fix merge conflicts


  Commit: 36f26444a91ac3ff10dd1ea32fe08fa27def59f3
      https://github.com/zanata/zanata-platform/commit/36f26444a91ac3ff10dd1ea32fe08fa27def59f3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Modal/index.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) fix merge conflicts


  Commit: f8e5d85369724335d8cae0f53a030394e91afe55
      https://github.com/zanata/zanata-platform/commit/f8e5d85369724335d8cae0f53a030394e91afe55
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    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

  Log Message:
  -----------
  refactor(ZNTA-2529) fix ui bugs on explpore page after removing bstrapReact wraper


  Commit: d2b5ee7a709ffd7b241221c10b016f79f1fe5ecb
      https://github.com/zanata/zanata-platform/commit/d2b5ee7a709ffd7b241221c10b016f79f1fe5ecb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.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

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to project version modals, WIP: media queries


  Commit: 64b6a2cf3a9546198bf94f2a2d9cb52276ef13eb
      https://github.com/zanata/zanata-platform/commit/64b6a2cf3a9546198bf94f2a2d9cb52276ef13eb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) media queries for react pages and dashboard, WIP: profile fixes


  Commit: 74a1659510c2cb1ac196e52a9955cecf01f2d2a6
      https://github.com/zanata/zanata-platform/commit/74a1659510c2cb1ac196e52a9955cecf01f2d2a6
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) antd variables modified, user profile fixes WIP


  Commit: 80f4ccb8a9a1cb6495de7f7b403f13cd595e1d79
      https://github.com/zanata/zanata-platform/commit/80f4ccb8a9a1cb6495de7f7b403f13cd595e1d79
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  refactor(ZNTA-2529) activity filter buttons on profile styled


  Commit: 3c37fabc13648d2cc26651e3e55cdcdb6ec8b45e
      https://github.com/zanata/zanata-platform/commit/3c37fabc13648d2cc26651e3e55cdcdb6ec8b45e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) refactor utility classes used in user profile, fix alignment of activity details word count


  Commit: 606f8fa464ac83ed0348e59bab4e7867172e709a
      https://github.com/zanata/zanata-platform/commit/606f8fa464ac83ed0348e59bab4e7867172e709a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529( misc ui fixes to user profile page and TM Merge modal


  Commit: ce80c8a27edc1cc163e98b937bfdeeaa58ff7d77
      https://github.com/zanata/zanata-platform/commit/ce80c8a27edc1cc163e98b937bfdeeaa58ff7d77
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/UserProfile/CategoryItemMatrix.tsx

  Log Message:
  -----------
  refactor(ZNTA-2529) fix alignment of word count in activity panel of user profile, fix height of glossary header and search input


  Commit: 373dba5b4e4631e248be9d7757fa29a2185caeb5
      https://github.com/zanata/zanata-platform/commit/373dba5b4e4631e248be9d7757fa29a2185caeb5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-03 (Tue, 03 Jul 2018)

  Changed paths:
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt

  Log Message:
  -----------
  fix(test): convert concurrentedit tests to Kotlin (#935)

* fix(test): convert concurrentedit tests to Kotlin
* fix(test): remove exception throws, use lateinit
* fix(test): simplify the status code collection


  Commit: 2bbf831f34b0dc2b68af7213454c127b29975c7a
      https://github.com/zanata/zanata-platform/commit/2bbf831f34b0dc2b68af7213454c127b29975c7a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) bug fixes to glossary ui


  Commit: aa944c1cad333896634bc1ea64af9dbd577bd45a
      https://github.com/zanata/zanata-platform/commit/aa944c1cad333896634bc1ea64af9dbd577bd45a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
    M server/zanata-frontend/src/app/containers/Languages/Entry.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/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to languages page and frontend LoaderText component


  Commit: 51e4cbf8ea19dec5abe453c30a4250d6c7083c17
      https://github.com/zanata/zanata-platform/commit/51e4cbf8ea19dec5abe453c30a4250d6c7083c17
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    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/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) responsive layout of languages page


  Commit: 0b9c0d1c7cb908f75a1a7ceb821eee5528a15cd1
      https://github.com/zanata/zanata-platform/commit/0b9c0d1c7cb908f75a1a7ceb821eee5528a15cd1
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js

  Log Message:
  -----------
  refactor(ZNTA-2529) set tooltip popup triggers to click


  Commit: e35a63806d101e0d51c165973aa88546e5ab562e
      https://github.com/zanata/zanata-platform/commit/e35a63806d101e0d51c165973aa88546e5ab562e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) align tooltip for delete all glossary entries, styling to admin homepage


  Commit: 769f529c271f8fc1f862e2fc5f956b9a6c7eb8c7
      https://github.com/zanata/zanata-platform/commit/769f529c271f8fc1f862e2fc5f956b9a6c7eb8c7
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) layout and styling fixes to reject translation settings page (WIP), update frontend snapshots


  Commit: aa3c8d589ca7bc7d5763fdc0ae11b16f4225c8a7
      https://github.com/zanata/zanata-platform/commit/aa3c8d589ca7bc7d5763fdc0ae11b16f4225c8a7
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitStatus.tsx
    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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) ui fixes to review admin page and react editor


  Commit: 7ee5196fe325cb069030048e3f93573e765aac74
      https://github.com/zanata/zanata-platform/commit/7ee5196fe325cb069030048e3f93573e765aac74
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.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/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/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/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) editor: refactor utility classes for text colours, minor styling fixes to react editor


  Commit: 5abb413ad4263fd52383ca0b9ea70e06595aa95b
      https://github.com/zanata/zanata-platform/commit/5abb413ad4263fd52383ca0b9ea70e06595aa95b
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) customise antd card header variables


  Commit: 77b5907d638726f4796e28a49ca3e2c6a2b4e5de
      https://github.com/zanata/zanata-platform/commit/77b5907d638726f4796e28a49ca3e2c6a2b4e5de
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) alignment of admin review criteria page rows


  Commit: 6645b5f90a1c5105b08ac185f903816f59cbf67d
      https://github.com/zanata/zanata-platform/commit/6645b5f90a1c5105b08ac185f903816f59cbf67d
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.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/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
    M server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/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/TransUnitSourcePanel.js

  Log Message:
  -----------
  Revert "refactor(ZNTA-2529) editor: refactor utility classes for text colours, minor styling fixes to react editor"

This reverts commit 7ee5196fe325cb069030048e3f93573e765aac74.


  Commit: d736b0910cb3362fd07e7c493b894530f612c907
      https://github.com/zanata/zanata-platform/commit/d736b0910cb3362fd07e7c493b894530f612c907
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) utility classes and small ui fixes for react editor


  Commit: 437695a5418c5ef3382e30ea9608f99226b9cccb
      https://github.com/zanata/zanata-platform/commit/437695a5418c5ef3382e30ea9608f99226b9cccb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    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/containers/SuggestionsHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) editor ui fixes, remove references to react-bootstrap stories


  Commit: 6328d05141590fecd82fab49db3adda8822295e6
      https://github.com/zanata/zanata-platform/commit/6328d05141590fecd82fab49db3adda8822295e6
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx

  Log Message:
  -----------
  refactor(ZNTA-2529) update test files and stories


  Commit: f0f0b8f985dd7617b9d5095d0330ac426767f1bf
      https://github.com/zanata/zanata-platform/commit/f0f0b8f985dd7617b9d5095d0330ac426767f1bf
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/style.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  refactor(ZNTA-2529) remove react-bootstrap package and update storybook styleguide


  Commit: e4396e338b4eca9a18b8102546d22b305f84f45a
      https://github.com/zanata/zanata-platform/commit/e4396e338b4eca9a18b8102546d22b305f84f45a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.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/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  reactjs: server config (#927)


  Commit: 0a6c2cc85893098635d76322c511ba9338a37a44
      https://github.com/zanata/zanata-platform/commit/0a6c2cc85893098635d76322c511ba9338a37a44
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/foundation.story.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/index.less
    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/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  refactor(ZNTA-2529) misc css fixes for frontend


  Commit: 32955cb1f58fd6aa6f96db5267ab0fa6856c4036
      https://github.com/zanata/zanata-platform/commit/32955cb1f58fd6aa6f96db5267ab0fa6856c4036
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/messages/ja.json

  Log Message:
  -----------
  feat(ZNTA-2078): translation permalinks in alpha editor (#943)

* feat(ZNTA-2078): translation permalinks in alpha editor

* refactor: extract link builder function


  Commit: b41abb5ca754cfef4baa452c31c6b2ed3b8b6343
      https://github.com/zanata/zanata-platform/commit/b41abb5ca754cfef4baa452c31c6b2ed3b8b6343
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.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/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

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


  Commit: c915546facef1ef829288acb0c91e83cb751bd1c
      https://github.com/zanata/zanata-platform/commit/c915546facef1ef829288acb0c91e83cb751bd1c
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.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/styles/antd.less
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: 6ab3543cd12baaab42c5f6bde57e04b91a2a9f02
      https://github.com/zanata/zanata-platform/commit/6ab3543cd12baaab42c5f6bde57e04b91a2a9f02
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    A server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update tests


  Commit: 8798239750ecf556397b866cdbb07dd00fe6230d
      https://github.com/zanata/zanata-platform/commit/8798239750ecf556397b866cdbb07dd00fe6230d
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) update tests


  Commit: 37b476ae9251ce749ddad9653619d534b79d824a
      https://github.com/zanata/zanata-platform/commit/37b476ae9251ce749ddad9653619d534b79d824a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Button/Button.story.js

  Log Message:
  -----------
  refactor(ZNTA-2529) add button story back to frontend [antd]


  Commit: 1ce1b0f9c8245f3da39531d6f58bc5b7e711dfac
      https://github.com/zanata/zanata-platform/commit/1ce1b0f9c8245f3da39531d6f58bc5b7e711dfac
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing tests, add Button back to frontend storybook


  Commit: 20f211c7d8af0ce396218b150e5f42c17b8b52b4
      https://github.com/zanata/zanata-platform/commit/20f211c7d8af0ce396218b150e5f42c17b8b52b4
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix codecov issues


  Commit: a9a540c6fe2695f0fac521ab1f6ebfa3b3eb4263
      https://github.com/zanata/zanata-platform/commit/a9a540c6fe2695f0fac521ab1f6ebfa3b3eb4263
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) styling for antd danger buttons


  Commit: ff2cafd13ec10ec8f13031f57884d3433cd62eb4
      https://github.com/zanata/zanata-platform/commit/ff2cafd13ec10ec8f13031f57884d3433cd62eb4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/services/src/main/java/org/zanata/ZanataInit.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  ZNTA-2504 able to query from MT service


  Commit: 8198db2957d35ef4262ee1f749483a48038320d5
      https://github.com/zanata/zanata-platform/commit/8198db2957d35ef4262ee1f749483a48038320d5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/security/CheckRoleDecisionVoter.java

  Log Message:
  -----------
  ZNTA-2631 - Check role will allow admin to bypass


  Commit: f2bb667a703f1e888e461030a4a860595c4c8f7b
      https://github.com/zanata/zanata-platform/commit/f2bb667a703f1e888e461030a4a860595c4c8f7b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java

  Log Message:
  -----------
  ZNTA-2504 REST api for bulk translation via MT


  Commit: 850ade1edd62d28791b8ff1575478a483adfc0a8
      https://github.com/zanata/zanata-platform/commit/850ade1edd62d28791b8ff1575478a483adfc0a8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java

  Log Message:
  -----------
  fix static analysis warning


  Commit: 6d4999b2170dc576d1a842435d6c4d0775d5359f
      https://github.com/zanata/zanata-platform/commit/6d4999b2170dc576d1a842435d6c4d0775d5359f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  fix deployment and test


  Commit: de7777cc2e02f222cf61cf635e61403ce6b46a32
      https://github.com/zanata/zanata-platform/commit/de7777cc2e02f222cf61cf635e61403ce6b46a32
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  ZNTA-2504 use dto as payload to configure MT prefill


  Commit: 6e86ca922e5783ebaba0c6438833aafb81e0a4bf
      https://github.com/zanata/zanata-platform/commit/6e86ca922e5783ebaba0c6438833aafb81e0a4bf
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java

  Log Message:
  -----------
  ZNTA-2504 return 503 when MT is not configured


  Commit: 2525f01b1d8b256596e19f5d805fe44ab50bce69
      https://github.com/zanata/zanata-platform/commit/2525f01b1d8b256596e19f5d805fe44ab50bce69
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/security/CheckRoleDecisionVoter.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  ZNTA-2504 - refactoring


  Commit: ec8f1c147eba4b1a26f0a62da571afe15034958b
      https://github.com/zanata/zanata-platform/commit/ec8f1c147eba4b1a26f0a62da571afe15034958b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  ZNTA-2504 - minor update


  Commit: dec76d7c7ac7f3d70fb393d31dc74e24f9f493b3
      https://github.com/zanata/zanata-platform/commit/dec76d7c7ac7f3d70fb393d31dc74e24f9f493b3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  ZNTA-2504 add test


  Commit: d83c69e2e0b93739564318b1dffe32f93b96642a
      https://github.com/zanata/zanata-platform/commit/d83c69e2e0b93739564318b1dffe32f93b96642a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/pom.xml
    M server/services/pom.xml

  Log Message:
  -----------
  fix enforcer rule - update dep versoin


  Commit: 88ead79d88f2f716f02008a58ad96dc0c0d0d824
      https://github.com/zanata/zanata-platform/commit/88ead79d88f2f716f02008a58ad96dc0c0d0d824
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/pom.xml

  Log Message:
  -----------
  fix duplicate-finder error


  Commit: 2c1fa231f9758d9ff893627f063502a7b2a05aa6
      https://github.com/zanata/zanata-platform/commit/2c1fa231f9758d9ff893627f063502a7b2a05aa6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java

  Log Message:
  -----------
  ZNTA-2504 - fix test and update javadoc


  Commit: 2c37655e4c2d6e75e2f602421b5729d43d926b90
      https://github.com/zanata/zanata-platform/commit/2c37655e4c2d6e75e2f602421b5729d43d926b90
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Convert MTMerge UI to TSX, modularise, add types


  Commit: b6a7997572249b33dce8c22b0f5908f0f5067dc5
      https://github.com/zanata/zanata-platform/commit/b6a7997572249b33dce8c22b0f5908f0f5067dc5
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) heading styling


  Commit: 70328ece39d42cd331c7eed620bcaf5d2ac2176e
      https://github.com/zanata/zanata-platform/commit/70328ece39d42cd331c7eed620bcaf5d2ac2176e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) wideView container padding


  Commit: f44180484fa211ab1e3e4f89acd56e8b5885440f
      https://github.com/zanata/zanata-platform/commit/f44180484fa211ab1e3e4f89acd56e8b5885440f
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update editor snapshot tests and languages heading


  Commit: 01efa26de084ca3d8bfaf1d6c136447e841150f8
      https://github.com/zanata/zanata-platform/commit/01efa26de084ca3d8bfaf1d6c136447e841150f8
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) implement spacing variables into frontend


  Commit: 4e843b29f0fadf3198e7bd3948f37b6d18fab63c
      https://github.com/zanata/zanata-platform/commit/4e843b29f0fadf3198e7bd3948f37b6d18fab63c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Refactor MT code; use doc's locale; check backendId


  Commit: a282b038972b73d8fa06f88dab3aaba0eab49a23
      https://github.com/zanata/zanata-platform/commit/a282b038972b73d8fa06f88dab3aaba0eab49a23
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: tidy up antd.less


  Commit: 2763716d6adc6b22bcdca16896b34ccbe5998b1e
      https://github.com/zanata/zanata-platform/commit/2763716d6adc6b22bcdca16896b34ccbe5998b1e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) antd.less formatting


  Commit: 6fc1a44e1cd87ac9e56715176c3c7b3a86ea97aa
      https://github.com/zanata/zanata-platform/commit/6fc1a44e1cd87ac9e56715176c3c7b3a86ea97aa
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) use antd variables for LogoLoader


  Commit: 608f90779dccaf75eeb7d7ae2423105a3eba9de2
      https://github.com/zanata/zanata-platform/commit/608f90779dccaf75eeb7d7ae2423105a3eba9de2
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-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/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

  Log Message:
  -----------
  feat(ZNTA-2635): editor validators error behavior (#924)

* feat: editor behavior on validation errors detected

* feat: track validation error detections for transunits,
display error notification icon in status area, hide validation messages panel when not selected

* refactor: retrieve phrases errors status from redux store

* test: update jest tests, snapshots

* fix: unstage vscode settings

* refactor: remove unneeded let

* fix: typescript errors

* chore: fix typescript strict warnings

* feat: use modal to confirm saving with validation errors

* fix: typescript strict checks, tests

* refactor: save with validation errors modal to SFC component

* refactor: remove Errors detected message

* fix: typo, clarify move to next row logic


  Commit: 01043dc3f6fab2c208825832a635f69ff97520e3
      https://github.com/zanata/zanata-platform/commit/01043dc3f6fab2c208825832a635f69ff97520e3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) use antd variables for all frontend components


  Commit: 591b7444fc697460c509387ba7345bb3bc1a417c
      https://github.com/zanata/zanata-platform/commit/591b7444fc697460c509387ba7345bb3bc1a417c
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-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/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

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


  Commit: e0416147d391e77d3cdb1f09dd667de8ae17166f
      https://github.com/zanata/zanata-platform/commit/e0416147d391e77d3cdb1f09dd667de8ae17166f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Handle plurals


  Commit: 596c976254667fe0a61e87d22df0e7dbda2bdc11
      https://github.com/zanata/zanata-platform/commit/596c976254667fe0a61e87d22df0e7dbda2bdc11
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java

  Log Message:
  -----------
  Split role into two: mt-suggestion, mt-bulk


  Commit: 52f9190407470036e1473c5e83e93e9061b39a88
      https://github.com/zanata/zanata-platform/commit/52f9190407470036e1473c5e83e93e9061b39a88
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove duplicate import statements for antd css, styling for antd layout


  Commit: 6e499f409e768827432c84d4017802958504cb3a
      https://github.com/zanata/zanata-platform/commit/6e499f409e768827432c84d4017802958504cb3a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) WIP: final bugfixes to frontend after react-bootstrap removal


  Commit: 5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
      https://github.com/zanata/zanata-platform/commit/5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-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/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
      https://github.com/zanata/zanata-platform/commit/cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

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

  Log Message:
  -----------
  fix: dom hierarchy no div within p


  Commit: bb99ebc98fdebcb671f819236a951863a16b1d55
      https://github.com/zanata/zanata-platform/commit/bb99ebc98fdebcb671f819236a951863a16b1d55
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) replace broken antd variables file


  Commit: a78f24c566e70b20b99c42d81d961402a3162769
      https://github.com/zanata/zanata-platform/commit/a78f24c566e70b20b99c42d81d961402a3162769
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/index.less
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix build errors (rename antd variable imports)


  Commit: 2fa27f8acadbd37dbd2f96b065dec81865486701
      https://github.com/zanata/zanata-platform/commit/2fa27f8acadbd37dbd2f96b065dec81865486701
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  WIP: get antd custom variables working


  Commit: cff27e5de1a4ba9a4030db721bf2eeb6c4564f94
      https://github.com/zanata/zanata-platform/commit/cff27e5de1a4ba9a4030db721bf2eeb6c4564f94
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx

  Log Message:
  -----------
  feat: add dropdown option to open MT Merge Modal, fix ternary


  Commit: b3b40f4ef5465a860e1d13ec0c6c2d760d68e0b9
      https://github.com/zanata/zanata-platform/commit/b3b40f4ef5465a860e1d13ec0c6c2d760d68e0b9
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  refactor(ZNTA-2529) remove references to prop parentClassName


  Commit: 837ca610984e0a32d387624e36bdd62045fc2806
      https://github.com/zanata/zanata-platform/commit/837ca610984e0a32d387624e36bdd62045fc2806
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js

  Log Message:
  -----------
  refactor(ZNTA-2529) refactor variables in Explore and Admin containers to use antd variables, remove unused css in those files, and fix icon styling in Glossary Entry Modal


  Commit: a03c8eb69c9b5671cf4806408636dff5ee969ad2
      https://github.com/zanata/zanata-platform/commit/a03c8eb69c9b5671cf4806408636dff5ee969ad2
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) fix linting error


  Commit: 6e234e6c71b37d264faf0b2726472654955bee94
      https://github.com/zanata/zanata-platform/commit/6e234e6c71b37d264faf0b2726472654955bee94
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/Entry.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/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  refactor(ZNTA-2529) a heap of refactoring and bugfixes for frontend


  Commit: a3b0b8efd3a5a397a6df3c78ba5fb75bee496f54
      https://github.com/zanata/zanata-platform/commit/a3b0b8efd3a5a397a6df3c78ba5fb75bee496f54
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/styles/antdvars.less
    M server/zanata-frontend/src/app/styles/style.less

  Log Message:
  -----------
  refactor(ZNTA-2529) remove the last of the react-bootstrap variables from frontend and the related import statement


  Commit: 2c20911229f3e64db390d5a807cc44516b81e05f
      https://github.com/zanata/zanata-platform/commit/2c20911229f3e64db390d5a807cc44516b81e05f
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) delete variables.less (react-bootstrap variables file)


  Commit: 81baa3b4bf82b694d250cc5677d66a2bf0357e4e
      https://github.com/zanata/zanata-platform/commit/81baa3b4bf82b694d250cc5677d66a2bf0357e4e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) rename variables file imported into languages less file


  Commit: 226f7141455b6c67eeab8771a4a3a7b2a906856f
      https://github.com/zanata/zanata-platform/commit/226f7141455b6c67eeab8771a4a3a7b2a906856f
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    A server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update variables imports for frontend-nav and frontend-jsf css


  Commit: 1d5b15d5473c133afcd554a92a730fc7bf2f76af
      https://github.com/zanata/zanata-platform/commit/1d5b15d5473c133afcd554a92a730fc7bf2f76af
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/styles/variables.less

  Log Message:
  -----------
  refactor(ZNTA-2529) delete variables.less after restore


  Commit: bd262dfbfa80a7122530e07d25829fb2a4739bdb
      https://github.com/zanata/zanata-platform/commit/bd262dfbfa80a7122530e07d25829fb2a4739bdb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) fix build errors, add bstrap4 media queries used by antd


  Commit: 2c69e99ba90c41c985b2530d997b1952241813eb
      https://github.com/zanata/zanata-platform/commit/2c69e99ba90c41c985b2530d997b1952241813eb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less

  Log Message:
  -----------
  refactor(ZNTA-2529) user profile styling fixes


  Commit: 68a48933b30af04fd873c073581ddf3f9880103c
      https://github.com/zanata/zanata-platform/commit/68a48933b30af04fd873c073581ddf3f9880103c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    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/styles/antd.less
    M server/zanata-frontend/src/app/styles/antdvars.less

  Log Message:
  -----------
  refactor(ZNTA-2529) misc. ui fixes to frontend


  Commit: 86e7cd9576dbcd9a849c17e9a50ec1cc79bdb9ba
      https://github.com/zanata/zanata-platform/commit/86e7cd9576dbcd9a849c17e9a50ec1cc79bdb9ba
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui fixes, remove antd import from webpack


  Commit: 12fea9064e6af985f7af7de42f67c591aa758de4
      https://github.com/zanata/zanata-platform/commit/12fea9064e6af985f7af7de42f67c591aa758de4
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) styling for date selection field on user profile


  Commit: 9093f4fa696e719d3b9e66a6a3c35aef43fefbf9
      https://github.com/zanata/zanata-platform/commit/9093f4fa696e719d3b9e66a6a3c35aef43fefbf9
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix: antd_1 is not defined, import syntax


  Commit: e8d437c2db7e50a72e98125ee682da3ab0af9d1a
      https://github.com/zanata/zanata-platform/commit/e8d437c2db7e50a72e98125ee682da3ab0af9d1a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js

  Log Message:
  -----------
  refactor(ZNTA-2529) editor button hover styling, minor style fixes to editor


  Commit: ad1cbd43e47ed2329bae3d74f7627e9204460d6b
      https://github.com/zanata/zanata-platform/commit/ad1cbd43e47ed2329bae3d74f7627e9204460d6b
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts

  Log Message:
  -----------
  feat: modal onCancel to trigger toggleMTMergeModal action


  Commit: 90307bdada96bdd2fa56ecc994c5a38a34e594b5
      https://github.com/zanata/zanata-platform/commit/90307bdada96bdd2fa56ecc994c5a38a34e594b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Add incomplete types for Redux state (#945)

* Add incomplete types for Redux state
* Update eslintrc
* Fix accidental state mutation of state.importFile


  Commit: 5910479655f7fac5aed454edffb28d0e002301e4
      https://github.com/zanata/zanata-platform/commit/5910479655f7fac5aed454edffb28d0e002301e4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js

  Log Message:
  -----------
  Add some state types for editor


  Commit: 207096f54ecda8ab87247236fb8693bef7e2b339
      https://github.com/zanata/zanata-platform/commit/207096f54ecda8ab87247236fb8693bef7e2b339
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Add io-ts and prop-types-ts for Icon


  Commit: 981c061dee63c5c2137fd056606d75b98b049135
      https://github.com/zanata/zanata-platform/commit/981c061dee63c5c2137fd056606d75b98b049135
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts

  Log Message:
  -----------
  Use prop-types-ts for ActivityTab


  Commit: 8f2c4b5cfba4874126f570b46e7fa12fa2bcdb91
      https://github.com/zanata/zanata-platform/commit/8f2c4b5cfba4874126f570b46e7fa12fa2bcdb91
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Explore/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) input background fix


  Commit: bed57a1dea4740f9952c0b1996990e5680cefbcd
      https://github.com/zanata/zanata-platform/commit/bed57a1dea4740f9952c0b1996990e5680cefbcd
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) input background fix


  Commit: 7b821b87b26fb808f6a709d5e81e5cb4b4dc9035
      https://github.com/zanata/zanata-platform/commit/7b821b87b26fb808f6a709d5e81e5cb4b4dc9035
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) date selector input


  Commit: d270f82c7edfae40c72b2211c1af42f095a9efd4
      https://github.com/zanata/zanata-platform/commit/d270f82c7edfae40c72b2211c1af42f095a9efd4
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts

  Log Message:
  -----------
  feat: modal onSubmit to trigger mergeVersionFromMT action with required opts


  Commit: 38921c037f77cbd4063ade93b314b775e60ab449
      https://github.com/zanata/zanata-platform/commit/38921c037f77cbd4063ade93b314b775e60ab449
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-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/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/tslint.json

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into MTMerge-UI


  Commit: e857cf48bc96283248ed625eb013db707656ff70
      https://github.com/zanata/zanata-platform/commit/e857cf48bc96283248ed625eb013db707656ff70
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    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/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx

  Log Message:
  -----------
  chore: update storyshots, disable multiple locale story


  Commit: 8a4addc0a129e548be07b7aade9766d52b316582
      https://github.com/zanata/zanata-platform/commit/8a4addc0a129e548be07b7aade9766d52b316582
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui changes to Glossary entry modal and page count select


  Commit: 222627b9b535731fd3ce65f52ef71ae9b6ff0593
      https://github.com/zanata/zanata-platform/commit/222627b9b535731fd3ce65f52ef71ae9b6ff0593
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Glossary/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor ui changes to Glossary page count select


  Commit: 98fc9c263a1047799eb22edf5bff36f4e74abe64
      https://github.com/zanata/zanata-platform/commit/98fc9c263a1047799eb22edf5bff36f4e74abe64
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  Refactor HTextFlow

Avoid changing natural ID after construction.
Avoid updateWordCount() when JPA calls setDocument().


  Commit: 147b7d1870d5d855558e152cecedc316c103b79b
      https://github.com/zanata/zanata-platform/commit/147b7d1870d5d855558e152cecedc316c103b79b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java

  Log Message:
  -----------
  Add option to overwrite fuzzy translations with MT


  Commit: bf85399626829342e45bd5e418997bfff2c04516
      https://github.com/zanata/zanata-platform/commit/bf85399626829342e45bd5e418997bfff2c04516
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: set up MTMerge api reqest, handle failure notification


  Commit: d7e02566043dcae6735419a83189de5d9c0f7fff
      https://github.com/zanata/zanata-platform/commit/d7e02566043dcae6735419a83189de5d9c0f7fff
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    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-editor/storyshots-util.js
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx

  Log Message:
  -----------
  Use React.Fragment


  Commit: e436b03a8adadeddb1679fef510a248082702cf9
      https://github.com/zanata/zanata-platform/commit/e436b03a8adadeddb1679fef510a248082702cf9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    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-editor/storyshots-util.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/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js

  Log Message:
  -----------
  Use React.Fragment more


  Commit: 8119305c4f95f7f3247fc689849d4688a1af5f78
      https://github.com/zanata/zanata-platform/commit/8119305c4f95f7f3247fc689849d4688a1af5f78
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js

  Log Message:
  -----------
  Use <React.Fragment> in JS (<> requires eslint 5)


  Commit: f8a23c6d08980434f06f9581d3088195730dedcf
      https://github.com/zanata/zanata-platform/commit/f8a23c6d08980434f06f9581d3088195730dedcf
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) update LoaderText so it is centered and remove p class


  Commit: 8bae8ce949ebb0b3919ceda269b46e2de1b9dac3
      https://github.com/zanata/zanata-platform/commit/8bae8ce949ebb0b3919ceda269b46e2de1b9dac3
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) update frontend and editor snapshot tests


  Commit: c530402c11bb00cbddc9ce5862d7bbb4c5beae43
      https://github.com/zanata/zanata-platform/commit/c530402c11bb00cbddc9ce5862d7bbb4c5beae43
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/tslint.json

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


  Commit: d4d04aff21e7231bed4f9eed1ae5c5435a2dce68
      https://github.com/zanata/zanata-platform/commit/d4d04aff21e7231bed4f9eed1ae5c5435a2dce68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #947 from zanata/types-for-editor-state

Add types for editor state


  Commit: 25e26794c29cb698e3d118b942f5678f758d65d0
      https://github.com/zanata/zanata-platform/commit/25e26794c29cb698e3d118b942f5678f758d65d0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java

  Log Message:
  -----------
  Add public constructor for JAX-RS


  Commit: bf449fbd2d6a782010fea44a6d932d680b2e6a36
      https://github.com/zanata/zanata-platform/commit/bf449fbd2d6a782010fea44a6d932d680b2e6a36
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    M server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js

  Log Message:
  -----------
  Change /process keyId to query param


  Commit: eb866c924ab67d6f15fda35630b2fe9a55d454f4
      https://github.com/zanata/zanata-platform/commit/eb866c924ab67d6f15fda35630b2fe9a55d454f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Improve messages and check for empty document


  Commit: ad6c25b5d450365b03f524a381831137162002bd
      https://github.com/zanata/zanata-platform/commit/ad6c25b5d450365b03f524a381831137162002bd
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/yarn.lock

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


  Commit: 159f4319fae772da9b1d3a77ba38c37797135507
      https://github.com/zanata/zanata-platform/commit/159f4319fae772da9b1d3a77ba38c37797135507
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
    M server/zanata-frontend/src/app/containers/Glossary/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

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


  Commit: e94268ba057e515b145822a151c11e29053c5286
      https://github.com/zanata/zanata-platform/commit/e94268ba057e515b145822a151c11e29053c5286
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  fix: update phrase status on conflict resolution save


  Commit: f1e59fc505a8c1c33764e629bec3bc893ffa68e5
      https://github.com/zanata/zanata-platform/commit/f1e59fc505a8c1c33764e629bec3bc893ffa68e5
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.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/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/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  refactor: specify duration for all notifications


  Commit: dca011345d21a76f9dd3bb22f735c8f900f4a58b
      https://github.com/zanata/zanata-platform/commit/dca011345d21a76f9dd3bb22f735c8f900f4a58b
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/UserProfile/index.less

  Log Message:
  -----------
  refactor(ZNTA-2529) minor styling fixes to user profile


  Commit: d03d62cd4786801d69619fa39e193488d246c64a
      https://github.com/zanata/zanata-platform/commit/d03d62cd4786801d69619fa39e193488d246c64a
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js

  Log Message:
  -----------
  feat: close concurrent edit notification on save as latest/original


  Commit: a1262ada1d0569abbf909b23fa2016db588db725
      https://github.com/zanata/zanata-platform/commit/a1262ada1d0569abbf909b23fa2016db588db725
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: 6fdde184578a12379993f915d10ed8f09958fecc
      https://github.com/zanata/zanata-platform/commit/6fdde184578a12379993f915d10ed8f09958fecc
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  refactor(ZNTA-2529) revert change that centers all loader content breaking glossary delete buttons


  Commit: d4aab23ab3c7758e3e2ad2be83340e74a68b4826
      https://github.com/zanata/zanata-platform/commit/d4aab23ab3c7758e3e2ad2be83340e74a68b4826
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js

  Log Message:
  -----------
  fix: duplicate type, project version reducer tests


  Commit: c892bfef65d0a033ee2c1898572da47997ff01a1
      https://github.com/zanata/zanata-platform/commit/c892bfef65d0a033ee2c1898572da47997ff01a1
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  Merge branch 'ZNTA-2504-use-mt' of github.com:zanata/zanata-platform into MTMerge-UI


  Commit: 7662b5dbde8d6c914a0e20781b00377b7a3b3ba7
      https://github.com/zanata/zanata-platform/commit/7662b5dbde8d6c914a0e20781b00377b7a3b3ba7
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js

  Log Message:
  -----------
  feat: trigger mt merge start from frontend


  Commit: 298eeb0bdfabb235316f92fb973310ad601dd693
      https://github.com/zanata/zanata-platform/commit/298eeb0bdfabb235316f92fb973310ad601dd693
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  refactor(ZNTA-2529) update failing LanguagesPage test


  Commit: 1c53c96e1d632741dbb152404b431745acfca016
      https://github.com/zanata/zanata-platform/commit/1c53c96e1d632741dbb152404b431745acfca016
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  refactor(ZNTA-2529) update test for Langauges page


  Commit: 5dde59a6ba0270ea915a31cd499bd202210b3ff7
      https://github.com/zanata/zanata-platform/commit/5dde59a6ba0270ea915a31cd499bd202210b3ff7
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.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/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    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/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #939 from zanata/ZNTA-2529

 refactor(ZNTA-2529) remove react-bootstrap css


  Commit: 9d4636a447cbc5df69d7e6fd2513e39830f22fba
      https://github.com/zanata/zanata-platform/commit/9d4636a447cbc5df69d7e6fd2513e39830f22fba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  Require opt-in for admin to use roles like mt-bulk


  Commit: b101ed9e4ea77a2a7510f30bf11ad8908f4a6970
      https://github.com/zanata/zanata-platform/commit/b101ed9e4ea77a2a7510f30bf11ad8908f4a6970
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Return 502 in case of I/O error for MT


  Commit: 21b010a8d9e9603bbe291f3c2eabed1685d862c3
      https://github.com/zanata/zanata-platform/commit/21b010a8d9e9603bbe291f3c2eabed1685d862c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Include MT's error response when MT fails


  Commit: 3bd0b3a5a178eff23286a947ecf0729051ff3a99
      https://github.com/zanata/zanata-platform/commit/3bd0b3a5a178eff23286a947ecf0729051ff3a99
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Avoid logging warning for MT DEV


  Commit: 2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91
      https://github.com/zanata/zanata-platform/commit/2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java

  Log Message:
  -----------
  Use djansen's fix for batch offset bug


  Commit: 61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
      https://github.com/zanata/zanata-platform/commit/61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  style(ZNTA-2537) update storybooks


  Commit: c8762ee6cdd3689dc34dae2c1232615441e8db8d
      https://github.com/zanata/zanata-platform/commit/c8762ee6cdd3689dc34dae2c1232615441e8db8d
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/styles/styleguide.less

  Log Message:
  -----------
  style(ZNTA-2537) fix warnings in LockIcon test, update snapshots


  Commit: 275c60e4fa35122b67bdcd8f01b1937fdf7fe1bf
      https://github.com/zanata/zanata-platform/commit/275c60e4fa35122b67bdcd8f01b1937fdf7fe1bf
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.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/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    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
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into react-fragment


  Commit: 330e9156fb9f7c2d401e5e8bb145e12674482802
      https://github.com/zanata/zanata-platform/commit/330e9156fb9f7c2d401e5e8bb145e12674482802
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: integrate progressbar, query loop to update


  Commit: 8976dc9a8864e7ebba3b80d7d181cd1262945a2a
      https://github.com/zanata/zanata-platform/commit/8976dc9a8864e7ebba3b80d7d181cd1262945a2a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js

  Log Message:
  -----------
  fix: repalce empty divs with React.Fragment


  Commit: d8dbc6530f331be508693100ffa36f5b1daf826c
      https://github.com/zanata/zanata-platform/commit/d8dbc6530f331be508693100ffa36f5b1daf826c
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  feat: modal behavior when merge completed


  Commit: c02910900372ec44674e419826b7eb510d4add58
      https://github.com/zanata/zanata-platform/commit/c02910900372ec44674e419826b7eb510d4add58
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.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/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    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
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into MTMerge-UI


  Commit: 7dcf8043f34d75cf64b8864c756b19a8d0f908a0
      https://github.com/zanata/zanata-platform/commit/7dcf8043f34d75cf64b8864c756b19a8d0f908a0
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/webpack.config.js

  Log Message:
  -----------
  feat: implement cancel mt merge action, notifications on success/failure


  Commit: 169519d89f7982f0aeb0439e069b3f9f544f90de
      https://github.com/zanata/zanata-platform/commit/169519d89f7982f0aeb0439e069b3f9f544f90de
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js

  Log Message:
  -----------
  remove unneccessary fragments


  Commit: 1577c73dbdd77b4ab34d315a3d76f81bf54215d8
      https://github.com/zanata/zanata-platform/commit/1577c73dbdd77b4ab34d315a3d76f81bf54215d8
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js

  Log Message:
  -----------
  remove unneccessary fragments


  Commit: bd7af40e011b71fa98c76b6310e9c5903119a97b
      https://github.com/zanata/zanata-platform/commit/bd7af40e011b71fa98c76b6310e9c5903119a97b
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx

  Log Message:
  -----------
  fix: linting errors


  Commit: ab844b6461fd6b47d448bedc40fbbcad7ca7c6ba
      https://github.com/zanata/zanata-platform/commit/ab844b6461fd6b47d448bedc40fbbcad7ca7c6ba
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js

  Log Message:
  -----------
  fix: failing  tests and snapshots


  Commit: 1f470e9ddbc675fca4e4e3f27269b156c1072cad
      https://github.com/zanata/zanata-platform/commit/1f470e9ddbc675fca4e4e3f27269b156c1072cad
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  remove deprecated package - react-lorem-component, which was used for the editor glossary details modal


  Commit: 8d08866019792cbccda1d4467f9eef9634c74f90
      https://github.com/zanata/zanata-platform/commit/8d08866019792cbccda1d4467f9eef9634c74f90
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  feat: require mt-bulk role to open modal


  Commit: 41dddf53648fb263ce720cd8f5f86b82d5b4efdc
      https://github.com/zanata/zanata-platform/commit/41dddf53648fb263ce720cd8f5f86b82d5b4efdc
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  fix: re-enable TM megre progress query


  Commit: bc652f0319ea8ec2a9b007fca9032ed8989fcf8d
      https://github.com/zanata/zanata-platform/commit/bc652f0319ea8ec2a9b007fca9032ed8989fcf8d
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java

  Log Message:
  -----------
  Merge commit '2c0bb3aa5dfb05f3d725faee2e8748c92e9c1a91' into MTMerge-UI


  Commit: 0599b7db110da65f9e60740e108031ed69150bb4
      https://github.com/zanata/zanata-platform/commit/0599b7db110da65f9e60740e108031ed69150bb4
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx

  Log Message:
  -----------
  refactor: use ant select component with search for language select


  Commit: 7a03e60253360be60f1054294c16fec72f2d8648
      https://github.com/zanata/zanata-platform/commit/7a03e60253360be60f1054294c16fec72f2d8648
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

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

  Log Message:
  -----------
  chore: update storyshot


  Commit: 0baf7a6ad5f93727f8545ef7b3ba8731d6abeac3
      https://github.com/zanata/zanata-platform/commit/0baf7a6ad5f93727f8545ef7b3ba8731d6abeac3
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  minor change to get remote branch showing all commits


  Commit: 3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
      https://github.com/zanata/zanata-platform/commit/3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    M server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Notification/component.js
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.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/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300


  Commit: c44760f009c11de396ecaf8c12f0c6c53cb91e7b
      https://github.com/zanata/zanata-platform/commit/c44760f009c11de396ecaf8c12f0c6c53cb91e7b
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

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

  Log Message:
  -----------
  update editor snapshot test


  Commit: f4af1a7299bc6bd6e19fb68353a729aec22a2f24
      https://github.com/zanata/zanata-platform/commit/f4af1a7299bc6bd6e19fb68353a729aec22a2f24
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/editor/utils/status-util.ts

  Log Message:
  -----------
  fix: server status converter, sort locales by Id


  Commit: ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
      https://github.com/zanata/zanata-platform/commit/ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/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/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/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/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  Merge pull request #911 from zanata/editor-concurrent-save/ZNTA-2300

feat(ZNTA-2300): editor concurrent save resolution


  Commit: aac2a4822b2145182bc67b5a53ec23313d3be0b8
      https://github.com/zanata/zanata-platform/commit/aac2a4822b2145182bc67b5a53ec23313d3be0b8
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/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/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/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/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into MTMerge-UI


  Commit: 9ee2079de33347dc417c71a89947bc1eb52a37c6
      https://github.com/zanata/zanata-platform/commit/9ee2079de33347dc417c71a89947bc1eb52a37c6
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #952 from zanata/ZNTA-2537

style(ZNTA-2537) update storybooks and tests


  Commit: 2b9de285e125ad62815e1face7d2561779876a1a
      https://github.com/zanata/zanata-platform/commit/2b9de285e125ad62815e1face7d2561779876a1a
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
    M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/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/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/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/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix merge conflicts


  Commit: 87046e758318599f04517eb90dde7997fe8dee1c
      https://github.com/zanata/zanata-platform/commit/87046e758318599f04517eb90dde7997fe8dee1c
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js

  Log Message:
  -----------
  remove React.Fragment from ProjectVersion People page


  Commit: a2eca5f35ab91f033cd7e47d91e97fa488d15b80
      https://github.com/zanata/zanata-platform/commit/a2eca5f35ab91f033cd7e47d91e97fa488d15b80
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/app/actions/version-actions.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java

  Log Message:
  -----------
  feat(ZNTA-2487) use MT to prefill translations (#926)

* ZNTA-2504 able to query from MT service

* ZNTA-2631 - Check role will allow admin to bypass

* ZNTA-2504 REST api for bulk translation via MT

* fix static analysis warning

* fix deployment and test

* ZNTA-2504 use dto as payload to configure MT prefill

* ZNTA-2504 return 503 when MT is not configured

* ZNTA-2504 - refactoring

* ZNTA-2504 - minor update

* ZNTA-2504 add test

* fix enforcer rule - update dep versoin

* fix duplicate-finder error

* ZNTA-2504 - fix test and update javadoc

* Refactor MT code; use doc's locale; check backendId

* Handle plurals

* Split role into two: mt-suggestion, mt-bulk

* Refactor HTextFlow

Avoid changing natural ID after construction.
Avoid updateWordCount() when JPA calls setDocument().

* Add option to overwrite fuzzy translations with MT

* Add public constructor for JAX-RS

* Change /process keyId to query param

* Improve messages and check for empty document

* Require opt-in for admin to use roles like mt-bulk

* Return 502 in case of I/O error for MT

* Include MT's error response when MT fails

* Avoid logging warning for MT DEV

* Use djansen's fix for batch offset bug


  Commit: 2adad5e2a6beeae710f5199aaba586098bffd499
      https://github.com/zanata/zanata-platform/commit/2adad5e2a6beeae710f5199aaba586098bffd499
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata-platform into MTMerge-UI


  Commit: cfc9b3cdd36769a2a64a603b71fbdec88524bb9e
      https://github.com/zanata/zanata-platform/commit/cfc9b3cdd36769a2a64a603b71fbdec88524bb9e
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

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

  Log Message:
  -----------
  refactor(ZNTA-2529) change colour of suggestions heading in editor


  Commit: cfe9aea99b9191bcffa48ffec7ddadced04e15ed
      https://github.com/zanata/zanata-platform/commit/cfe9aea99b9191bcffa48ffec7ddadced04e15ed
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/services/src/main/resources/messages.properties
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #944 from zanata/MTMerge-UI

feat(ZNTA-2504) Finish MT Merge UI


  Commit: 36a1e99ec3281841d49b793b83c3c61a2db90664
      https://github.com/zanata/zanata-platform/commit/36a1e99ec3281841d49b793b83c3c61a2db90664
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    M .editorconfig
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/components.story.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/jsf/index.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
    M server/zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  fix merge conflicts


  Commit: f1367325025ecb2e330dd87d9f0626d0d96d4936
      https://github.com/zanata/zanata-platform/commit/f1367325025ecb2e330dd87d9f0626d0d96d4936
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

  Changed paths:
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js

  Log Message:
  -----------
  fix merge conflicts correctly by removing outdated and now removed file


  Commit: ef3b1eff60fa3fc65d91b0c6c0e194b6d7c4a7b0
      https://github.com/zanata/zanata-platform/commit/ef3b1eff60fa3fc65d91b0c6c0e194b6d7c4a7b0
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-17 (Tue, 17 Jul 2018)

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

  Log Message:
  -----------
  update snapshot tests


  Commit: 812dad8d477d7746e7d826f2e98bdab43bd46393
      https://github.com/zanata/zanata-platform/commit/812dad8d477d7746e7d826f2e98bdab43bd46393
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M .editorconfig
    M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
    M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M docs/release-notes.md
    M parent/pom.xml
    M server/docker/Dockerfile
    M server/etc/scripts/configure-app-server.js
    M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
    A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
    A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
    M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
    R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
    M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
    M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M server/pom.xml
    M server/services/pom.xml
    M server/services/src/main/java/org/zanata/ZanataInit.java
    M server/services/src/main/java/org/zanata/action/DashboardAction.java
    M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
    M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
    M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
    M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/services/src/main/java/org/zanata/action/VersionHome.java
    M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
    M server/services/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A server/services/src/main/java/org/zanata/async/handle/MachineTranslationPrefillTaskHandle.java
    M server/services/src/main/java/org/zanata/async/handle/TransMemoryMergeTaskHandle.java
    A server/services/src/main/java/org/zanata/config/MTServiceToken.java
    A server/services/src/main/java/org/zanata/config/MTServiceURL.java
    A server/services/src/main/java/org/zanata/config/MTServiceUser.java
    M server/services/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M server/services/src/main/java/org/zanata/dao/AccountDAO.java
    A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
    A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransMemoryMergeManager.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A server/services/src/main/java/org/zanata/rest/service/ActiveProjectVersionAndLocaleValidator.java
    M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
    A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationResource.java
    A server/services/src/main/java/org/zanata/rest/service/MachineTranslationsManager.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
    A server/services/src/main/java/org/zanata/service/GraphQLService.java
    A server/services/src/main/java/org/zanata/service/MachineTranslationService.java
    M server/services/src/main/java/org/zanata/service/ProjectService.java
    M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
    A server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
    A server/services/src/main/java/org/zanata/service/mt/dto/APIResponse.java
    A server/services/src/main/java/org/zanata/service/mt/dto/MTDocument.java
    A server/services/src/main/java/org/zanata/service/mt/dto/TypeString.java
    A server/services/src/main/java/org/zanata/service/mt/dto/package-info.java
    M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M server/services/src/main/java/org/zanata/ui/FilterUtil.java
    M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M server/services/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/services/src/main/java/org/zanata/util/QueryBuilder.java
    A server/services/src/main/java/org/zanata/util/json.kt
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/services/src/main/resources/messages.properties
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
    M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
    A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
    M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    M server/services/src/test/java/org/zanata/rest/editor/service/TransMemoryMergeManagerTest.java
    M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
    A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
    A server/services/src/test/java/org/zanata/rest/service/MachineTranslationResourceTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
    A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
    M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
    M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A server/services/src/test/java/org/zanata/test/Descriptions.java
    M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
    M server/zanata-frontend/src/.eslintrc
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/.storybook-editor/addons.js
    M server/zanata-frontend/src/.storybook-editor/config.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
    M server/zanata-frontend/src/.storybook-editor/storyshots-util.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
    A server/zanata-frontend/src/app/actions/admin-actions.ts
    M server/zanata-frontend/src/app/actions/common-actions.ts
    M server/zanata-frontend/src/app/actions/explore-actions.js
    M server/zanata-frontend/src/app/actions/glossary-actions.js
    M server/zanata-frontend/src/app/actions/languages-actions.js
    M server/zanata-frontend/src/app/actions/profile-actions.js
    M server/zanata-frontend/src/app/actions/review-actions.ts
    M server/zanata-frontend/src/app/actions/tmx-actions.js
    M server/zanata-frontend/src/app/actions/version-action-types.js
    M server/zanata-frontend/src/app/actions/version-actions.js
    R server/zanata-frontend/src/app/components/Alert/Alert.story.js
    R server/zanata-frontend/src/app/components/Badge/Badge.story.js
    R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
    R server/zanata-frontend/src/app/components/Button/Button.story.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
    M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
    M server/zanata-frontend/src/app/components/EditableText/index.js
    R server/zanata-frontend/src/app/components/Form/Form.story.js
    M server/zanata-frontend/src/app/components/Icon/Icon.story.js
    M server/zanata-frontend/src/app/components/Icon/index.tsx
    R server/zanata-frontend/src/app/components/Label/Label.story.js
    M server/zanata-frontend/src/app/components/Link/Link.story.js
    M server/zanata-frontend/src/app/components/Link/index.js
    R server/zanata-frontend/src/app/components/List/List.story.js
    M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
    M server/zanata-frontend/src/app/components/LoaderText/index.js
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/components/LockIcon/index.tsx
    M server/zanata-frontend/src/app/components/LogoLoader/index.less
    A server/zanata-frontend/src/app/components/MTMerge/MTMerge.story.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx
    A server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    R server/zanata-frontend/src/app/components/Modal/Modal.story.js
    M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
    M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
    M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
    M server/zanata-frontend/src/app/components/Modal/index.jsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
    R server/zanata-frontend/src/app/components/Panel/Panel.story.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/app/components/RejectionsForm/index.less
    R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
    R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/Sidebar/index.jsx
    M server/zanata-frontend/src/app/components/Sidebar/index.less
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/components/TMX/index.less
    R server/zanata-frontend/src/app/components/Table/Table.story.js
    R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
    M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
    R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.js
    M server/zanata-frontend/src/app/components/TriCheckbox/index.less
    R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
    R server/zanata-frontend/src/app/components/Well/Well.story.js
    M server/zanata-frontend/src/app/components/components.story.js
    M server/zanata-frontend/src/app/components/foundation.story.js
    M server/zanata-frontend/src/app/components/index.js
    M server/zanata-frontend/src/app/containers/Admin/Review.js
    A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/Admin/index.less
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
    M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
    M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Explore/index.less
    M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
    M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
    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/Header.jsx
    M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.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/Entry.js
    M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
    R server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
    A server/zanata-frontend/src/app/containers/ProjectVersion/MTMergeContainer.ts
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
    M server/zanata-frontend/src/app/containers/Root.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.less
    M server/zanata-frontend/src/app/declarations.d.ts
    M server/zanata-frontend/src/app/editor/actions/key-shortcuts-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/actions/review-trans-actions.js
    M server/zanata-frontend/src/app/editor/api/index.js
    M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
    M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
    M server/zanata-frontend/src/app/editor/components/Button/index.css
    M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
    R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
    A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
    M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
    R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
    A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
    A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.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/IconButtonToggle/IconButtonToggle.test.js
    M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
    M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
    M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
    M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
    M server/zanata-frontend/src/app/editor/components/Pager/index.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
    M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
    M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
    M server/zanata-frontend/src/app/editor/components/Suggestion.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.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/TransUnitTranslationPanel.js
    M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
    M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
    M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
    A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
    M server/zanata-frontend/src/app/editor/components/components.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
    M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/editor/containers/NavHeader.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
    M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
    M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
    M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
    M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
    M server/zanata-frontend/src/app/editor/middlewares/title-update.js
    M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
    R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
    A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
    R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
    M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
    A server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/activity-util.ts
    M server/zanata-frontend/src/app/editor/utils/filter-util.js
    M server/zanata-frontend/src/app/editor/utils/log-todo.js
    M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
    M server/zanata-frontend/src/app/editor/utils/phrase.ts
    M server/zanata-frontend/src/app/editor/utils/status-util.ts
    M server/zanata-frontend/src/app/editor/utils/string-utils.js
    M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/index.js
    M server/zanata-frontend/src/app/editor/watchers/page-number.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/editor/watchers/selected-phrase-searches.js
    M server/zanata-frontend/src/app/editor/watchers/watch.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/jsf/index.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.js
    M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
    M server/zanata-frontend/src/app/reducers/common-reducer.js
    M server/zanata-frontend/src/app/reducers/explore-reducer.js
    M server/zanata-frontend/src/app/reducers/glossary-reducer.js
    R server/zanata-frontend/src/app/reducers/index.js
    A server/zanata-frontend/src/app/reducers/index.ts
    M server/zanata-frontend/src/app/reducers/languages-reducer.js
    M server/zanata-frontend/src/app/reducers/profile-reducer.js
    A server/zanata-frontend/src/app/reducers/state.ts
    M server/zanata-frontend/src/app/reducers/tmx-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/reducers/version-reducer.test.js
    M server/zanata-frontend/src/app/require-all.test.ts
    R server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less
    A server/zanata-frontend/src/app/styles/antdvars.less
    R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
    M server/zanata-frontend/src/app/styles/frontend-jsf.less
    M server/zanata-frontend/src/app/styles/frontend-nav.less
    M server/zanata-frontend/src/app/styles/style.less
    R server/zanata-frontend/src/app/styles/styleguide.css
    A server/zanata-frontend/src/app/styles/styleguide.less
    R server/zanata-frontend/src/app/styles/variables.less
    M server/zanata-frontend/src/app/utils/DateHelper.ts
    A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
    M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
    M server/zanata-frontend/src/app/utils/GlossaryHelper.js
    M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
    A server/zanata-frontend/src/app/utils/TypeName.d.ts
    M server/zanata-frontend/src/app/utils/prop-types-util.ts
    M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationAction.ts
    M server/zanata-frontend/src/app/validators/ValidationMessages.ts
    M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
    M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
    M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
    M server/zanata-frontend/src/app/validators/index.ts
    M server/zanata-frontend/src/index.html
    M server/zanata-frontend/src/jest.config.js
    R server/zanata-frontend/src/jest.config.json
    M server/zanata-frontend/src/messages/ja.json
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/tsconfig.json
    M server/zanata-frontend/src/tslint.json
    M server/zanata-frontend/src/webpack.config.js
    M server/zanata-frontend/src/yarn.lock
    M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.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/HLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
    M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
    R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/model/Request.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
    M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
    A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
    M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
    M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    R server/zanata-war/src/main/webapp/admin/home.xhtml
    R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java

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


  Commit: 89b973086a39848a2aa47a0a20063524d67771e5
      https://github.com/zanata/zanata-platform/commit/89b973086a39848a2aa47a0a20063524d67771e5
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #953 from zanata/ZNTA-2663

refactor(ZNTA-2529) change colour of suggestions heading in editor


  Commit: 1dd0d8fe2a8f720cfafa4c2069cb802faec2cb56
      https://github.com/zanata/zanata-platform/commit/1dd0d8fe2a8f720cfafa4c2069cb802faec2cb56
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    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-editor/storyshots-util.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/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
    M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
    M server/zanata-frontend/src/app/entrypoint/legacy.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

  Log Message:
  -----------
  Merge pull request #948 from zanata/react-fragment

Use React.Fragment


  Commit: 6f1d9d5448592f514190e37c9140477762d22327
      https://github.com/zanata/zanata-platform/commit/6f1d9d5448592f514190e37c9140477762d22327
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    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-editor/storyshots-util.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/DraggableVersionPanels/DraggableVersionPanels.test.js
    M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
    M server/zanata-frontend/src/app/components/Nav/index.jsx
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
    M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
    M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
    M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
    M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
    M server/zanata-frontend/src/app/containers/Admin/index.js
    M server/zanata-frontend/src/app/containers/App.js
    M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
    M server/zanata-frontend/src/app/containers/Explore/index.js
    M server/zanata-frontend/src/app/containers/Glossary/Entry.js
    M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
    M server/zanata-frontend/src/app/containers/Glossary/index.js
    M server/zanata-frontend/src/app/containers/Languages/index.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
    M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
    M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
    M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
    M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
    M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionList.js
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
    M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
    M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
    M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
    M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
    M server/zanata-frontend/src/app/editor/containers/SettingsPanel.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/entrypoint/legacy.js
    M server/zanata-frontend/src/app/styles/antd.less
    M server/zanata-frontend/src/package.json
    M server/zanata-frontend/src/yarn.lock

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


  Commit: c9df947c20c038fa19c11e6b8a804647a8cb4c59
      https://github.com/zanata/zanata-platform/commit/c9df947c20c038fa19c11e6b8a804647a8cb4c59
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/config.js
    M server/zanata-frontend/src/app/editor/app.css
    M server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
    M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js

  Log Message:
  -----------
  feat(ZNTA-2075) upadate SearchReplace story, remove bootstrap wrapper from storybook, remove unnecessary endpoint


  Commit: 07c7f1272fe3f35543e87d579323923d2f1f0749
      https://github.com/zanata/zanata-platform/commit/07c7f1272fe3f35543e87d579323923d2f1f0749
  Author: kgough <kgough at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

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

  Log Message:
  -----------
  feat(ZNTA-2075) update snapshots


Compare: https://github.com/zanata/zanata-platform/compare/b20af980d2ed...07c7f1272fe3
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the zanata-commits mailing list