Branch: refs/heads/ZNTA-2224
Home: https://github.com/zanata/zanata-platform
Commit: 750450e84ca1d764bc6781fefe18f4d185212aef
https://github.com/zanata/zanata-platform/commit/750450e84ca1d764bc6781fefe18f4d185212aef
Author: kgough <kgo...@redhat.com>
Date: 2017-10-13 (Fri, 13 Oct 2017)
Changed paths:
M
server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/CommentBox/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
M
server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css
M
server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js
M
server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
M server/zanata-frontend/src/frontend/app/editor/containers/ActivityTab.js
M
server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
M
server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js
M
server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
M
server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
M
server/zanata-frontend/src/frontend/app/editor/containers/TranslationInfoPanel/index.js
Log Message:
-----------
fix(ZNTA-2224) more consistency with edtor css classes, fix merge conflicts
Commit: 10b360b086b31cde7f5319ce74f565e8e8f73d40
https://github.com/zanata/zanata-platform/commit/10b360b086b31cde7f5319ce74f565e8e8f73d40
Author: kgough <kgo...@redhat.com>
Date: 2017-10-13 (Fri, 13 Oct 2017)
Log Message:
-----------
Merge branch 'ZNTA-2224' of https://github.com/zanata/zanata-platform into
ZNTA-2224
Compare:
https://github.com/zanata/zanata-platform/compare/d5f0aa24fc46...10b360b086b3
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits