[zanata/zanata-platform] 4c7d1a: merge master
GitHub
noreply at github.com
Thu Aug 24 01:47:06 UTC 2017
Branch: refs/heads/ZNTA-2156-storybook
Home: https://github.com/zanata/zanata-platform
Commit: 4c7d1a62128418fc418a97ab03db7d625ebe192b
https://github.com/zanata/zanata-platform/commit/4c7d1a62128418fc418a97ab03db7d625ebe192b
Author: kgough <kgough at redhat.com>
Date: 2017-08-24 (Thu, 24 Aug 2017)
Changed paths:
M api/zanata-common-api/src/main/java/org/zanata/rest/service/AccountResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/AsynchronousProcessResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/CopyTransResource.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/GlossaryResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/LocalesResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectLocalesResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/RestResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/SourceDocResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/StatisticsResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslatedDocResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationMemoryResource.java
M api/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
M server/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/rest/JaxRSApplication.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
M server/services/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M server/services/src/main/java/org/zanata/rest/search/service/SearchService.java
M server/services/src/main/java/org/zanata/rest/service/AsyncProcessService.java
M server/services/src/main/java/org/zanata/security/UsernameLoggingFilter.java
M server/services/src/main/java/org/zanata/service/SearchService.java
R server/services/src/main/resources/META-INF/services/javax.annotation.processing.Processor
M server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/frontend/.storybook-editor/config.js
M server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/frontend/app/components/Link/index.js
M server/zanata-frontend/src/frontend/app/editor/actions/glossary-actions.js
M server/zanata-frontend/src/frontend/app/editor/api/index.js
M server/zanata-frontend/src/frontend/app/editor/api/suggestions.js
A server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js
A server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/ActivitySelectList.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/index.js
A server/zanata-frontend/src/frontend/app/editor/components/CommentBox/CommentBox.story.js
A server/zanata-frontend/src/frontend/app/editor/components/CommentBox/index.js
A server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
A server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.test.js
A server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/index.js
M server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
M server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
A server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/LanguageSelectList.story.js
A server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/index.js
A server/zanata-frontend/src/frontend/app/editor/components/SelectButton/SelectButton.story.js
A server/zanata-frontend/src/frontend/app/editor/components/SelectButton/index.js
A server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/SelectButtonList.story.js
A server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/index.js
M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
R server/zanata-frontend/src/frontend/app/editor/config/index.js
A server/zanata-frontend/src/frontend/app/editor/containers/ActivityTab.js
M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
M server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/SidebarContent.js
M server/zanata-frontend/src/frontend/app/editor/index.html
M server/zanata-frontend/src/frontend/app/editor/index.js
A server/zanata-frontend/src/frontend/app/editor/messages/en-us.json
A server/zanata-frontend/src/frontend/app/editor/messages/index.js
M server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.js
M server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.test.js
M server/zanata-frontend/src/frontend/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/frontend/app/editor/watchers/phrase-list.js
M server/zanata-frontend/src/frontend/app/styles/style.less
A server/zanata-frontend/src/frontend/build/messages/app/editor/components/ActivityFeedItem/index.json
A server/zanata-frontend/src/frontend/messages/README.md
A server/zanata-frontend/src/frontend/messages/en-us.json
M server/zanata-frontend/src/frontend/package.json
M server/zanata-frontend/src/frontend/webpack.config.js
M server/zanata-frontend/src/frontend/yarn.lock
M server/zanata-model/pom.xml
R server/zanata-model/src/main/java/org/zanata/util/JaxRSClassIndexProcessor.java
M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/webapp/editor/index.xhtml
M server/zanata-war/src/main/webapp/resources/assets/css/application.css
M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
M server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
Log Message:
-----------
merge master
Commit: 7596dfcf4b3ef1d91350f77b45d775c7f643a1fd
https://github.com/zanata/zanata-platform/commit/7596dfcf4b3ef1d91350f77b45d775c7f643a1fd
Author: kgough <kgough at redhat.com>
Date: 2017-08-24 (Thu, 24 Aug 2017)
Changed paths:
M server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
Log Message:
-----------
update snapshots for RejectTranslationsModal
Compare: https://github.com/zanata/zanata-platform/compare/ca0afcf8f447...7596dfcf4b3e
More information about the zanata-commits
mailing list