From 25fdacd46a4dc5f5166607777bbbcfd3cea87a63 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 13 Nov 2015 11:59:15 +0500 Subject: [PATCH 1/5] UI changes for Direct messages and Bad connection --- config/config.json | 2 +- web/react/components/more_direct_channels.jsx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/config.json b/config/config.json index a927620b5c..dc35a369d0 100644 --- a/config/config.json +++ b/config/config.json @@ -9,7 +9,7 @@ "EnableOutgoingWebhooks": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableTesting": false, + "EnableTesting": true, "EnableSecurityFixAlert": true }, "TeamSettings": { diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx index 40deb37f28..d1265f67eb 100644 --- a/web/react/components/more_direct_channels.jsx +++ b/web/react/components/more_direct_channels.jsx @@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component { handleFilterChange() { const filter = ReactDOM.findDOMNode(this.refs.filter).value; + if ($(window).width() > 768) { + $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0); + } + if (filter !== this.state.filter) { this.setState({filter}); } From e16faf45de24898b250227833d20d154e4d9c0c8 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 13 Nov 2015 12:21:43 +0500 Subject: [PATCH 2/5] Updating bad connection css --- config/config.json | 2 +- web/sass-files/sass/partials/_post.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/config.json b/config/config.json index dc35a369d0..a927620b5c 100644 --- a/config/config.json +++ b/config/config.json @@ -9,7 +9,7 @@ "EnableOutgoingWebhooks": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableTesting": true, + "EnableTesting": false, "EnableSecurityFixAlert": true }, "TeamSettings": { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 36f6f445ee..ae02ccb4cb 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -16,7 +16,8 @@ } .bad-connection { - background-color: rgb(255, 255, 172) !important; + background: #ffffac !important; + color: #D04444 !important; } .textarea-div { From 4ac553020515abb572e80e724ce76c6324c75d40 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Fri, 13 Nov 2015 11:02:00 -0500 Subject: [PATCH 3/5] Added null check when accessing post text --- web/react/components/post_attachment.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/react/components/post_attachment.jsx b/web/react/components/post_attachment.jsx index 2d6b47f03d..cf65dfbfb2 100644 --- a/web/react/components/post_attachment.jsx +++ b/web/react/components/post_attachment.jsx @@ -50,7 +50,8 @@ export default class PostAttachment extends React.Component { } shouldCollapse() { - return (this.props.attachment.text.match(/\n/g) || []).length >= 5 || this.props.attachment.text.length > 700; + const text = this.props.attachment.text || ''; + return (text.match(/\n/g) || []).length >= 5 || text.length > 700; } getCollapsedText() { @@ -292,4 +293,4 @@ export default class PostAttachment extends React.Component { PostAttachment.propTypes = { attachment: React.PropTypes.object.isRequired -}; \ No newline at end of file +}; From 91bc13f9c38e79d31fca6799d774d9d2c1bb9214 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 13 Nov 2015 14:00:57 -0500 Subject: [PATCH 4/5] Update Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af4a6ae62..74c5b52081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,7 +89,7 @@ System Console ### Compatibility - IE 11 new minimum version for IE, since IE 10 share fell below 5% on desktop -- Safari 8 new minimum version for Safari, since Safari 7 fell below 1% on desktop +- Safari 9 new minimum version for Safari, since Safari 7 and 8 fell below 1% each on desktop #### Config.json Changes from v1.1 to v1.2 From cd82de18f5c47f1dcc0e6e31af9d17c1ff0b1136 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 13 Nov 2015 14:12:29 -0500 Subject: [PATCH 5/5] Updating dockerfile for release v1.2.0 --- docker/1.2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/1.2/Dockerfile b/docker/1.2/Dockerfile index 0e4e3e2428..cb2b58f539 100644 --- a/docker/1.2/Dockerfile +++ b/docker/1.2/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.2.0-rc2/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.2.0/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh /