[zanata/zanata-platform] 487877: Merge branch 'master' into ZNTA-2340-glossary
GitHub
noreply at github.com
Mon Feb 26 02:46:17 UTC 2018
Branch: refs/heads/ZNTA-2340-glossary
Home: https://github.com/zanata/zanata-platform
Commit: 48787747972b1e012182dc84ce62859470ef248a
https://github.com/zanata/zanata-platform/commit/48787747972b1e012182dc84ce62859470ef248a
Author: Alex Eng <aeng at redhat.com>
Date: 2018-02-26 (Mon, 26 Feb 2018)
Changed paths:
A build-tools/src/main/resources/zanata-build-tools/versions-rules.xml
M parent/pom.xml
M server/docker/conf/zanata-config.cli
M server/gwt-editor/src/main/webapp/webtrans/Application.xhtml
M server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/TransReviewCriteria.java
M server/services/src/main/java/org/zanata/action/ActivateAction.java
A server/services/src/main/java/org/zanata/rest/editor/dto/ReviewData.java
A server/services/src/main/java/org/zanata/rest/editor/service/TranslationReviewService.java
A server/services/src/main/java/org/zanata/rest/editor/service/resource/TranslationReviewResource.java
M server/services/src/main/java/org/zanata/rest/review/ReviewService.java
M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
M server/services/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M server/services/src/main/resources/db/changelogs/db.changelog-4.5.xml
A server/services/src/test/java/org/zanata/action/ActivateActionTest.java
A server/services/src/test/java/org/zanata/adapter/AdapterUtilsTest.java
A server/services/src/test/java/org/zanata/rest/editor/dto/ReviewDataTest.java
A server/services/src/test/java/org/zanata/rest/editor/service/TranslationReviewServiceTest.java
M server/services/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello.css
M server/zanata-frontend/pom.xml
M server/zanata-frontend/src/.eslintrc
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
A server/zanata-frontend/src/.storybook-editor/preview-head.html
M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
M server/zanata-frontend/src/.yarnrc
M server/zanata-frontend/src/README.md
M server/zanata-frontend/src/app/actions/common-actions.js
M server/zanata-frontend/src/app/actions/explore-actions.js
M server/zanata-frontend/src/app/actions/glossary-actions.js
M server/zanata-frontend/src/app/actions/languages-actions.js
M server/zanata-frontend/src/app/actions/profile-actions.js
M server/zanata-frontend/src/app/actions/review-actions.js
M server/zanata-frontend/src/app/actions/tmx-actions.js
M server/zanata-frontend/src/app/actions/version-actions.js
M server/zanata-frontend/src/app/actions/version-actions.test.js
M server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
M server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
M server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
M server/zanata-frontend/src/app/components/EditableText/index.js
M server/zanata-frontend/src/app/components/Form/Form.story.js
M server/zanata-frontend/src/app/components/Icon/Icon.story.js
M server/zanata-frontend/src/app/components/Icons/index.jsx.src
M server/zanata-frontend/src/app/components/Link/Link.story.js
M server/zanata-frontend/src/app/components/Link/index.js
M server/zanata-frontend/src/app/components/Modal/Modal.story.js
M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
M server/zanata-frontend/src/app/components/Modal/index.jsx
M server/zanata-frontend/src/app/components/Nav/NavIcon.jsx
M server/zanata-frontend/src/app/components/Nav/NavItem.jsx
M server/zanata-frontend/src/app/components/Nav/index.jsx
M server/zanata-frontend/src/app/components/Notification/component.js
M server/zanata-frontend/src/app/components/Notification/index.js
M server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
M server/zanata-frontend/src/app/components/Panel/Panel.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/RejectionsForm/index.less
M server/zanata-frontend/src/app/components/SelectableDropdown/index.js
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/components/Table/Table.story.js
M server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
M server/zanata-frontend/src/app/components/TextInput/index.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
M server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
M server/zanata-frontend/src/app/components/foundation.story.js
M server/zanata-frontend/src/app/config.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/index.js
A server/zanata-frontend/src/app/containers/Admin/index.less
M server/zanata-frontend/src/app/containers/App.js
M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/index.js
M server/zanata-frontend/src/app/containers/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/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/Project/index.js
M server/zanata-frontend/src/app/containers/ProjectVersion/AboutPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.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.js
M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
M server/zanata-frontend/src/app/containers/Root.js
M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
M server/zanata-frontend/src/app/containers/UserProfile/ContributionChart.jsx
M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/editor/actions/controls-header-actions.js
M server/zanata-frontend/src/app/editor/actions/glossary-actions.js
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/key-shortcuts-actions.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/actions/phrases-filter-actions.js
A server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
A server/zanata-frontend/src/app/editor/actions/review-trans-actions.test.js
M server/zanata-frontend/src/app/editor/actions/settings-actions.js
M server/zanata-frontend/src/app/editor/actions/settings-actions.test.js
M server/zanata-frontend/src/app/editor/actions/suggestions-actions.js
M server/zanata-frontend/src/app/editor/api/index.js
M server/zanata-frontend/src/app/editor/api/suggestions.js
M server/zanata-frontend/src/app/editor/app.css
M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
M server/zanata-frontend/src/app/editor/components/ActivitySelectList/ActivitySelectList.story.js
M server/zanata-frontend/src/app/editor/components/Button/Button.story.js
M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
M server/zanata-frontend/src/app/editor/components/CommentBox/CommentBox.story.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
M server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
M server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
M server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/index.js
M server/zanata-frontend/src/app/editor/components/Dropdown/Dropdown.test.js
M server/zanata-frontend/src/app/editor/components/Dropdown/index.css
M server/zanata-frontend/src/app/editor/components/Dropdown/index.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.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/editor/components/GlossarySearchInput/index.js
M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
M server/zanata-frontend/src/app/editor/components/LanguageSelectList/LanguageSelectList.story.js
M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.js
M server/zanata-frontend/src/app/editor/components/Pager/index.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
M server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.story.js
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
A server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModalNoCrit.js
R server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.css
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
M server/zanata-frontend/src/app/editor/components/SelectButton/SelectButton.story.js
M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
M server/zanata-frontend/src/app/editor/components/SelectButtonList/SelectButtonList.story.js
M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
M server/zanata-frontend/src/app/editor/components/SettingOption/SettingOption.story.js
M server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
M server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
M server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionSearchInput/index.js
M server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.story.js
M server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.test.js
M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
M server/zanata-frontend/src/app/editor/components/ToggleSwitch/ToggleSwitch.test.js
M server/zanata-frontend/src/app/editor/components/TransUnit/index.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/TransUnitTranslationPanel.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/UiLanguageDropdown/UiLanguageDropdown.test.js
M server/zanata-frontend/src/app/editor/containers/ActivityTab.js
M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
M server/zanata-frontend/src/app/editor/containers/EditorHeader/index.js
M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
M server/zanata-frontend/src/app/editor/containers/KeyShortcutDispatcher.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/containers/NavHeader.js
M server/zanata-frontend/src/app/editor/containers/ParamPropDispatcher.js
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.js
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/CriteriaDropdown.test.js
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/PriorityDropdown.js
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/PriorityDropdown.test.js
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.css
A server/zanata-frontend/src/app/editor/containers/RejectTranslationModal/index.js
M server/zanata-frontend/src/app/editor/containers/Root/index.js
M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
M server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
M server/zanata-frontend/src/app/editor/containers/SidebarContent.js
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.js
M server/zanata-frontend/src/app/editor/containers/SuggestionsPanel.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/containers/ZanataLogoLoader.js
A server/zanata-frontend/src/app/editor/entrypoint/index.js
M server/zanata-frontend/src/app/editor/index.html
R server/zanata-frontend/src/app/editor/index.js
M server/zanata-frontend/src/app/editor/messages/index.js
M server/zanata-frontend/src/app/editor/middlewares/call-api.js
M server/zanata-frontend/src/app/editor/middlewares/index.js
M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
M server/zanata-frontend/src/app/editor/middlewares/title-update.js
M server/zanata-frontend/src/app/editor/reducers/context-reducer.js
M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
A server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
A server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
M server/zanata-frontend/src/app/editor/reducers/settings-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.test.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/RoutingHelpers.js
M server/zanata-frontend/src/app/editor/utils/Util.js
A server/zanata-frontend/src/app/editor/utils/reject-trans-util.ts
M server/zanata-frontend/src/app/editor/utils/status-util.js
M server/zanata-frontend/src/app/editor/watchers/page-number.js
M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
A server/zanata-frontend/src/app/entrypoint/index.js
A server/zanata-frontend/src/app/entrypoint/legacy.js
M server/zanata-frontend/src/app/history.js
R server/zanata-frontend/src/app/index.js
M server/zanata-frontend/src/app/jsf/JsfRoot.js
M server/zanata-frontend/src/app/jsf/index.js
R server/zanata-frontend/src/app/legacy.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
M server/zanata-frontend/src/app/reducers/common-reducer.js
M server/zanata-frontend/src/app/reducers/explore-reducer.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/reducers/index.js
M server/zanata-frontend/src/app/reducers/languages-reducer.js
M server/zanata-frontend/src/app/reducers/profile-reducer.js
M server/zanata-frontend/src/app/reducers/tmx-reducer.js
M server/zanata-frontend/src/app/reducers/version-reducer.js
M server/zanata-frontend/src/app/reducers/version-reducer.test.js
A server/zanata-frontend/src/app/require-all.test.js
M server/zanata-frontend/src/app/styles/style.less
M server/zanata-frontend/src/app/styles/variables.less
M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
M server/zanata-frontend/src/app/utils/RoutingHelpers.js
M server/zanata-frontend/src/app/utils/UrlHelper.js
M server/zanata-frontend/src/app/utils/callWithSameArgs.js
R server/zanata-frontend/src/build/messages/app/editor/components/ActivityFeedItem/index.json
M server/zanata-frontend/src/index.html
M server/zanata-frontend/src/messages/en-us.json
A server/zanata-frontend/src/messages/en.json
A server/zanata-frontend/src/messages/ja.json
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/scripts/codemods/story.template.js
M server/zanata-frontend/src/scripts/dev-server.config.js
M server/zanata-frontend/src/scripts/dev-server.js
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/src/main/java/org/zanata/model/ReviewCriteria.java
M server/zanata-war/src/main/webapp/WEB-INF/faces-config.xml
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/a/index.xhtml
M server/zanata-war/src/main/webapp/admin/create_user.xhtml
M server/zanata-war/src/main/webapp/admin/processmanager.xhtml
M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
M server/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M server/zanata-war/src/main/webapp/admin/rolerules.xhtml
M server/zanata-war/src/main/webapp/admin/search.xhtml
M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
M server/zanata-war/src/main/webapp/admin/stats.xhtml
M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
M server/zanata-war/src/main/webapp/editor/index.xhtml
M server/zanata-war/src/main/webapp/resources/assets/css/style.css
M server/zanata-war/src/main/webapp/resources/fontello/css/fontello.css
M server/zanata-war/src/main/webapp/tm/create.xhtml
M server/zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Merge branch 'master' into ZNTA-2340-glossary
More information about the zanata-commits
mailing list