[zanata/zanata-platform] b3318b: feat(ZNTA-2075) first commit: files created for ed...
GitHub
noreply at github.com
Thu Jul 19 23:54:05 UTC 2018
Branch: refs/heads/ZNTA-2526
Home: https://github.com/zanata/zanata-platform
Commit: b3318b89dce352cb103bffa43c759e90cd0bac54
https://github.com/zanata/zanata-platform/commit/b3318b89dce352cb103bffa43c759e90cd0bac54
Author: kgough <kgough at redhat.com>
Date: 2018-06-21 (Thu, 21 Jun 2018)
Changed paths:
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
A server/zanata-frontend/src/app/editor/components/SearchReplace/searchreplace.story.js
Log Message:
-----------
feat(ZNTA-2075) first commit: files created for editor search and replace
Commit: dd1ab2ef97694a67966dd680609e4d0f9d48ff84
https://github.com/zanata/zanata-platform/commit/dd1ab2ef97694a67966dd680609e4d0f9d48ff84
Author: kgough <kgough at redhat.com>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
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/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
Log Message:
-----------
Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2075
Commit: 821a436d61b297ad89e183b40f8416e6bae0807b
https://github.com/zanata/zanata-platform/commit/821a436d61b297ad89e183b40f8416e6bae0807b
Author: kgough <kgough at redhat.com>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/app.css
A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
R server/zanata-frontend/src/app/editor/components/SearchReplace/searchreplace.story.js
M server/zanata-frontend/src/app/editor/components/components.story.js
Log Message:
-----------
feat(ZNTA-2075) add stylesheet and button for search and replace modal
Commit: b94a821eee0ccb5a45fe700cd7b05f55547bae8a
https://github.com/zanata/zanata-platform/commit/b94a821eee0ccb5a45fe700cd7b05f55547bae8a
Author: kgough <kgough at redhat.com>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
Log Message:
-----------
feat(ZNTA-2075) add stylesheet and button for search and replace modal
Commit: 680bac412a87c33f123ffc4e4e71e00be0c2dced
https://github.com/zanata/zanata-platform/commit/680bac412a87c33f123ffc4e4e71e00be0c2dced
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/app.css
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
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) WIP: add components to editor search and replace
Commit: 7a1166c161b9feb4f20215b0becf4f1a98667503
https://github.com/zanata/zanata-platform/commit/7a1166c161b9feb4f20215b0becf4f1a98667503
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
Log Message:
-----------
feat(ZNTA-2075) complete adding components for search and replace, half of modal stylign
Commit: 58f1b64e75d2aee72f901b54ef11c9327ebca3fa
https://github.com/zanata/zanata-platform/commit/58f1b64e75d2aee72f901b54ef11c9327ebca3fa
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
Log Message:
-----------
feat(ZNTA-2075) checkbox styling
Commit: 0bb563aa00909ef12190b475c29e109a307c3ff2
https://github.com/zanata/zanata-platform/commit/0bb563aa00909ef12190b475c29e109a307c3ff2
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
Log Message:
-----------
feat(ZNTA-2075) checkbox styling
Commit: a5dda6805a8cb48613d723b6f12d95b5458f7542
https://github.com/zanata/zanata-platform/commit/a5dda6805a8cb48613d723b6f12d95b5458f7542
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
Log Message:
-----------
feat(ZNTA-2075) checkbox styling
Commit: e94c780192b4f267997c9bd0b9227ae8c68584ed
https://github.com/zanata/zanata-platform/commit/e94c780192b4f267997c9bd0b9227ae8c68584ed
Author: kgough <kgough at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
Log Message:
-----------
feat(ZNTA-2075) search adn replace ui styling
Commit: 6c8c6fa5abb835ea92a08618f74d094bfabddd82
https://github.com/zanata/zanata-platform/commit/6c8c6fa5abb835ea92a08618f74d094bfabddd82
Author: kgough <kgough at redhat.com>
Date: 2018-06-26 (Tue, 26 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
Log Message:
-----------
feat(ZNTA-2075) styling changes to editor search and replace styling
Commit: 84e5597356bb95351a4fbf1fc56604f5f54d132c
https://github.com/zanata/zanata-platform/commit/84e5597356bb95351a4fbf1fc56604f5f54d132c
Author: kgough <kgough at redhat.com>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
M server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
Log Message:
-----------
feat(ZNTA-2075) remove unused props from SearchReplace component
Commit: b20af980d2edf84a8fef19c42f52abaa4bb5fe7a
https://github.com/zanata/zanata-platform/commit/b20af980d2edf84a8fef19c42f52abaa4bb5fe7a
Author: kgough <kgough at redhat.com>
Date: 2018-06-28 (Thu, 28 Jun 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
Log Message:
-----------
feat(ZNTA-2075) update editor snapshot
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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 5700ef8a6fa5783fa4c4032b602f1fdd82a52af9
https://github.com/zanata/zanata-platform/commit/5700ef8a6fa5783fa4c4032b602f1fdd82a52af9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-07-18 (Wed, 18 Jul 2018)
Changed paths:
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
M server/services/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/services/src/main/java/org/zanata/rest/service/PoUtility.java
A server/services/src/main/java/org/zanata/service/impl/AttributionService.kt
M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/mt/TextFlowsToMTDoc.java
M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java
A server/services/src/test/java/org/zanata/service/impl/AttributionServiceTest.kt
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
Log Message:
-----------
feat(ZNTA-2487) avoid copying MT; add attribution to docs (#954)
* Prevent copyTrans from copying MT
* Refactor: use/rename constants for SourceType
* Preserve MT SourceType in CopyVersionServiceImpl
* Prevent "Merge Translations" from copying MT
* Avoid int conversion
* Refactor TransMemoryMergeServiceImpl a bit
* Refactor TransMemoryMergeServiceImpl.startMergeTranslations()
* Mark some TM results as MT, filter out for TM Merge
* Add AttributionService
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
Commit: 505d35455905e1862d0a9d7b72e5ca964883833d
https://github.com/zanata/zanata-platform/commit/505d35455905e1862d0a9d7b72e5ca964883833d
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/app/editor/components/SearchReplace/SearchReplace.story.js
Log Message:
-----------
feat(ZNTA-2075) update SearchReplace story failures
Commit: 6b3f3668603f9b6a32fe5ebf7135e7975e2073a2
https://github.com/zanata/zanata-platform/commit/6b3f3668603f9b6a32fe5ebf7135e7975e2073a2
Author: Damian Jansen <djansen at redhat.com>
Date: 2018-07-18 (Wed, 18 Jul 2018)
Changed paths:
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/test/java/org/zanata/adapter/AbstractAdapterTest.java
R server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
A server/services/src/test/java/org/zanata/adapter/TSAdapterTest.kt
R server/services/src/test/resources/org/zanata/adapter/basicts.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-comment.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-invalid.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-multiplecontexts.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-plurals.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-translated.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
M server/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
Log Message:
-----------
fix(ZNTA-2634): replace language property in translated TS (#925)
* fix(ZNTA-2634): replace language property in translated TS
* fix(ZNTA-2634): improve the regex and add tests
* fix(ZNTA-2634): add bad locale check and test
* fix(ZNTA-2634): remove unnecessary check
* fix(ZNTA-2634): convert test to Kotlin
* fix(ZNTA-2634): clean up adapter and test
* fix(ZNTA-2634): preserve case on target locale
* fix(ZNTA-2634): ignore test, cannot support user parts in locale
* fix(ZNTA-2634): use empty string instead of .EMPTY
Commit: f9a67a5b5f8ce47a1e21f1182bdaeaf931e42936
https://github.com/zanata/zanata-platform/commit/f9a67a5b5f8ce47a1e21f1182bdaeaf931e42936
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-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/config.js
M server/zanata-frontend/src/app/editor/app.css
A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.js
M server/zanata-frontend/src/app/editor/components/components.story.js
M server/zanata-frontend/src/app/editor/entrypoint/index.js
Log Message:
-----------
Merge pull request #923 from zanata/ZNTA-2075
feat(ZNTA-2075) story for editor search and replace
Commit: 365caee7b08f2132d3f67b94ced6dbc1a87bd447
https://github.com/zanata/zanata-platform/commit/365caee7b08f2132d3f67b94ced6dbc1a87bd447
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/TranslationServiceImpl.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
Log Message:
-----------
fix(ZNTA-2662) save invalid translations as fuzzy (#955)
* fix(ZNTA-2662) save invalid translations as fuzzy
* Add validation tests for TranslationServiceImpl
Commit: b4fe4272e992dd475685ee26d9f43096edbec4d0
https://github.com/zanata/zanata-platform/commit/b4fe4272e992dd475685ee26d9f43096edbec4d0
Author: kgough <kgough at redhat.com>
Date: 2018-07-18 (Wed, 18 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/entrypoint/index.js
Log Message:
-----------
fix: add index.css back to editor entrypoint
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: 0ba3e75ed30b138f75a0b4c5aa8eff80b5519047
https://github.com/zanata/zanata-platform/commit/0ba3e75ed30b138f75a0b4c5aa8eff80b5519047
Author: Kathryn Gough <kgough at redhat.com>
Date: 2018-07-18 (Wed, 18 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/entrypoint/index.js
Log Message:
-----------
Merge pull request #957 from zanata/react-editor-fix
fix: add index.css back to editor entrypoint
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: 71c3cf898bac6ada450354c90493c476a0ceec90
https://github.com/zanata/zanata-platform/commit/71c3cf898bac6ada450354c90493c476a0ceec90
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Changed paths:
M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.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/TransSourceIndicator.java
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/TranslationHistoryPresenterTest.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
R server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.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/TranslationService.java
M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M server/services/src/main/java/org/zanata/rest/service/FileService.java
M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M server/services/src/main/java/org/zanata/service/TranslationService.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.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/dao/TextFlowTargetDAOTest.java
M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.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/rest/service/FileServiceTest.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/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.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
R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
Log Message:
-----------
Move TranslationSourceType enum to API; remove the class
Commit: 888409369b4ff75694fd4d2d2510bb663edea161
https://github.com/zanata/zanata-platform/commit/888409369b4ff75694fd4d2d2510bb663edea161
Author: Sean Flanigan <sflaniga 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/main/java/org/zanata/rest/dto/TranslationSourceType.java
M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
Log Message:
-----------
Change TransUnitStatus.transSourceType to use enum
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: 98e68bb1c5b3ce6a63fc21280878f47bce65b396
https://github.com/zanata/zanata-platform/commit/98e68bb1c5b3ce6a63fc21280878f47bce65b396
Author: Earl Floden <efloden at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
Log Message:
-----------
feat(ZNTA-2670): Define MT or target lang attr in React Editor (#965)
* 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
* feat(ZNTA-2670): define mt or target lang attr for translation textarea
* feat: also pass lang attr to SyntaxHighlighter
* chore: update tests
Commit: 3c05e23550d7c91a2466f6aed1bcbb6beb1c8829
https://github.com/zanata/zanata-platform/commit/3c05e23550d7c91a2466f6aed1bcbb6beb1c8829
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Changed paths:
M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.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/ui/Editor.java
M 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/TransMemoryView.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/TranslationHistoryPresenterTest.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
R server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TranslationSourceType.java
M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.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/TranslationService.java
M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M server/services/src/main/java/org/zanata/rest/service/FileService.java
M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java
M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M server/services/src/main/java/org/zanata/service/TranslationService.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.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/dao/TextFlowTargetDAOTest.java
M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.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/rest/service/FileServiceTest.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/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.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
R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
Log Message:
-----------
Merge pull request #960 from zanata/mt-gwt2
refactor: eliminate duplicate TranslationSourceType
Commit: 1b295643dacea3241a54db8c4036c4989ff2ed21
https://github.com/zanata/zanata-platform/commit/1b295643dacea3241a54db8c4036c4989ff2ed21
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/presenter/TranslationHistoryPresenter.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/TextContentsDisplay.java
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/TransSourceIndicator.java
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.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/TransMemoryView.java
M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
Log Message:
-----------
fix(ZNTA-2669) use HTML attributes for MT in GWT editor (#964)
* 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: html attr for MT
https://zanata.atlassian.net/browse/ZNTA-2669
Commit: dfeab9feee107160bb0dc0057bc66a84792e4a6d
https://github.com/zanata/zanata-platform/commit/dfeab9feee107160bb0dc0057bc66a84792e4a6d
Author: Damian Jansen <djansen at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Changed paths:
M docs/release-notes.md
M server/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
M 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
R server/services/src/main/java/org/zanata/adapter/JsonAdapter.java
A server/services/src/main/java/org/zanata/adapter/JsonAdapter.kt
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/resources/messages.properties
R server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
A server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.kt
M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
R server/services/src/test/resources/org/zanata/adapter/basicjson.json
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicatecontent.json
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateentries.json
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateids.json
R server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
Log Message:
-----------
fix(ZNTA-2581,ZNTA-1731): fix textflow id of uploaded JSON documents (#854)
* fix(ZNTA-2581): recommend po upload
* fix(ZNTA-2581): test po in file project
* fix(ZNTA-2581): test file adapter in gettext project
* fix(ZNTA-2581): check for original file on non-po upload
* fix(ZNTA-2581,ZNTA-1731): fix textflow id of uploaded JSON documents
Use the full path of a JSON object to determine its id. This
disallows standalone/isolated strings to be detected as the
path names will conflict when there are multiple entities,
such as an array of strings.
* fix(ZNTA-2581,ZNTA-1731): fix test
* fix(ZNTA-2581,ZNTA-1731): document potentially breaking change
* fix(ZNTA-2581): use a JSON parser
Use a parser that can handle both arrays and irregular keys,
for more flexibility in JSON documents and translation
sources.
* fix(ZNTA-2581): improve usage of parser and test coverage
* fix(ZNTA-2581): remove usused imports
* fix(ZNTA-2581): clean up duplicated code
* revert Okapi upgrade
* upgrade apache commons-text to 1.4
* fix(ZNTA-2581): improve adapter readability and convert test to Kotlin
* fix(ZNTA-2581): fix actions and UI
* fix(ZNTA-2581): comment, fix wildcard import and write exception
Commit: 2af76e0957680c884fb2364291e7bdceacd5d8a0
https://github.com/zanata/zanata-platform/commit/2af76e0957680c884fb2364291e7bdceacd5d8a0
Author: Damian Jansen <djansen at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Changed paths:
M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
Log Message:
-----------
fix(ZNTA-2671): skip loop on failed attribution check (#962)
Commit: 84d84dd88d177fe9a5c4c353f19421dbbc0a10c3
https://github.com/zanata/zanata-platform/commit/84d84dd88d177fe9a5c4c353f19421dbbc0a10c3
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-07-19 (Thu, 19 Jul 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): development version is now 4.7.0-SNAPSHOT
Commit: ef403f1002f684f58c66da4e96a8df68d1ab24d0
https://github.com/zanata/zanata-platform/commit/ef403f1002f684f58c66da4e96a8df68d1ab24d0
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-07-19 (Thu, 19 Jul 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): development version is now 4.8.0-SNAPSHOT
Commit: 0182701f5851083ffc9ff8a2462078f65a148378
https://github.com/zanata/zanata-platform/commit/0182701f5851083ffc9ff8a2462078f65a148378
Author: Ding-Yi Chen <dchen at redhat.com>
Date: 2018-07-19 (Thu, 19 Jul 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.7.0-SNAPSHOT
Commit: 266e7e6e8ddc0b0d3b5bc0682d1571d304c76e92
https://github.com/zanata/zanata-platform/commit/266e7e6e8ddc0b0d3b5bc0682d1571d304c76e92
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-07-19 (Thu, 19 Jul 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.6.0-rc-1
Commit: ffb1f02f0d2c9eaa31fbfec719426c5ffbfe34fd
https://github.com/zanata/zanata-platform/commit/ffb1f02f0d2c9eaa31fbfec719426c5ffbfe34fd
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-07-19 (Thu, 19 Jul 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.6.0-rc-2-SNAPSHOT
Commit: b0a0cd51ddf9c026a153e77e37e022ad5c6b2ba1
https://github.com/zanata/zanata-platform/commit/b0a0cd51ddf9c026a153e77e37e022ad5c6b2ba1
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2018-07-19 (Thu, 19 Jul 2018)
Log Message:
-----------
Merge branch 'release'
Commit: 4c282ce6960490c74bfdfbf670c39e3f4ed6f324
https://github.com/zanata/zanata-platform/commit/4c282ce6960490c74bfdfbf670c39e3f4ed6f324
Author: Kathryn Gough <kgough at redhat.com>
Date: 2018-07-20 (Fri, 20 Jul 2018)
Changed paths:
M .editorconfig
M api/pom.xml
M api/zanata-common-api/pom.xml
M api/zanata-common-api/src/main/java/org/zanata/Common.gwt.xml
M api/zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
A api/zanata-common-api/src/main/java/org/zanata/rest/dto/TranslationSourceType.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
M api/zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
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 docs/release-notes.md
M parent/pom.xml
M pom.xml
M server/docker/Dockerfile
M server/etc/scripts/configure-app-server.js
M server/functional-test/pom.xml
M server/gwt-editor/pom.xml
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/TransUnitSaveService.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/TextContentsDisplay.java
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/ui/TranslationHistoryDisplay.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/TransMemoryPresenterTest.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/pom.xml
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/TransMemoryResultItem.java
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnit.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/rpc/ReplaceText.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/gwt-test/pom.xml
M server/pom.xml
M server/security-common/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/ZanataInit.java
M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
M 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
R server/services/src/main/java/org/zanata/adapter/JsonAdapter.java
A server/services/src/main/java/org/zanata/adapter/JsonAdapter.kt
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/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/DocumentDAO.java
M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java
M server/services/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java
A server/services/src/main/java/org/zanata/rest/dto/MachineTranslationPrefill.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/TransMemoryMergeManager.java
M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.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
M server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M server/services/src/main/java/org/zanata/rest/service/FileService.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/PoUtility.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/TranslatedDocResourceService.java
M server/services/src/main/java/org/zanata/search/FilterConstraintToQuery.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/TranslationService.java
A server/services/src/main/java/org/zanata/service/impl/AttributionService.kt
M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
M server/services/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
A server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A server/services/src/main/java/org/zanata/service/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/service/tm/merge/TransMemoryMergeServiceImpl.java
M server/services/src/main/java/org/zanata/util/EssentialDataCreator.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/main/resources/messages.properties
M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
R server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
A server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.kt
R server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
A server/services/src/test/java/org/zanata/adapter/TSAdapterTest.kt
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/TextFlowTargetDAOTest.java
M server/services/src/test/java/org/zanata/file/TranslationDocumentUploadTest.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/rest/editor/service/TransMemoryMergeManagerTest.java
M server/services/src/test/java/org/zanata/rest/service/AsyncProcessServiceTest.java
M server/services/src/test/java/org/zanata/rest/service/FileServiceTest.java
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/search/FilterConstraintToQueryTest.java
M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java
A server/services/src/test/java/org/zanata/service/impl/AttributionServiceTest.kt
M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A server/services/src/test/java/org/zanata/service/impl/MachineTranslationServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
M server/services/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java
M server/services/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
M server/services/src/test/java/org/zanata/util/TransMemoryMergeStatusResolverTest.java
R server/services/src/test/resources/org/zanata/adapter/basicjson.json
R server/services/src/test/resources/org/zanata/adapter/basicts.ts
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicatecontent.json
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateentries.json
R server/services/src/test/resources/org/zanata/adapter/test-json-duplicateids.json
R server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json
R server/services/src/test/resources/org/zanata/adapter/test-ts-comment.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-invalid.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-multiplecontexts.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-plurals.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-translated.ts
R server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/config.js
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
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
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/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/components/components.story.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
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/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/index.js
M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
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/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/GlossaryTermModal/GlossaryTermModal.story.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
A server/zanata-frontend/src/app/editor/components/SearchReplace/SearchReplace.story.js
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.css
A server/zanata-frontend/src/app/editor/components/SearchReplace/index.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/Suggestion.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/SuggestionList.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/TransUnit/index.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/components/TransUnitTranslationPanel.test.js
M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.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/GlossaryTab.js
M server/zanata-frontend/src/app/editor/containers/MainContent.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/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/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-frontend/src/app/entrypoint/legacy.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
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/styles/antd.less
M server/zanata-frontend/src/app/utils/EnumValueUtils.ts
A server/zanata-frontend/src/app/utils/TypeName.d.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
M server/zanata-liquibase/pom.xml
M server/zanata-model-test/pom.xml
M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java
M server/zanata-model-test/src/main/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
R server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeType.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceTypeTypeDescriptor.java
M server/zanata-model/src/main/java/org/zanata/util/JPACopier.java
M server/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M server/zanata-model/src/test/java/org/zanata/model/type/TranslationSourceTypeTest.java
M server/zanata-test-war/pom.xml
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
M server/zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
Merge branch 'master' into ZNTA-2526
Compare: https://github.com/zanata/zanata-platform/compare/0e07a9e45277...4c282ce69604
**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