From 33a6608d26f9b762f35653c212fac73027f53a17 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 10 Sep 2015 11:20:23 -0700 Subject: [PATCH 1/5] Update README.md --- README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index de0f4b0793..3c9d5d408f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Mattermost is an open source, on-prem Slack-alternative. -It modernizes team communication without locking in your data to a single provider. Offer your end users messaging and file sharing across PCs and phones with archiving and instant search--without losing control of your data. +It offers modern communication from behind your firewall, including messaging and file sharing across PCs and phones with archiving and instant search. ## All team communication in one place, searchable and accessible anywhere @@ -26,12 +26,6 @@ Please see the [features pages of the Mattermost website](http://www.mattermost. - Attach sound, video and image files from mobile devices - Define team-specific branding and color themes across your devices -#### Enterprise Compatible - -- Self-host Mattermost entirely within your organization's insfrastructure -- GitLab Mattermost omnibus supports install to over 100,000 organizations using GitLab -- LDAP/Active Directory connectivity to Mattermost enabled via GitLab Single-Sign-On - ## Learn More - [Product Vision and Target Audiences](http://www.mattermost.org/vision/) - What we're solving and for whom are we building @@ -48,9 +42,9 @@ There are multiple ways to install Mattermost depending on your needs. #### Quick Start Install for Product Evaluation -- [Local Machine Install and Upgrade with Docker](doc/install/single-container-install.md) - Explore product functionality using a single-container Docker install on a local machine, including Mac OSX, Ubuntu, or Arch Linux). Optionally set up email and upgrade your instance using DockerHub. +- [Local Machine Install with Docker](doc/install/single-container-install.md) - Explore product functionality using a single-container Docker install on a local machine, including Mac OSX, Ubuntu, or Arch Linux). Optionally set up email and upgrade your instance using DockerHub. -- [AWS EBS Install and Upgrade with Docker](doc/install/aws-ebs-setup.md) - Explore product functionality using a single-container Docker install for Amazon Web Services Elastic Beanstalk. Optionally set up email and upgrade your instance using DockerHub. +- [AWS EBS Install with Docker](doc/install/aws-ebs-setup.md) - Explore product functionality using a single-container Docker install for Amazon Web Services Elastic Beanstalk. Optionally set up email and upgrade your instance using DockerHub. #### Development Install From ae8e9c3dfd0f8606064f29d56141b0b3fe35cdef Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 11 Sep 2015 11:41:16 +0500 Subject: [PATCH 2/5] Updating UI for modals and notification bar --- web/sass-files/sass/partials/_modal.scss | 3 ++- web/sass-files/sass/partials/_sidebar--left.scss | 2 +- web/templates/channel.html | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index d32306cbc4..a046cd9041 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -123,6 +123,7 @@ } .more-channel-table { margin: 0; + table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -154,7 +155,7 @@ &.td--action { text-align: right; padding: 8px 15px 8px 8px; - width: 70px; + width: 80px; vertical-align: middle; } } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 0a504b765a..63426dae9a 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -49,7 +49,7 @@ left: 0; right: 0; width: 72%; - color: #777; + color: #fff; background: #2389D7; @include border-radius(50px); margin: 0 auto; diff --git a/web/templates/channel.html b/web/templates/channel.html index 9bfd1fa35d..a732a25ced 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -52,6 +52,7 @@ From 83931da9f2b3eb5e8dc835313992c7ba2ea65f4a Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 11 Sep 2015 08:38:18 -0400 Subject: [PATCH 3/5] Fix load more posts bug. --- web/react/components/post.jsx | 2 +- web/react/components/post_list.jsx | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index 37de4ecc04..d3c6befd09 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -152,7 +152,7 @@ export default class Post extends React.Component { return (
{profilePic} diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 9d95887d97..e6aa3f8df3 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -189,9 +189,15 @@ export default class PostList extends React.Component { this.scrollToBottom(true); // the user clicked 'load more messages' - } else if (this.gotMorePosts) { - var lastPost = oldPosts[oldOrder[prevState.numToDisplay]]; - $('#' + lastPost.id)[0].scrollIntoView(); + } else if (this.gotMorePosts && oldOrder.length > 0) { + let index; + if (prevState.numToDisplay >= oldOrder.length) { + index = oldOrder.length - 1; + } else { + index = prevState.numToDisplay; + } + const lastPost = oldPosts[oldOrder[index]]; + $('#post_' + lastPost.id)[0].scrollIntoView(); this.gotMorePosts = false; } else { this.scrollTo(this.prevScrollTop); From bda09c0030caf0f271c362e194a9eb998e56539d Mon Sep 17 00:00:00 2001 From: lfbrock Date: Fri, 11 Sep 2015 09:35:05 -0400 Subject: [PATCH 4/5] Updated developer install instructions --- doc/install/dev-setup.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/install/dev-setup.md b/doc/install/dev-setup.md index a088bbbc2e..6d26cbd339 100644 --- a/doc/install/dev-setup.md +++ b/doc/install/dev-setup.md @@ -10,7 +10,7 @@ Developer Machine Setup 2. Get your Docker IP address with `boot2docker ip` 3. Add a line to your /etc/hosts that goes ` dockerhost` 4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile -2. Download Go from http://golang.org/dl/ +2. Download Go (version 1.4.2) from http://golang.org/dl/ 3. Set up your Go workspace 1. `mkdir ~/go` 2. Add the following to your ~/.bash_profile @@ -28,7 +28,7 @@ Developer Machine Setup `cd ~/go` `mkdir -p src/github.com/mattermost` `cd src/github.com/mattermost` - `git clone github.com/mattermost/platform.git` + `git clone https://github.com/mattermost/platform.git` `cd platform` 7. Run unit tests on Mattermost using `make test` to make sure the installation was successful 8. If tests passed, you can now run Mattermost using `make run` @@ -50,7 +50,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org `127.0.0.1 dockerhost` 3. Install build essentials 1. `apt-get install build-essential` -4. Download Go from http://golang.org/dl/ +4. Download Go (version 1.4.2) from http://golang.org/dl/ 5. Set up your Go workspace and add Go to the PATH 1. `mkdir ~/go` 2. Add the following to your ~/.bashrc @@ -74,7 +74,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org `cd ~/go` `mkdir -p src/github.com/mattermost` `cd src/github.com/mattermost` - `git clone github.com/mattermost/platform.git` + `git clone https://github.com/mattermost/platform.git` `cd platform` 9. Run unit tests on Mattermost using `make test` to make sure the installation was successful 10. If tests passed, you can now run Mattermost using `make run` From 560805321b85b61b98f064ff6d4fa34195686f18 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 11 Sep 2015 12:46:18 -0400 Subject: [PATCH 5/5] Change versioning to exact versions in package.json --- web/react/package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/web/react/package.json b/web/react/package.json index da55dc2b88..e557221524 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -3,22 +3,22 @@ "version": "0.0.1", "private": true, "dependencies": { - "autolinker": "^0.18.1", - "flux": "^2.1.1", - "keymirror": "^0.1.1", - "object-assign": "^3.0.0", - "react": "^0.13.3", - "react-zeroclipboard-mixin": "^0.1.0", - "twemoji": "^1.4.1" + "autolinker": "0.18.1", + "flux": "2.1.1", + "keymirror": "0.1.1", + "object-assign": "3.0.0", + "react": "0.13.3", + "react-zeroclipboard-mixin": "0.1.0", + "twemoji": "1.4.1" }, "devDependencies": { - "browserify": "^11.0.1", - "envify": "^3.4.0", - "babelify": "^6.1.3", - "uglify-js": "^2.4.24", - "watchify": "^3.3.1", - "eslint": "^1.3.1", - "eslint-plugin-react": "^3.3.1" + "browserify": "11.0.1", + "envify": "3.4.0", + "babelify": "6.1.3", + "uglify-js": "2.4.24", + "watchify": "3.3.1", + "eslint": "1.3.1", + "eslint-plugin-react": "3.3.1" }, "scripts": { "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx",