From c0b20a1a627e491dee217c483745a446cd67e35d Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 14 Feb 2017 16:56:52 +0530 Subject: [PATCH 1/3] Github issue#619, Dashboard: comment post overflowing container -- Fixed --- src/components/ActionCard/ActionCard.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/ActionCard/ActionCard.scss b/src/components/ActionCard/ActionCard.scss index 6b8a57410..673c2c0f4 100644 --- a/src/components/ActionCard/ActionCard.scss +++ b/src/components/ActionCard/ActionCard.scss @@ -140,6 +140,7 @@ border-radius: 4px; padding: $base-unit*2; margin-bottom: -10px; + width: calc(100% - 40px); &:before { content: ''; @@ -166,6 +167,8 @@ font-size: 13px; color: #47474f; line-height: $base-unit*4; + width: 100%; + overflow-x: auto; } .comment-read-more { From 11c92d691aad6eff10166b3a64583576e21e023b Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 1 Mar 2017 11:21:38 +0530 Subject: [PATCH 2/3] Github issue#625, Project 908: Dashboard stuck in infinite loop -- copy change --- src/components/Feed/FeedComments.jsx | 2 +- src/components/MessageDetails/MessageDetails.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Feed/FeedComments.jsx b/src/components/Feed/FeedComments.jsx index 082699b8c..8e7db9009 100644 --- a/src/components/Feed/FeedComments.jsx +++ b/src/components/Feed/FeedComments.jsx @@ -70,7 +70,7 @@ class FeedComments extends React.Component { Date: Wed, 1 Mar 2017 16:06:40 +0530 Subject: [PATCH 3/3] Github issue#623, Allow comments for System generated messages / status updates. -- Done, now any team member of the project can comment on even system posts --- src/projects/detail/containers/FeedContainer.js | 4 ++-- src/projects/detail/containers/MessagesContainer.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/projects/detail/containers/FeedContainer.js b/src/projects/detail/containers/FeedContainer.js index f2b60bd31..1e4c9f24c 100644 --- a/src/projects/detail/containers/FeedContainer.js +++ b/src/projects/detail/containers/FeedContainer.js @@ -81,12 +81,12 @@ class FeedView extends React.Component { mapFeed(feed, showAll = false, resetNewComment = false) { const { allMembers } = this.props const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error']) + // Github issue##623, allow comments on all posts (including system posts) + item.allowComments = true if (isSystemUser(item.userId)) { item.user = SYSTEM_USER - item.allowComments = false } else { item.user = allMembers[item.userId] - item.allowComments = true } item.unread = !feed.read // item.html = posts[feed.postIds[0]].body diff --git a/src/projects/detail/containers/MessagesContainer.js b/src/projects/detail/containers/MessagesContainer.js index 44fdc238a..dc459f7ff 100644 --- a/src/projects/detail/containers/MessagesContainer.js +++ b/src/projects/detail/containers/MessagesContainer.js @@ -91,12 +91,12 @@ class MessagesView extends React.Component { const { allMembers } = this.props const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error']) item.isActive = isActive + // Github issue##623, allow comments on all posts (including system posts) + item.allowComments = true if (isSystemUser(item.userId)) { item.user = SYSTEM_USER - item.allowComments = false } else { item.user = allMembers[item.userId] - item.allowComments = true } item.unread = !feed.read // item.html = posts[feed.postIds[0]].body