[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error

GitHub noreply at github.com
Thu Jul 19 04:30:17 UTC 2018 

  Branch: refs/heads/znta-2669-gwt-mt-attribute
  Home:   https://github.com/zanata/zanata-platform
  Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed
      https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

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

  Log Message:
  -----------
  fix: concurrent modal type error


  Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628
      https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

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

  Log Message:
  -----------
  Merge pull request #958 from zanata/fix-conflict-typeerror

fix: concurrent modal type error


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

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

  Log Message:
  -----------
  Fix attribution for DEV mode MT (#959)


  Commit: 552ad145fcf5eb2dd781f76bc949bb594bd62a36
      https://github.com/zanata/zanata-platform/commit/552ad145fcf5eb2dd781f76bc949bb594bd62a36
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    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/app/components/MTMerge/MTMergeModal.tsx

  Log Message:
  -----------
  feat(ZNTA-2664): Improve UI for MT merge (#956)

* feat(ZNTA-2664): Improve UI for MT merge

* chore: update snapshots


  Commit: 75f762588bd4c089c9256b7753d2d12e772a0d51
      https://github.com/zanata/zanata-platform/commit/75f762588bd4c089c9256b7753d2d12e772a0d51
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2018-07-19 (Thu, 19 Jul 2018)

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

  Log Message:
  -----------
  fix(string): Successfuly fix a typo (#961)


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

  Changed paths:
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  style: add alerts and additional styling to MT Merge modal


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

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

  Log Message:
  -----------
  style: fix typo in  MT Merge moda cssl


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

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

  Log Message:
  -----------
  style: fix typo in  MT Merge modal css


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

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

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


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

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

  Log Message:
  -----------
  fix colour of language codes in MT Merge dropdown


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

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    A server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TransSourceIndicator.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M server/gwt-editor/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/GetTransUnitActionContext.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/search/FilterConstraints.java
    M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/ui/UserConfigHolder.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/EditorTextFlowTarget.java
    A server/services/src/main/java/org/zanata/rest/editor/dto/EditorTranslationStatistics.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/SuggestionDetail.java
    M server/services/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.java
    M server/services/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.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/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/TransUnitTransformer.java
    M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
    M server/services/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M server/services/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
    M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
    M server/zanata-frontend/src/app/editor/api/suggestions.js
    M server/zanata-frontend/src/app/editor/app.css
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/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/Suggestion.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/SuggestionSources/SuggestionSources.test.js
    M server/zanata-frontend/src/app/editor/components/SuggestionSources/index.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
    M server/zanata-frontend/src/app/editor/components/SuggestionTranslations.js
    M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/TransSourceTypeIndicator.story.js
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.css
    A server/zanata-frontend/src/app/editor/components/TransSourceTypeIndicator/index.tsx
    M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
    M server/zanata-frontend/src/app/editor/components/TransUnitStatus.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/SuggestionDetailsModal/index.js
    M server/zanata-frontend/src/app/editor/entrypoint/index.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
    M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.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/filter-status-reducer.test.js
    M server/zanata-frontend/src/app/editor/reducers/state.ts
    M server/zanata-frontend/src/app/editor/selectors/index.js
    M server/zanata-frontend/src/app/editor/utils/Util.js
    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/suggestion-util.js
    M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
    M server/zanata-model-test/src/main/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  feat: MT filter and indicator in editor (#951)

* feat: GWT MT filter and indicator

* feat: MT indicator in react editor: TM & history

* refactor: review suggestions

* fix: move hard coded 'MT, Google' to TextFlowSuggestionDetail

* style: Machine Translation status identifier

* fix: new contructor for additional field

* fix: tm detail link for mt icon

* fix: save as rejected error

* style: remove unintended stlying of TransUnit-metaDataErrors


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

  Changed paths:
    M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge pull request #963 from zanata/mt-text

style: add alerts and additional styling to MT Merge modal


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

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
    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/app/components/MTMerge/MTMergeModal.tsx
    M server/zanata-frontend/src/app/components/MTMerge/MTMergeOptions.tsx
    M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
    M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
    M server/zanata-frontend/src/app/editor/containers/MainContent.js
    M server/zanata-frontend/src/app/reducers/version-reducer.js
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  Merge branch 'master' into znta-2669-gwt-mt-attribute


Compare: https://github.com/zanata/zanata-platform/compare/75638a87eab1...4e4a85d0e770
      **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