Branch: refs/heads/damason/advanced-search/ZNTA-975
Home: https://github.com/zanata/zanata-platform
Commit: 28cdac1673a18817dea47100654607193982a648
https://github.com/zanata/zanata-platform/commit/28cdac1673a18817dea47100654607193982a648
Author: Alex Eng <a...@redhat.com>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M Jenkinsfile
Log Message:
-----------
fix: reduce threshold for java warnings (#474)
Commit: 52da6e309b5e4d55617ef0f2ba0d34fe4796373d
https://github.com/zanata/zanata-platform/commit/52da6e309b5e4d55617ef0f2ba0d34fe4796373d
Author: Earl Floden <eflo...@redhat.com>
Date: 2017-08-10 (Thu, 10 Aug 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/components/index.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
Log Message:
-----------
feat(ZNTA-2116): Implement TriCheckbox component into TM Merge Modal (#462)
Squash merge for ZNTA-2116 PR #462
* feat(ZNTA-2116): Implement tri-checkbox component into TM Merge Modal
Only implemented for selecting source project versions to merge as other
checkboxes are subject to change following UI review
* feat(ZNTA-2116): Apply to all checkboxes in TM Merge Modal
Commit: d995af9c19528e9b765e03c4a6751edf79352ebe
https://github.com/zanata/zanata-platform/commit/d995af9c19528e9b765e03c4a6751edf79352ebe
Author: Alex Eng <a...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M server/zanata-war/src/main/webapp/resources/assets/css/application.css
Log Message:
-----------
fix: use default scrollbar in gwt editor (#475)
https://zanata.atlassian.net/browse/ZNTA-2091
Commit: 51ea3384ba916c6fee737f8bba3dab91a8e58648
https://github.com/zanata/zanata-platform/commit/51ea3384ba916c6fee737f8bba3dab91a8e58648
Author: Alex Eng <a...@redhat.com>
Date: 2017-08-15 (Tue, 15 Aug 2017)
Changed paths:
M server/services/src/main/java/org/zanata/dao/AbstractDAOImpl.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/PersonDAO.java
M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
M server/zanata-frontend/src/frontend/app/actions/explore-actions.js
Log Message:
-----------
fix: handles special char for explore search (#476)
https://zanata.atlassian.net/browse/ZNTA-2129
Commit: 5d2486c2efd1131d66067ad1052e153dec16371c
https://github.com/zanata/zanata-platform/commit/5d2486c2efd1131d66067ad1052e153dec16371c
Author: Alex Eng <a...@redhat.com>
Date: 2017-08-15 (Tue, 15 Aug 2017)
Changed paths:
M
server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
M
server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
M
server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStats.java
M server/services/src/main/java/org/zanata/action/DashboardAction.java
M server/services/src/main/java/org/zanata/action/ProjectHome.java
M server/services/src/main/java/org/zanata/action/UserSettingsAction.java
M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
M server/services/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M server/services/src/main/java/org/zanata/seam/text/SeamTextParser.java
M
server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
server/services/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
M server/services/src/main/java/org/zanata/util/QueryBuilder.java
M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M
server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.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/Request.java
M server/zanata-model/src/main/java/org/zanata/model/WebHook.java
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
Log Message:
-----------
fix: remove unused method and imports (#481)
Commit: 30b993a7f6b380db6fa7cd6e654f44bfc6b09653
https://github.com/zanata/zanata-platform/commit/30b993a7f6b380db6fa7cd6e654f44bfc6b09653
Author: David Mason <drdma...@gmail.com>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
A
server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/frontend/.storybook-editor/addons.js
M server/zanata-frontend/src/frontend/.storybook-editor/config.js
A
server/zanata-frontend/src/frontend/.storybook-editor/storyshots-editor.test.js
A server/zanata-frontend/src/frontend/.storybook-editor/storyshots-util.js
A
server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/frontend/.storybook-frontend/config.js
A
server/zanata-frontend/src/frontend/.storybook-frontend/storyshots-frontend.test.js
A server/zanata-frontend/src/frontend/__mocks__/cssMock.js
A server/zanata-frontend/src/frontend/__mocks__/mockAngularGettext.js
R server/zanata-frontend/src/frontend/__tests__/mock/cssMock.js
R server/zanata-frontend/src/frontend/__tests__/mock/mockAngularGettext.js
M server/zanata-frontend/src/frontend/app/components/Icon/Icon.story.js
M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
M
server/zanata-frontend/src/frontend/app/components/Notification/Notification.story.js
M
server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/Button/Button.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js
M
server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter/TransUnitFilter.test.js
A server/zanata-frontend/src/frontend/jest.config.js
R server/zanata-frontend/src/frontend/jest.config.json
M server/zanata-frontend/src/frontend/package.json
M server/zanata-frontend/src/frontend/yarn.lock
Log Message:
-----------
Activate storybook addons (ZNTA-2119) (#478)
This activates some storybook addons:
- host: allows sizing and positioning of the storybook container to better
present the component
- info: shows story code, props details and optional notes
- knobs: allows changing story input values in a story
- storyshots: renders each storybook as a snapshot test, which produces a test
failure when components render different markup.
Squashed merge of the following:
* chore(ZNTA-2119): add storybook info addon
Includes example usage on editor <Button> component.
* chore(ZNTA-2119): add storybook host addon
Host addon allows positioning the element and providing a specific
size of context to display the component in, as well as a few other
decorations.
* chore(ZNTA-2119): add storybook knobs addon
Includes a button builder story that demonstrates use of the knobs
addon.
* chore(ZNTA-2119): add storyshots
This required several changes to jest and storybook config to have
the storyshots tests execute without errors.
It also includes some cleanup in some of the storybooks and components
that were generating errors or warnings in tests.
* chore(ZNTA-2119): add initial component snapshots
Generated by storyshots.
Note that these are large files with snapshots for all the components
that have stories. This is not ideal, but there is a pull request in
progress for storyshots that will change this so that snapshots are
stored in the component directory, which will make more sense.
See: https://github.com/storybooks/storybook/pull/1584
* chore(ZNTA-2119): clean up jest mocks
* feat(ZNTA-2119): remove commented-out lines
* feat(ZNTA-2119): fix test failure due to missing TriCheckbox snapshots
Snapshots cannot be written in CI builds, so missing snapshots will fail tests.
Commit: 342f4b388208115e86ad976cc4dba9bfc49f66d6
https://github.com/zanata/zanata-platform/commit/342f4b388208115e86ad976cc4dba9bfc49f66d6
Author: David Mason <drdma...@gmail.com>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
M Jenkinsfile
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/KeyShortcutPresenter.java
M
server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStats.java
M server/services/src/main/java/org/zanata/action/DashboardAction.java
M server/services/src/main/java/org/zanata/action/ProjectHome.java
M server/services/src/main/java/org/zanata/action/UserSettingsAction.java
M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
M server/services/src/main/java/org/zanata/dao/AbstractDAOImpl.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/PersonDAO.java
M server/services/src/main/java/org/zanata/dao/ProjectDAO.java
M server/services/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M server/services/src/main/java/org/zanata/dao/VersionGroupDAO.java
M server/services/src/main/java/org/zanata/seam/text/SeamTextParser.java
M
server/services/src/main/java/org/zanata/service/impl/RequestServiceImpl.java
M
server/services/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
M server/services/src/main/java/org/zanata/util/QueryBuilder.java
M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M
server/services/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M
server/services/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
A
server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/frontend/.storybook-editor/addons.js
M server/zanata-frontend/src/frontend/.storybook-editor/config.js
A
server/zanata-frontend/src/frontend/.storybook-editor/storyshots-editor.test.js
A server/zanata-frontend/src/frontend/.storybook-editor/storyshots-util.js
A
server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/frontend/.storybook-frontend/config.js
A
server/zanata-frontend/src/frontend/.storybook-frontend/storyshots-frontend.test.js
A server/zanata-frontend/src/frontend/__mocks__/cssMock.js
A server/zanata-frontend/src/frontend/__mocks__/mockAngularGettext.js
R server/zanata-frontend/src/frontend/__tests__/mock/cssMock.js
R server/zanata-frontend/src/frontend/__tests__/mock/mockAngularGettext.js
M server/zanata-frontend/src/frontend/app/actions/explore-actions.js
M server/zanata-frontend/src/frontend/app/components/Icon/Icon.story.js
M server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
M
server/zanata-frontend/src/frontend/app/components/Notification/Notification.story.js
M
server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js
M server/zanata-frontend/src/frontend/app/components/index.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionOptions.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
M
server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
M
server/zanata-frontend/src/frontend/app/editor/components/Button/Button.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
M
server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js
M
server/zanata-frontend/src/frontend/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
A server/zanata-frontend/src/frontend/jest.config.js
R server/zanata-frontend/src/frontend/jest.config.json
M server/zanata-frontend/src/frontend/package.json
M server/zanata-frontend/src/frontend/yarn.lock
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/Request.java
M server/zanata-model/src/main/java/org/zanata/model/WebHook.java
M server/zanata-war/src/main/webapp/resources/assets/css/application.css
M
server/zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
Log Message:
-----------
Merge branch 'master' into damason/advanced-search/ZNTA-975
Conflicts:
server/zanata-frontend/src/frontend/package.json
Additions and version updates for dependencies in
both branches, kept all additions and the highest
versions.
The yarn.lock file was regenerated based on the version from
master, but was identical to the lock file merged by git so
no additional commit is needed for yarn.lock. It is generally
safer to regenerate yarn.lock rather than let git merge it.
Compare:
https://github.com/zanata/zanata-platform/compare/b254d2e99363...342f4b388208_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits
