[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error
Branch: refs/heads/znta-2669-gwt-mt-attribute Home: https://github.com/zanata/zanata-platform Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed Author: efloden Date: 2018-07-18 (Wed, 18 Jul 2018) Changed paths: M server/zanata-frontend/src/app/editor/containers/MainContent.js Log Message: --- fix: concurrent modal type error Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628 https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628 Author: Earl Floden 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 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 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 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 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 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 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 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 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 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
[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error
Branch: refs/heads/react-editor-mt-lang-attr/ZNTA-2670 Home: https://github.com/zanata/zanata-platform Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed Author: efloden Date: 2018-07-18 (Wed, 18 Jul 2018) Changed paths: M server/zanata-frontend/src/app/editor/containers/MainContent.js Log Message: --- fix: concurrent modal type error Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628 https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628 Author: Earl Floden 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 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 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 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: 2def46ed8224e78ef40f8dfc5d0d8d6d61bf4f67 https://github.com/zanata/zanata-platform/commit/2def46ed8224e78ef40f8dfc5d0d8d6d61bf4f67 Author: efloden Date: 2018-07-19 (Thu, 19 Jul 2018) Changed paths: M server/services/src/main/java/org/zanata/service/impl/MachineTranslationServiceImpl.java M server/services/src/main/resources/messages.properties M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap M server/zanata-frontend/src/app/components/MTMerge/MTMergeModal.tsx M server/zanata-frontend/src/app/editor/containers/MainContent.js M server/zanata-frontend/src/app/reducers/version-reducer.js Log Message: --- Merge branch 'master' of github.com:zanata/zanata-platform into react-editor-mt-lang-attr/ZNTA-2670 Compare: https://github.com/zanata/zanata-platform/compare/276cbb88b4bb...2def46ed8224 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019. ___ zanata-commits mailing list zanata-commits@redhat.com https://www.redhat.com/mailman/listinfo/zanata-commits
[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error
Branch: refs/heads/master Home: https://github.com/zanata/zanata-platform Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed Author: efloden Date: 2018-07-18 (Wed, 18 Jul 2018) Changed paths: M server/zanata-frontend/src/app/editor/containers/MainContent.js Log Message: --- fix: concurrent modal type error Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628 https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628 Author: Earl Floden 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 Compare: https://github.com/zanata/zanata-platform/compare/0ba3e75ed30b...64bff34a1a31 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019. ___ zanata-commits mailing list zanata-commits@redhat.com https://www.redhat.com/mailman/listinfo/zanata-commits
[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error
Branch: refs/heads/fix-conflict-typeerror Home: https://github.com/zanata/zanata-platform Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed Author: efloden 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 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019. ___ zanata-commits mailing list zanata-commits@redhat.com https://www.redhat.com/mailman/listinfo/zanata-commits