Branch: refs/heads/master Home: https://github.com/zanata/zanata-platform Commit: a2e3d7bf1b4525b5d7676071f178463a3cd14dfb https://github.com/zanata/zanata-platform/commit/a2e3d7bf1b4525b5d7676071f178463a3cd14dfb Author: kgough <kgo...@redhat.com> Date: 2018-05-03 (Thu, 03 May 2018)
Changed paths: M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Languages/index.js Log Message: ----------- refactor(ZNTA-2514) badges and breadcrumbs in frontend from react-bootstrap to antd Commit: a078f0623fd4cfeed43804fb5367a2935c27945a https://github.com/zanata/zanata-platform/commit/a078f0623fd4cfeed43804fb5367a2935c27945a Author: kgough <kgo...@redhat.com> Date: 2018-05-03 (Thu, 03 May 2018) Changed paths: M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) alignment of language count (tag) on languages page Commit: 8e2fdd957eee162a14620e5fc681f8a395291781 https://github.com/zanata/zanata-platform/commit/8e2fdd957eee162a14620e5fc681f8a395291781 Author: kgough <kgo...@redhat.com> Date: 2018-05-04 (Fri, 04 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Admin/index.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) refactor layout and components on Admin homepage to use antd instead of react-bootstrap Commit: e963571de01e5444a83369cabfe54fa219b482f0 https://github.com/zanata/zanata-platform/commit/e963571de01e5444a83369cabfe54fa219b482f0 Author: kgough <kgo...@redhat.com> Date: 2018-05-04 (Fri, 04 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Admin/Review.js Log Message: ----------- refactor(ZNTA-2514) WIP: refactor Admin review criteria page from react-bootstrap to antd Commit: fa759a906f2ff69b1f611a060f607d14854e8489 https://github.com/zanata/zanata-platform/commit/fa759a906f2ff69b1f611a060f607d14854e8489 Author: kgough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Admin/Review.js Log Message: ----------- refactor(ZNTA-2514) admin rejection criteria page to antd Commit: af97c2c89cc97af65ebe8cd461ad178ea5dcdb28 https://github.com/zanata/zanata-platform/commit/af97c2c89cc97af65ebe8cd461ad178ea5dcdb28 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: 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/Notification/component.js M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx M server/zanata-frontend/src/app/containers/Explore/index.js M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx M server/zanata-frontend/src/app/editor/actions/header-action-types.js M server/zanata-frontend/src/app/editor/actions/header-actions.js M server/zanata-frontend/src/app/editor/actions/phrases-actions.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/TransUnit/index.js A server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js A server/zanata-frontend/src/app/editor/components/Validation/index.css A server/zanata-frontend/src/app/editor/components/Validation/index.tsx M server/zanata-frontend/src/app/editor/components/components.story.js M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js M server/zanata-frontend/src/app/editor/containers/MainContent.js M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css A 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/reducers/index.js M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js M server/zanata-frontend/src/app/editor/utils/activity-util.ts M server/zanata-frontend/src/app/editor/utils/phrase.ts M server/zanata-frontend/src/messages/ja.json Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: 03f1f56fae2a9db32f61686600ba8281b7540f81 https://github.com/zanata/zanata-platform/commit/03f1f56fae2a9db32f61686600ba8281b7540f81 Author: kgough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: M server/zanata-frontend/src/app/components/LockIcon/index.tsx M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/Glossary/Header.jsx 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/Entry.js Log Message: ----------- refactor(ZNTA-2415) glossary pages to antd Commit: d4163b9a4052d8d85c27d18eac57f4c936c617c6 https://github.com/zanata/zanata-platform/commit/d4163b9a4052d8d85c27d18eac57f4c936c617c6 Author: kgough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Glossary/index.less Log Message: ----------- refactor(ZNTA-2415) glossary pages to antd Commit: f43a4ea7dbc588da04a8a5942521abba046fb2f9 https://github.com/zanata/zanata-platform/commit/f43a4ea7dbc588da04a8a5942521abba046fb2f9 Author: kgough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.less Log Message: ----------- refactor(ZNTA-2415) user profile to antd Commit: 72ee19c9b4b62cfe879aadda7a7ef3fd904d5750 https://github.com/zanata/zanata-platform/commit/72ee19c9b4b62cfe879aadda7a7ef3fd904d5750 Author: kgough <kgo...@redhat.com> Date: 2018-05-08 (Tue, 08 May 2018) Changed paths: M server/zanata-frontend/src/app/components/LockIcon/index.tsx Log Message: ----------- refactor(ZNTA-2415) fix LockIcon test Commit: 327617e0352cf864d63ff9603c6b038e3917ca3f https://github.com/zanata/zanata-platform/commit/327617e0352cf864d63ff9603c6b038e3917ca3f Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-09 (Wed, 09 May 2018) Changed paths: M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap M server/zanata-frontend/src/app/components/Button/Button.story.js M server/zanata-frontend/src/app/components/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/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/Sidebar/index.jsx M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx M server/zanata-frontend/src/app/containers/Explore/index.js M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Glossary/index.less M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.less M server/zanata-frontend/src/app/entrypoint/index.js M server/zanata-frontend/src/app/styles/style.less Log Message: ----------- refactor(ZNTA-2514) fix merge conflicts Commit: 9c85e4253721368275f5dd651c3f22efd30dee69 https://github.com/zanata/zanata-platform/commit/9c85e4253721368275f5dd651c3f22efd30dee69 Author: kgough <kgo...@redhat.com> Date: 2018-05-09 (Wed, 09 May 2018) Changed paths: M server/zanata-frontend/src/app/components/LockIcon/index.tsx M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) WIP: refactor TM Merge modal to antd, fix issues with LockIcon component and Glossary Entry Commit: 95bde4735da80213810a76c4859d22f237617a64 https://github.com/zanata/zanata-platform/commit/95bde4735da80213810a76c4859d22f237617a64 Author: kgough <kgo...@redhat.com> Date: 2018-05-09 (Wed, 09 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js Log Message: ----------- refactor(ZNTA-2514) WIP: refactor TM Merge modal to antd Commit: f5405f4efa7e70e4a3bd9d457f7e1b3102dbfd19 https://github.com/zanata/zanata-platform/commit/f5405f4efa7e70e4a3bd9d457f7e1b3102dbfd19 Author: kgough <kgo...@redhat.com> Date: 2018-05-10 (Thu, 10 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.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/TMMergeOptionsCommon.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) WIP: TM Merge modal Commit: dcd383bdff4e718b47df92a23683f735468c7fef https://github.com/zanata/zanata-platform/commit/dcd383bdff4e718b47df92a23683f735468c7fef Author: kgough <kgo...@redhat.com> Date: 2018-05-11 (Fri, 11 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js Log Message: ----------- refactor(ZNTA-2514) Collapse Panel for TM Merge Modal Commit: 513f5742cfd62e3a0df5cbf56d26ec89e0c6a84a https://github.com/zanata/zanata-platform/commit/513f5742cfd62e3a0df5cbf56d26ec89e0c6a84a Author: kgough <kgo...@redhat.com> Date: 2018-05-11 (Fri, 11 May 2018) Changed paths: M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js M server/zanata-frontend/src/app/containers/ProjectVersion/index.less Log Message: ----------- refactor(ZNTA-2514) WIP: TM Merge Modal css fixes Commit: 0ebe469d594b242ae6e9c60552419579871d2bb5 https://github.com/zanata/zanata-platform/commit/0ebe469d594b242ae6e9c60552419579871d2bb5 Author: kgough <kgo...@redhat.com> Date: 2018-05-11 (Fri, 11 May 2018) Changed paths: M client/zanata-client-commands/src/main/resources/prompts.properties M docs/release-notes.md M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java M server/services/src/main/java/org/zanata/action/HasUserDetail.java M server/services/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java M server/services/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java M server/services/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java M server/services/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java M server/services/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java M server/services/src/main/java/org/zanata/liquibase/custom/RebuildTMXPlainText.java M server/services/src/main/java/org/zanata/liquibase/custom/ValidateAccountPasswords.java M server/services/src/main/resources/ValidationMessages.properties M server/zanata-war/src/main/webapp/WEB-INF/liquibase Log Message: ----------- Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: c7e7068fd58ae1a915b449d369b5c648f874c721 https://github.com/zanata/zanata-platform/commit/c7e7068fd58ae1a915b449d369b5c648f874c721 Author: kgough <kgo...@redhat.com> Date: 2018-05-14 (Mon, 14 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js M server/zanata-frontend/src/app/containers/Languages/Entry.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js Log Message: ----------- refactor(ZNTA-2514) WIP: TM Merge modal Commit: 71905c5f44d53f485c0851a970cc716491a190dd https://github.com/zanata/zanata-platform/commit/71905c5f44d53f485c0851a970cc716491a190dd Author: kgough <kgo...@redhat.com> Date: 2018-05-15 (Tue, 15 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/components/LockIcon/index.tsx Log Message: ----------- refactor(ZNTA-2514) fix linting errors Commit: 05e63112c00fc8ed6bc4113aa70aa6a07438285d https://github.com/zanata/zanata-platform/commit/05e63112c00fc8ed6bc4113aa70aa6a07438285d Author: kgough <kgo...@redhat.com> Date: 2018-05-15 (Tue, 15 May 2018) Changed paths: M server/zanata-frontend/src/app/components/LockIcon/index.tsx 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/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) WIP: TM Merge modal Commit: 124861d1b5914699af0ef3632a75bad4d1f3aa9a https://github.com/zanata/zanata-platform/commit/124861d1b5914699af0ef3632a75bad4d1f3aa9a Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-17 (Thu, 17 May 2018) Changed paths: M server/functional-test/src/main/java/org/zanata/page/more/ContactAdminFormPage.java M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java M server/services/src/main/java/org/zanata/action/RoleAction.java M server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java M server/services/src/main/resources/messages.properties A server/services/src/test/java/org/zanata/action/RoleActionTest.java M server/services/src/test/java/org/zanata/email/EmailStrategyTest.java M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap M server/zanata-frontend/src/app/components/Modal/Modal.story.js M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/Languages/index.less M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.test.js M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.test.js M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js M server/zanata-frontend/src/app/editor/containers/RejectTranslation/index.js M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js M server/zanata-frontend/src/app/entrypoint/index.js M server/zanata-frontend/src/app/styles/style.less M server/zanata-frontend/src/app/utils/DateHelper.ts M server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml R server/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml M server/zanata-war/src/main/webapp/admin/roledetail.xhtml M server/zanata-war/src/main/webapp/public/info.xhtml Log Message: ----------- Merge remote-tracking branch 'origin/master' into ZNTA-2514 Commit: 5b8d35a753a410ada2273e84a3960bc41629ba81 https://github.com/zanata/zanata-platform/commit/5b8d35a753a410ada2273e84a3960bc41629ba81 Author: kgough <kgo...@redhat.com> Date: 2018-05-17 (Thu, 17 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx 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/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) layout and styling of panels in TM Merge modal Commit: 8ccb806b44c0b8e8166d2f1842dcaf6766722f07 https://github.com/zanata/zanata-platform/commit/8ccb806b44c0b8e8166d2f1842dcaf6766722f07 Author: kgough <kgo...@redhat.com> Date: 2018-05-17 (Thu, 17 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js Log Message: ----------- refactor(ZNTA-2514) replace TMMergeModal modal and toggle components with antd Modal and Switch Commit: 4c5c7e5e39fe5b271db33db8842a4b08c7abc399 https://github.com/zanata/zanata-platform/commit/4c5c7e5e39fe5b271db33db8842a4b08c7abc399 Author: kgough <kgo...@redhat.com> Date: 2018-05-17 (Thu, 17 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) css styling for TMMergeModal Commit: 73b797963184f96acb6172d07ab7bbf45196682e https://github.com/zanata/zanata-platform/commit/73b797963184f96acb6172d07ab7bbf45196682e Author: kgough <kgo...@redhat.com> Date: 2018-05-18 (Fri, 18 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/components/EditableText/index.js M server/zanata-frontend/src/app/components/LockIcon/index.tsx M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Admin/index.js M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx M server/zanata-frontend/src/app/containers/Explore/index.js M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js M server/zanata-frontend/src/app/containers/Glossary/Header.jsx M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx Log Message: ----------- refactor(ZNTA-2514) update import statements for antd components Commit: 694ad8c45b4c66d3a8f660107b30a1f3822f7a70 https://github.com/zanata/zanata-platform/commit/694ad8c45b4c66d3a8f660107b30a1f3822f7a70 Author: kgough <kgo...@redhat.com> Date: 2018-05-18 (Fri, 18 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js Log Message: ----------- Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: 88889090ff379e59d81f4c1c528f4b2f774b6d01 https://github.com/zanata/zanata-platform/commit/88889090ff379e59d81f4c1c528f4b2f774b6d01 Author: kgough <kgo...@redhat.com> Date: 2018-05-18 (Fri, 18 May 2018) Changed paths: M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) minor fixes to Explore page css Commit: e30988f20a5dd4e923a6f012f2b3430c805d80fb https://github.com/zanata/zanata-platform/commit/e30988f20a5dd4e923a6f012f2b3430c805d80fb Author: kgough <kgo...@redhat.com> Date: 2018-05-18 (Fri, 18 May 2018) Changed paths: 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 Log Message: ----------- refactor(ZNTA-2514) update failing tests in frontend Commit: 14f98ee69da8adf3ca2fe661f75e23a97bf783f8 https://github.com/zanata/zanata-platform/commit/14f98ee69da8adf3ca2fe661f75e23a97bf783f8 Author: kgough <kgo...@redhat.com> Date: 2018-05-21 (Mon, 21 May 2018) Changed paths: M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js M server/zanata-frontend/src/app/containers/Glossary/Entry.js Log Message: ----------- refactor(ZNTA-2514) fix glossary row info icons Commit: 8136269e4267f2642b187abd92794ed9450fa00f https://github.com/zanata/zanata-platform/commit/8136269e4267f2642b187abd92794ed9450fa00f Author: kgough <kgo...@redhat.com> Date: 2018-05-21 (Mon, 21 May 2018) Changed paths: M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js Log Message: ----------- refactor(ZNTA-2514) update failing CancellableProgressBar test Commit: 483e9395befc6aa066cbab9cf38ea48e7823a5ef https://github.com/zanata/zanata-platform/commit/483e9395befc6aa066cbab9cf38ea48e7823a5ef Author: kgough <kgo...@redhat.com> Date: 2018-05-21 (Mon, 21 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/components/LockIcon/index.tsx Log Message: ----------- refactor(ZNTA-2514) fix linting issues in TS files Commit: 8f518d4fa594a9204d95561460b40f1fb6075007 https://github.com/zanata/zanata-platform/commit/8f518d4fa594a9204d95561460b40f1fb6075007 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-21 (Mon, 21 May 2018) Changed paths: M server/services/src/main/java/org/zanata/action/ContactAdminAction.java M server/services/src/main/java/org/zanata/action/ContactLanguageTeamMembersAction.java M server/services/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java M server/services/src/main/java/org/zanata/action/LanguageJoinAction.java M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java M server/services/src/main/java/org/zanata/email/ActivationEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java M server/services/src/main/java/org/zanata/email/EmailBuilder.java R server/services/src/main/java/org/zanata/email/EmailStrategy.java M server/services/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java M server/services/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java M server/services/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java M server/services/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java A server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java M server/services/src/main/java/org/zanata/rest/service/ProjectVersionService.java M server/services/src/main/java/org/zanata/service/EmailService.java M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java M server/services/src/test/java/org/zanata/action/ContactAdminActionTest.java R server/services/src/test/java/org/zanata/email/EmailStrategyTest.java A server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java M server/services/src/test/java/org/zanata/rest/service/ProjectVersionTest.java M server/services/src/test/java/org/zanata/test/DBUnitDataSetRunner.java M server/services/src/test/java/org/zanata/test/rule/DataSetOperation.java M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-model-test/src/main/java/org/zanata/RestTest.java M server/zanata-model-test/src/main/java/org/zanata/provider/DBUnitProvider.java M server/zanata-war/src/test/java/org/zanata/ArquillianTest.java Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: d3f514c753ffc3ea53dbfe822b7143247e023cc5 https://github.com/zanata/zanata-platform/commit/d3f514c753ffc3ea53dbfe822b7143247e023cc5 Author: efloden <eflo...@redhat.com> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js Log Message: ----------- feat: implement ant select in tmmergemodal Commit: e0c42da39e6cc6dba966f4e7764ac46c1c6aad89 https://github.com/zanata/zanata-platform/commit/e0c42da39e6cc6dba966f4e7764ac46c1c6aad89 Author: kgough <kgo...@redhat.com> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/antd.less Log Message: ----------- refactor(ZNTA-2514) styling changes to tooltip buttons in tm merge modal Commit: 45be3cf8169cce86d3571e79a6178e6a4842b45e https://github.com/zanata/zanata-platform/commit/45be3cf8169cce86d3571e79a6178e6a4842b45e Author: kgough <kgo...@redhat.com> Date: 2018-05-22 (Tue, 22 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx Log Message: ----------- refactor(ZNTA-2514) styling changes to tooltip buttons in tm merge modal Commit: 22f00753f387c0f7ab1ea8b8e7fcdd0eda8f71ee https://github.com/zanata/zanata-platform/commit/22f00753f387c0f7ab1ea8b8e7fcdd0eda8f71ee Author: efloden <eflo...@redhat.com> Date: 2018-05-23 (Wed, 23 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/styles/antd.less Log Message: ----------- feat: implement language select ant component, fix select styles Commit: 7906be82de477177045948c6ffa9d73e071f0175 https://github.com/zanata/zanata-platform/commit/7906be82de477177045948c6ffa9d73e071f0175 Author: efloden <eflo...@redhat.com> Date: 2018-05-23 (Wed, 23 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js Log Message: ----------- fix: prevent language select render when modal close/resetting state Commit: 3de2681c66b48728ed4a814c2aed3433941635d0 https://github.com/zanata/zanata-platform/commit/3de2681c66b48728ed4a814c2aed3433941635d0 Author: efloden <eflo...@redhat.com> Date: 2018-05-23 (Wed, 23 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/antd.less Log Message: ----------- Merge branch 'ZNTA-2514' of github.com:zanata/zanata-platform into ZNTA-2514 Commit: e3a4d319a43265360367424717b54a4312b64236 https://github.com/zanata/zanata-platform/commit/e3a4d319a43265360367424717b54a4312b64236 Author: kgough <kgo...@redhat.com> Date: 2018-05-23 (Wed, 23 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js Log Message: ----------- refactor(ZNTA-2514) WIP: css fixes to TM Merge modal Commit: 0f6444f8da1d246f1111077bffe1b3811293d302 https://github.com/zanata/zanata-platform/commit/0f6444f8da1d246f1111077bffe1b3811293d302 Author: kgough <kgo...@redhat.com> Date: 2018-05-23 (Wed, 23 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js Log Message: ----------- refactor(ZNTA-2514) WIP: css fixes to TM Merge modal Commit: 8ec46c5e32ab4630aea559b4713452626eb52aab https://github.com/zanata/zanata-platform/commit/8ec46c5e32ab4630aea559b4713452626eb52aab Author: kgough <kgo...@redhat.com> Date: 2018-05-24 (Thu, 24 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js Log Message: ----------- refactor(ZNTA-2514) spacing in tm merge modal Commit: 7b88a66cb3e6bd78b98e73ed088a4417c2cfc841 https://github.com/zanata/zanata-platform/commit/7b88a66cb3e6bd78b98e73ed088a4417c2cfc841 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) change label colours and minor formatting of tm merge modal Commit: 7ac33f9d84b78695260356661545818d6ee94048 https://github.com/zanata/zanata-platform/commit/7ac33f9d84b78695260356661545818d6ee94048 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js Log Message: ----------- refactor(ZNTA-2514) minor formatting of tm merge modal Commit: 9adbab7c56978e4fc87b7ed0c2218c55d4d94b95 https://github.com/zanata/zanata-platform/commit/9adbab7c56978e4fc87b7ed0c2218c55d4d94b95 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js Log Message: ----------- refactor(ZNTA-2514) final styling fixes to tm merge modal Commit: 5e04a53b4f5ab7a63de14fa5265193bfe3e9c536 https://github.com/zanata/zanata-platform/commit/5e04a53b4f5ab7a63de14fa5265193bfe3e9c536 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx Log Message: ----------- refactor(ZNTA-2514) update failing frontend tests Commit: 02c8a21cbbd287e0479b846753a7e60ce002323b https://github.com/zanata/zanata-platform/commit/02c8a21cbbd287e0479b846753a7e60ce002323b Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/styles/antd.less Log Message: ----------- refactor(ZNTA-2514) fix modal padding Commit: 7a843361b7837206383c59e5798e4b90027d4e57 https://github.com/zanata/zanata-platform/commit/7a843361b7837206383c59e5798e4b90027d4e57 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M Jenkinsfile M api/pom.xml M api/zanata-common-api/pom.xml M build-tools/pom.xml M build-tools/src/main/resources/zanata-build-tools/detekt.yml M client/pom.xml M client/stub-server/pom.xml M client/zanata-cli/pom.xml M client/zanata-client-commands/pom.xml M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml M client/zanata-maven-plugin/demo-glossary/csv/pom.xml M client/zanata-maven-plugin/demo-glossary/delete/pom.xml M client/zanata-maven-plugin/pom.xml M client/zanata-rest-client/pom.xml M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java M common/pom.xml M common/zanata-adapter-glossary/pom.xml M common/zanata-adapter-po/pom.xml M common/zanata-adapter-properties/pom.xml M common/zanata-adapter-xliff/pom.xml M common/zanata-common-util/pom.xml M parent/pom.xml M pom.xml M server/functional-test/pom.xml M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java M server/gwt-editor/pom.xml M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java M server/gwt-shared/pom.xml M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java M server/gwt-test/pom.xml M server/pom.xml M server/security-common/pom.xml M server/services/pom.xml M server/services/src/main/java/org/zanata/ApplicationConfiguration.java M server/services/src/main/java/org/zanata/action/FrontendAssets.kt M server/services/src/main/java/org/zanata/action/FrontendManifest.kt M server/services/src/main/java/org/zanata/action/MergeTransAction.java M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java M server/services/src/main/java/org/zanata/action/UserAction.java M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java A server/services/src/main/java/org/zanata/config/ServerFromEmail.java A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java M server/services/src/main/java/org/zanata/email/EmailBuilder.java A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt A server/services/src/main/java/org/zanata/email/MessageBuilder.java A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java A server/services/src/main/java/org/zanata/email/sendEmail.kt A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java A server/services/src/main/java/org/zanata/file/DocumentStorage.java M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java A server/services/src/main/java/org/zanata/log4j/logger.kt M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java M server/services/src/main/java/org/zanata/security/SamlAttributes.kt M server/services/src/main/java/org/zanata/security/ZanataIdentity.java M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java A server/services/src/main/java/org/zanata/service/TranslationCounter.kt M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java M server/services/src/main/java/org/zanata/service/TranslationService.java M server/services/src/main/java/org/zanata/service/UserAccountService.java M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java R server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java M server/services/src/main/java/org/zanata/util/TranslationUtil.java M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml M server/services/src/main/resources/messages.properties M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java M server/services/src/test/java/org/zanata/ZanataJpaTest.java M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java A server/services/src/test/java/org/zanata/email/multipart.kt M server/services/src/test/java/org/zanata/model/DocumentJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java M server/services/src/test/java/org/zanata/rest/service/raw/ArquillianRest.kt M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java M server/services/src/test/resources/META-INF/persistence.xml M server/zanata-frontend/pom.xml M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/UserProfile/index.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.less M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/style.less M server/zanata-liquibase/pom.xml M server/zanata-model-test/pom.xml M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml M server/zanata-model/pom.xml A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java M server/zanata-model/src/main/java/org/zanata/model/HAccount.java M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt M server/zanata-model/src/main/java/org/zanata/model/HPerson.java M server/zanata-model/src/main/java/org/zanata/model/HProject.java M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java M server/zanata-test-war/pom.xml M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java M server/zanata-war/pom.xml M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml M server/zanata-war/src/main/webapp/admin/usermanager.xhtml M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: ca3dab05e3ee9261cf3c1229405c18e776a90d84 https://github.com/zanata/zanata-platform/commit/ca3dab05e3ee9261cf3c1229405c18e776a90d84 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) remove extra line from less file Commit: a1ab000b83bdfd2d3963f74b2472b0819582fc68 https://github.com/zanata/zanata-platform/commit/a1ab000b83bdfd2d3963f74b2472b0819582fc68 Author: kgough <kgo...@redhat.com> Date: 2018-05-25 (Fri, 25 May 2018) Changed paths: M Jenkinsfile M api/pom.xml M api/zanata-common-api/pom.xml M build-tools/pom.xml M build-tools/src/main/resources/zanata-build-tools/detekt.yml M client/pom.xml M client/stub-server/pom.xml M client/zanata-cli/pom.xml M client/zanata-client-commands/pom.xml M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableOptionsImpl.java M client/zanata-maven-plugin/demo-glossary/compendium/pom.xml M client/zanata-maven-plugin/demo-glossary/csv/pom.xml M client/zanata-maven-plugin/demo-glossary/delete/pom.xml M client/zanata-maven-plugin/pom.xml M client/zanata-rest-client/pom.xml M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java M common/pom.xml M common/zanata-adapter-glossary/pom.xml M common/zanata-adapter-po/pom.xml M common/zanata-adapter-properties/pom.xml M common/zanata-adapter-xliff/pom.xml M common/zanata-common-util/pom.xml M parent/pom.xml M pom.xml M server/functional-test/pom.xml M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt M server/functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java M server/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java M server/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java M server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java M server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java M server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java M server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java M server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java M server/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java M server/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java M server/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java M server/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java M server/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java M server/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java M server/functional-test/src/test/java/org/zanata/feature/language/comp/LanguageCTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/DatabaseDDLTest.java M server/functional-test/src/test/java/org/zanata/feature/misc/PageNotFoundTest.java M server/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java M server/functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java M server/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java M server/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/ExploreCTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/GroupSearchCTest.java M server/functional-test/src/test/java/org/zanata/feature/search/comp/LanguageSearchCTest.java M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java M server/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java M server/gwt-editor/pom.xml M server/gwt-editor/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenterTest.java M server/gwt-editor/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java M server/gwt-shared/pom.xml M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java M server/gwt-test/pom.xml M server/pom.xml M server/security-common/pom.xml M server/services/pom.xml M server/services/src/main/java/org/zanata/ApplicationConfiguration.java M server/services/src/main/java/org/zanata/action/FrontendAssets.kt M server/services/src/main/java/org/zanata/action/FrontendManifest.kt M server/services/src/main/java/org/zanata/action/MergeTransAction.java M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java M server/services/src/main/java/org/zanata/action/UserAction.java M server/services/src/main/java/org/zanata/action/VersionGroupJoinAction.java M server/services/src/main/java/org/zanata/adapter/TranslatableSeparator.kt M server/services/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java M server/services/src/main/java/org/zanata/config/DatabaseBackedConfig.java A server/services/src/main/java/org/zanata/config/ServerFromEmail.java A server/services/src/main/java/org/zanata/config/TMFuzzyBandsConfig.java M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java M server/services/src/main/java/org/zanata/dao/LocaleDAO.kt M server/services/src/main/java/org/zanata/dao/TextFlowDAO.java A server/services/src/main/java/org/zanata/email/AbstractEmailStrategy.java M server/services/src/main/java/org/zanata/email/EmailBuilder.java A server/services/src/main/java/org/zanata/email/HtmlEmailBuilder.kt A server/services/src/main/java/org/zanata/email/HtmlEmailSender.kt A server/services/src/main/java/org/zanata/email/HtmlEmailStrategy.kt A server/services/src/main/java/org/zanata/email/MailSessionProducer.kt A server/services/src/main/java/org/zanata/email/MessageBuilder.java A server/services/src/main/java/org/zanata/email/TMMergeEmailStrategy.kt M server/services/src/main/java/org/zanata/email/VelocityEmailStrategy.java A server/services/src/main/java/org/zanata/email/sendEmail.kt A server/services/src/main/java/org/zanata/exception/DeleteUserConstraintException.java A server/services/src/main/java/org/zanata/exception/handler/DeleteUserConstraintExceptionHandler.java A server/services/src/main/java/org/zanata/file/DocumentStorage.java M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java M server/services/src/main/java/org/zanata/i18n/MessagesFactory.java A server/services/src/main/java/org/zanata/log4j/logger.kt M server/services/src/main/java/org/zanata/rest/dto/VersionTMMerge.java M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java M server/services/src/main/java/org/zanata/security/SamlAttributes.kt M server/services/src/main/java/org/zanata/security/ZanataIdentity.java M server/services/src/main/java/org/zanata/service/TransMemoryMergeService.java A server/services/src/main/java/org/zanata/service/TranslationCounter.kt M server/services/src/main/java/org/zanata/service/TranslationMemoryService.java M server/services/src/main/java/org/zanata/service/TranslationService.java M server/services/src/main/java/org/zanata/service/UserAccountService.java M server/services/src/main/java/org/zanata/service/impl/EmailServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java R server/services/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java A server/services/src/main/java/org/zanata/service/tm/merge/TMBandDefs.kt A server/services/src/main/java/org/zanata/service/tm/merge/TMMergeResult.kt A server/services/src/main/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImpl.java M server/services/src/main/java/org/zanata/util/TransMemoryMergeStatusResolver.java M server/services/src/main/java/org/zanata/util/TranslationUtil.java M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml M server/services/src/main/resources/messages.properties M server/services/src/test/java/org/zanata/ApplicationConfigurationTest.java M server/services/src/test/java/org/zanata/ZanataJpaTest.java M server/services/src/test/java/org/zanata/action/FrontendAssetsTest.kt M server/services/src/test/java/org/zanata/adapter/OpenOfficeAdapterTest.java M server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java M server/services/src/test/java/org/zanata/dao/LocaleDAOTest.java M server/services/src/test/java/org/zanata/dao/ProjectDAOJPATest.java M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java A server/services/src/test/java/org/zanata/email/HtmlEmailBuilderTest.kt A server/services/src/test/java/org/zanata/email/TMBandDefsTest.kt M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java A server/services/src/test/java/org/zanata/email/multipart.kt M server/services/src/test/java/org/zanata/model/DocumentJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowJPATest.java M server/services/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsParamTest.java M server/services/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java M server/services/src/test/java/org/zanata/rest/service/raw/ArquillianRest.kt M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java M server/services/src/test/java/org/zanata/security/ZanataIdentityTest.java M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/GlossarySearchServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplJpaTest.java R server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java M server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java R server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java A server/services/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.kt M server/services/src/test/java/org/zanata/service/impl/UserAccountServiceImplTest.java A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplJpaTest.java A server/services/src/test/java/org/zanata/service/tm/merge/TransMemoryMergeServiceImplTest.java M server/services/src/test/java/org/zanata/util/TranslationUtilTest.java M server/services/src/test/java/org/zanata/validator/UsernameValidationTest.java M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java M server/services/src/test/resources/META-INF/persistence.xml M server/zanata-frontend/pom.xml M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/UserProfile/index.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.less M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/style.less M server/zanata-liquibase/pom.xml M server/zanata-model-test/pom.xml M server/zanata-model-test/src/main/java/org/zanata/test/EntityTestData.java M server/zanata-model-test/src/main/resources/org/zanata/test/model/AccountData.dbunit.xml M server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml M server/zanata-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml M server/zanata-model/pom.xml A server/zanata-model/src/main/java/org/zanata/model/Eraseable.java M server/zanata-model/src/main/java/org/zanata/model/HAccount.java M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt M server/zanata-model/src/main/java/org/zanata/model/HPerson.java M server/zanata-model/src/main/java/org/zanata/model/HProject.java M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java M server/zanata-model/src/main/java/org/zanata/model/ITextFlow.java M server/zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java M server/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java M server/zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java M server/zanata-test-war/pom.xml M server/zanata-test-war/src/main/java/org/zanata/util/SampleDataProfile.java M server/zanata-war/pom.xml M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml M server/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml M server/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml M server/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml M server/zanata-war/src/main/webapp/admin/usermanager.xhtml M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java M server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java Log Message: ----------- Merge branch 'ZNTA-2514' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: d25a21b56dbb9439982c8aaae5bf79f2d8a32b75 https://github.com/zanata/zanata-platform/commit/d25a21b56dbb9439982c8aaae5bf79f2d8a32b75 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-05-31 (Thu, 31 May 2018) Changed paths: M server/functional-test/pom.xml M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt M server/functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java M server/functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java M server/functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java A server/functional-test/src/test/resources/liquibase.properties M server/services/pom.xml M server/services/src/main/java/org/zanata/action/DashboardAction.java M server/services/src/main/java/org/zanata/dao/ProjectDAO.java M server/services/src/main/resources/messages.properties M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js M server/zanata-frontend/src/app/components/Button/Button.story.js M server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js M server/zanata-frontend/src/app/components/RejectionsForm/index.js M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/frontend-jsf.less M server/zanata-war/pom.xml M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml M server/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/delete_group_confirmation_modal.xhtml M server/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml M server/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml M server/zanata-war/src/main/webapp/iteration/view.xhtml M server/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: a0aa7d7159d05fb1171cf105c6ad1c84650bfab7 https://github.com/zanata/zanata-platform/commit/a0aa7d7159d05fb1171cf105c6ad1c84650bfab7 Author: kgough <kgo...@redhat.com> Date: 2018-06-01 (Fri, 01 Jun 2018) Changed paths: M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java M server/services/src/main/java/org/zanata/email/ContactAdminAnonymousEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java M server/services/src/main/java/org/zanata/email/ContactLanguageTeamMembersEmailStrategy.java M server/services/src/main/java/org/zanata/email/DeclineLanguageRequestEmailStrategy.java M server/services/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java M server/services/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java M server/services/src/main/java/org/zanata/rest/search/dto/GroupSearchResult.java M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java M server/services/src/main/java/org/zanata/security/SecurityFunctions.java M server/services/src/main/java/org/zanata/util/HtmlUtil.java A server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml M server/services/src/main/resources/db/db.changelog.xml M server/services/src/main/resources/org/zanata/email/templates/decline_language_team_request.vm M server/services/src/main/resources/org/zanata/email/templates/email_admin.vm M server/services/src/main/resources/org/zanata/email/templates/email_admin_anonymous.vm M server/services/src/main/resources/org/zanata/email/templates/email_coordinator.vm M server/services/src/main/resources/org/zanata/email/templates/email_language_team_members.vm M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm M server/services/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm M server/services/src/test/java/org/zanata/email/VelocityEmailStrategyTest.java M server/services/src/test/java/org/zanata/util/HtmlUtilTest.java M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx M server/zanata-model-test/src/main/resources/org/zanata/test/model/CopyVersionData.dbunit.xml M server/zanata-model-test/src/main/resources/org/zanata/test/model/GroupsTestData.dbunit.xml M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java Log Message: ----------- Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: 5f9b5a65cdadf772fd9635b33633936db75be376 https://github.com/zanata/zanata-platform/commit/5f9b5a65cdadf772fd9635b33633936db75be376 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M .gitignore M Jenkinsfile M build-tools/pom.xml M client/pom.xml M client/stub-server/pom.xml R docs/images/version-translation-settings.png M docs/user-guide/documents/upload-documents.md R docs/user-guide/review/review-enable.md M docs/user-guide/review/translation-review.md M docs/user-guide/versions/version-settings.md M mkdocs.yml M parent/pom.xml M server/gwt-shared/pom.xml M server/pom.xml M server/services/src/main/java/org/zanata/action/VersionHome.java M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java M server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java M server/services/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java M server/services/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java M server/services/src/main/resources/db/changelogs/db.changelog-4.6.xml M server/services/src/main/resources/messages.properties M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java M server/services/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java M server/services/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java M server/services/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap M server/zanata-frontend/src/app/actions/version-actions.js M server/zanata-frontend/src/app/components/Icons/Readme.md R server/zanata-frontend/src/app/components/Notification/Notification.story.js R server/zanata-frontend/src/app/components/Notification/component.js R server/zanata-frontend/src/app/components/Notification/index.js M server/zanata-frontend/src/app/components/components.story.js M server/zanata-frontend/src/app/components/index.js M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.jsx M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/PriorityDropdown.js M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js M server/zanata-frontend/src/app/editor/components/Suggestion.js M server/zanata-frontend/src/app/editor/components/TransUnitStatus.tsx M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js M server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js M server/zanata-frontend/src/app/editor/utils/phrase-util.ts M server/zanata-frontend/src/app/editor/utils/status-util.test.js M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js M server/zanata-frontend/src/app/editor/watchers/phrase-list.js M server/zanata-frontend/src/app/reducers/admin-reducer.js M server/zanata-frontend/src/app/reducers/admin-reducer.test.js M server/zanata-frontend/src/app/reducers/glossary-reducer.js M server/zanata-frontend/src/app/require-all.test.ts M server/zanata-frontend/src/app/utils/GlossaryHelper.js M server/zanata-frontend/src/app/utils/StringUtils.test.js M server/zanata-frontend/src/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-model-test/src/main/resources/performance/GetTransUnitListTest.dbunit.xml M server/zanata-model/src/main/java/org/zanata/model/HDocument.java M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java M server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml M server/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml M server/zanata-war/src/main/webapp/iteration/view.xhtml Log Message: ----------- Merge remote-tracking branch 'origin/master' into ZNTA-2514 Commit: 65efb9b0866898d8bf8859213e5adf5ad08e44e3 https://github.com/zanata/zanata-platform/commit/65efb9b0866898d8bf8859213e5adf5ad08e44e3 Author: kgough <kgo...@redhat.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/Languages/index.less M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/style.less Log Message: ----------- Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: d13c0481b2f76b87eba581a21dad740084da1e27 https://github.com/zanata/zanata-platform/commit/d13c0481b2f76b87eba581a21dad740084da1e27 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/Languages/index.less M server/zanata-frontend/src/app/editor/actions/header-actions.js M server/zanata-frontend/src/app/editor/actions/phrases-actions.js M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/style.less Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: c5b5d8018d969a43cfdfad1d40b6fa5c84355f23 https://github.com/zanata/zanata-platform/commit/c5b5d8018d969a43cfdfad1d40b6fa5c84355f23 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-12 (Tue, 12 Jun 2018) Changed paths: M Jenkinsfile M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java M build-tools/src/test/java/TestJenkinsfile.java M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java M common/pom.xml M common/zanata-adapter-glossary/pom.xml M common/zanata-adapter-po/pom.xml M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po M common/zanata-adapter-properties/pom.xml M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java M common/zanata-adapter-xliff/pom.xml M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf M parent/pom.xml M server/etc/scripts/configure-app-server.js M server/etc/scripts/runJbossCli.groovy M server/etc/scripts/types.d.ts M server/functional-test/pom.xml M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java M server/services/pom.xml M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java M server/services/src/main/java/org/zanata/adapter/TSAdapter.java M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java M server/services/src/main/java/org/zanata/dao/ProjectDAO.java M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java M server/services/src/main/java/org/zanata/rest/service/FileService.java M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java M server/services/src/main/java/org/zanata/service/TranslationFileService.java M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json M server/zanata-frontend/.gitignore M server/zanata-frontend/src/.gitignore M server/zanata-frontend/src/app/components/Nav/index.jsx M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js M server/zanata-frontend/src/app/editor/actions/phrases-actions.js M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js M server/zanata-frontend/src/app/editor/entrypoint/index.js M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js M server/zanata-frontend/src/index.html M server/zanata-model-test/pom.xml A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml M server/zanata-war/src/main/webapp/WEB-INF/liquibase M server/zanata-war/src/main/webapp/editor/index.xhtml M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java M server/zanata-war/src/test/resources/arquillian.xml A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po A server/zanata-war/src/test/resources/org/zanata/test-text.txt A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: 5c0299468c93dd5b5f62017482b811145557eabf https://github.com/zanata/zanata-platform/commit/5c0299468c93dd5b5f62017482b811145557eabf Author: Earl Floden <eflo...@redhat.com> Date: 2018-06-13 (Wed, 13 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/Admin/Review.js Log Message: ----------- fix: callstack error Commit: 5e3adbd0d9bfc5d0d24b24be14640c2dc3dc9832 https://github.com/zanata/zanata-platform/commit/5e3adbd0d9bfc5d0d24b24be14640c2dc3dc9832 Author: kgough <kgo...@redhat.com> Date: 2018-06-13 (Wed, 13 Jun 2018) Changed paths: M Jenkinsfile M api/zanata-common-api/src/main/java/org/zanata/common/ContentState.java M api/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java M api/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java M build-tools/src/test/java/TestJenkinsfile.java M client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java M client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/OfflinePoStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java M client/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullCommandTest.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/AbstractPullMojo.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullModuleMojo.java M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullSimpleMojo.java M client/zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java M client/zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java M client/zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java M common/pom.xml M common/zanata-adapter-glossary/pom.xml M common/zanata-adapter-po/pom.xml M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoWriter2Test.java A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeApprovedOnly.po A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeOfflinePo.po A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writePot.pot A common/zanata-adapter-po/src/test/resources/org/zanata/adapter/po/writeWithDefaultOptions.po M common/zanata-adapter-properties/pom.xml M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java R common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java A common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java M common/zanata-adapter-xliff/pom.xml M common/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java M common/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithApprovedOnly.xlf A common/zanata-adapter-xliff/src/test/resources/xliffTranslationsWithTranslated.xlf M parent/pom.xml M server/etc/scripts/configure-app-server.js M server/etc/scripts/runJbossCli.groovy M server/etc/scripts/types.d.ts M server/functional-test/pom.xml M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java M server/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/NavigationService.java M server/gwt-editor/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml M server/services/pom.xml M server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java M server/services/src/main/java/org/zanata/adapter/TSAdapter.java M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java M server/services/src/main/java/org/zanata/dao/ProjectDAO.java M server/services/src/main/java/org/zanata/file/DocumentUploadUtil.java M server/services/src/main/java/org/zanata/file/TranslationDocumentUpload.java M server/services/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java M server/services/src/main/java/org/zanata/rest/service/FileService.java M server/services/src/main/java/org/zanata/rest/service/ResourceUtils.java M server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java M server/services/src/main/java/org/zanata/service/TranslationFileService.java M server/services/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java M server/services/src/test/java/org/zanata/dao/ProjectDAOTest.java M server/services/src/test/java/org/zanata/rest/service/ProjectsServiceTest.java A server/services/src/test/java/org/zanata/test/model/ProjectsData.kt M server/services/src/test/resources/org/zanata/adapter/test-json-untranslated.json M server/zanata-frontend/.gitignore M server/zanata-frontend/src/.gitignore M server/zanata-frontend/src/app/components/Nav/index.jsx M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/editor/actions/header-actions.js M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js M server/zanata-frontend/src/app/editor/actions/phrases-actions.js M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js M server/zanata-frontend/src/app/editor/entrypoint/index.js M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js M server/zanata-frontend/src/index.html M server/zanata-model-test/pom.xml A server/zanata-model-test/src/main/java/org/zanata/test/assertj.kt M server/zanata-model-test/src/main/resources/org/zanata/test/model/ProjectsData.dbunit.xml A server/zanata-model-test/src/main/resources/org/zanata/test/model/TranslationResourceApprovedRestITCase.dbunit.xml M server/zanata-war/src/main/webapp/WEB-INF/liquibase M server/zanata-war/src/main/webapp/editor/index.xhtml M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeApproved.java A server/zanata-war/src/test/java/org/zanata/mock/MockTranslationMergeServiceFactory.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceApprovedRestITCase.java M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestITCase.java M server/zanata-war/src/test/resources/arquillian.xml A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated-updated.po A server/zanata-war/src/test/resources/org/zanata/test-gettext-translated.po A server/zanata-war/src/test/resources/org/zanata/test-gettext.pot A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.empty.po A server/zanata-war/src/test/resources/org/zanata/test-text-es.txt.po A server/zanata-war/src/test/resources/org/zanata/test-text.txt A server/zanata-war/src/test/resources/org/zanata/test-xliff-es-approved.xlf A server/zanata-war/src/test/resources/org/zanata/test-xliff-es.xlf A server/zanata-war/src/test/resources/org/zanata/test-xliff.xlf Log Message: ----------- Merge branch 'ZNTA-2514' of https://github.com/zanata/zanata-platform into ZNTA-2514 Commit: e5044349b560672da4acaf4d5eb30a83867ed6c7 https://github.com/zanata/zanata-platform/commit/e5044349b560672da4acaf4d5eb30a83867ed6c7 Author: kgough <kgo...@redhat.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/index.less M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) fix draggable pagel z-index Commit: e4a6fd6deebd23326f40eb7086c71c9d0a4e96b2 https://github.com/zanata/zanata-platform/commit/e4a6fd6deebd23326f40eb7086c71c9d0a4e96b2 Author: kgough <kgo...@redhat.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx M server/zanata-frontend/src/app/styles/ant-theme-vars.less Log Message: ----------- refactor(ZNTA-2514) fix padding of draggable panel content in TmMergeModal Commit: 5bde7f6fd8186d70f98e0fb492ecaca84a967758 https://github.com/zanata/zanata-platform/commit/5bde7f6fd8186d70f98e0fb492ecaca84a967758 Author: kgough <kgo...@redhat.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js Log Message: ----------- refactor(ZNTA-2514) update draggablepanels test Commit: 5d8c811f4eb72215e10008949d1cefb8da3140fe https://github.com/zanata/zanata-platform/commit/5d8c811f4eb72215e10008949d1cefb8da3140fe Author: kgough <kgo...@redhat.com> Date: 2018-06-14 (Thu, 14 Jun 2018) Changed paths: M server/functional-test/src/main/java/org/zanata/page/BasePage.java M server/services/src/main/resources/messages.properties M server/zanata-frontend/src/app/components/LogoLoader/index.less M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js M server/zanata-frontend/src/app/entrypoint/index.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/frontend-nav.less M server/zanata-frontend/src/app/styles/style.less M server/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml Log Message: ----------- refactor(ZNTA-2514) fix merge conflicts Commit: 8e8e287a7a6d513580e4ac4f6351c46ce755624d https://github.com/zanata/zanata-platform/commit/8e8e287a7a6d513580e4ac4f6351c46ce755624d Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M server/pom.xml M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js M server/zanata-frontend/src/app/styles/style.less Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: 1e1de54acde6cb1f8ea3a8b3cc6cf572151792a5 https://github.com/zanata/zanata-platform/commit/1e1de54acde6cb1f8ea3a8b3cc6cf572151792a5 Author: kgough <kgo...@redhat.com> Date: 2018-06-15 (Fri, 15 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/Glossary/Entry.js Log Message: ----------- fix(ZNTA-2514) remove unused LoaderText compont from glossary entry Commit: 72e511afaf5579c9611c0604713082f36bb2c0e2 https://github.com/zanata/zanata-platform/commit/72e511afaf5579c9611c0604713082f36bb2c0e2 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-18 (Mon, 18 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/Explore/index.less M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/containers/Glossary/index.less M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/styles/style.less Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: 187872a78b14fb57c24b496be2b908aa4c880b25 https://github.com/zanata/zanata-platform/commit/187872a78b14fb57c24b496be2b908aa4c880b25 Author: kgough <kgo...@redhat.com> Date: 2018-06-18 (Mon, 18 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js Log Message: ----------- refactor(ZNTA-2514) fix merge conflicts in tm merge modal Commit: 6bfd9a968427224cda92e5fbcefdcda165881cd9 https://github.com/zanata/zanata-platform/commit/6bfd9a968427224cda92e5fbcefdcda165881cd9 Author: efloden <eflo...@redhat.com> Date: 2018-06-18 (Mon, 18 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js Log Message: ----------- fix: projectSearchTermChanged function Commit: 38ac68996c9a610139a8b6aff38ffd8b65a63a5f https://github.com/zanata/zanata-platform/commit/38ac68996c9a610139a8b6aff38ffd8b65a63a5f Author: efloden <eflo...@redhat.com> Date: 2018-06-18 (Mon, 18 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js Log Message: ----------- refactor: remove unnecessary flushProjectSearch function (handled by ant search) Commit: 5d48ef28eaea22803a75d7a5881686316a5d7b74 https://github.com/zanata/zanata-platform/commit/5d48ef28eaea22803a75d7a5881686316a5d7b74 Author: efloden <eflo...@redhat.com> Date: 2018-06-18 (Mon, 18 Jun 2018) Changed paths: M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Admin/index.js Log Message: ----------- Merge branch 'master' of github.com:zanata/zanata-platform into ZNTA-2514 Commit: 81e565ee5c92f00a0c8391e59617e5201bd259e0 https://github.com/zanata/zanata-platform/commit/81e565ee5c92f00a0c8391e59617e5201bd259e0 Author: kgough <kgo...@redhat.com> Date: 2018-06-19 (Tue, 19 Jun 2018) Changed paths: M server/zanata-frontend/src/app/containers/Languages/Entry.js M server/zanata-frontend/src/app/containers/Languages/index.js Log Message: ----------- refactor(ZNTA-2514) fix functional tests, tag styling Commit: a094e6e349f301328849aba9597246734d304683 https://github.com/zanata/zanata-platform/commit/a094e6e349f301328849aba9597246734d304683 Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-19 (Tue, 19 Jun 2018) Changed paths: M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java M server/etc/scripts/configure-app-server.js M server/functional-test/src/main/java/org/zanata/page/CorePage.java M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js M server/zanata-frontend/src/app/editor/components/Button/index.css M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js M server/zanata-frontend/src/app/editor/components/IconButton/index.js M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js M server/zanata-frontend/src/app/editor/components/SelectButton/index.js M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js M server/zanata-frontend/src/app/editor/components/SettingOption/index.js M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js M server/zanata-frontend/src/app/editor/components/Validation/index.tsx M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js M server/zanata-frontend/src/app/editor/containers/NavHeader.js M server/zanata-frontend/src/app/editor/containers/Root/index.css M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js M server/zanata-frontend/src/app/editor/entrypoint/index.js M server/zanata-frontend/src/app/reducers/glossary-reducer.js M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/antd.less M server/zanata-frontend/src/app/utils/FeatureToggles.ts A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts A server/zanata-frontend/src/app/validators/ValidationAction.ts A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts A server/zanata-frontend/src/app/validators/ValidationMessages.ts A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js A server/zanata-frontend/src/app/validators/impl/TabValidation.ts A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts A server/zanata-frontend/src/app/validators/index.ts A server/zanata-frontend/src/app/validators/messages/en.json A server/zanata-frontend/src/app/validators/messages/fr.json A server/zanata-frontend/src/app/validators/messages/index.ts A server/zanata-frontend/src/app/validators/messages/ja.json M server/zanata-frontend/src/messages/ja.json M server/zanata-frontend/src/package.json M server/zanata-frontend/src/tsconfig.json M server/zanata-frontend/src/yarn.lock Log Message: ----------- Merge branch 'master' into ZNTA-2514 Commit: 68469343b4f2c5a4597da7515014e30c56f0486d https://github.com/zanata/zanata-platform/commit/68469343b4f2c5a4597da7515014e30c56f0486d Author: Kathryn Gough <kgo...@redhat.com> Date: 2018-06-19 (Tue, 19 Jun 2018) Changed paths: 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/EditableText/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/ProgressBar/CancellableProgressBar.js M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js M server/zanata-frontend/src/app/containers/Admin/Review.js M server/zanata-frontend/src/app/containers/Admin/index.js M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx M server/zanata-frontend/src/app/containers/Explore/index.js M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx M server/zanata-frontend/src/app/containers/Glossary/Entry.js M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js M server/zanata-frontend/src/app/containers/Glossary/Header.jsx M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js M server/zanata-frontend/src/app/containers/Glossary/index.js M server/zanata-frontend/src/app/containers/Glossary/index.less M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js M server/zanata-frontend/src/app/containers/Languages/Entry.js M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js M server/zanata-frontend/src/app/containers/Languages/index.js M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js M server/zanata-frontend/src/app/containers/ProjectVersion/index.less M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx M server/zanata-frontend/src/app/containers/UserProfile/index.less M server/zanata-frontend/src/app/styles/ant-theme-vars.less M server/zanata-frontend/src/app/styles/antd.less Log Message: ----------- Merge pull request #807 from zanata/ZNTA-2514 refactor(ZNTA-2514): react-bootstrap containers to antd Compare: https://github.com/zanata/zanata-platform/compare/47dc61cbf5b2...68469343b4f2 **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