diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-13 14:15:32 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-13 14:15:32 -0500 |
| commit | f0b1adf6cfaf0f2825b514d2c5e132ebf583652b (patch) | |
| tree | 0bdb4439993b44f7106436b23e7ee015093b1769 | |
| parent | c5c96082c5b076d4776e18503d9317cdaeb6066c (diff) | |
| parent | cd82de18f5c47f1dcc0e6e31af9d17c1ff0b1136 (diff) | |
| download | chat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.tar.gz chat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.tar.bz2 chat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.zip | |
Merge release branch 'release-1.2'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | docker/1.2/Dockerfile | 2 | ||||
| -rw-r--r-- | web/react/components/more_direct_channels.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/post_attachment.jsx | 5 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af4a6ae6..74c5b5208 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 diff --git a/docker/1.2/Dockerfile b/docker/1.2/Dockerfile index 0e4e3e242..cb2b58f53 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 / diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx index 40deb37f2..d1265f67e 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}); } diff --git a/web/react/components/post_attachment.jsx b/web/react/components/post_attachment.jsx index 2d6b47f03..cf65dfbfb 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 +}; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index ef30cb213..45b7b7f23 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 { |