From a90e4106c2fa380c39afe6f920bd85e82bb3b894 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 21 Aug 2015 07:44:21 -0700 Subject: [PATCH 1/8] Clarifying wording on upgrade instructions Also capitalizing "Docker" when it's in a sentence and not command. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 9e49cb8b0b..b0d369fd98 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Local Machine Setup (Docker) 3. When docker is done fetching the image, open http://localhost:8065/ in your browser. ### Arch ### -1. Install docker using the following commands: +1. Install Docker using the following commands: ``` bash pacman -S docker @@ -70,13 +70,13 @@ Local Machine Setup (Docker) newgrp docker ``` -2. Start docker container: +2. Start Docker container: ``` bash docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform ``` -3. When docker is done fetching the image, open http://localhost:8065/ in your browser. +3. When Docker is done fetching the image, open http://localhost:8065/ in your browser. ### Additional Notes ### - If you want to work with the latest master from the repository (i.e. not a stable release) you can run the cmd: @@ -85,7 +85,7 @@ Local Machine Setup (Docker) docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev ``` -- Instructions on how to update your docker image are found below. +- Instructions on how to update your Docker image are found below. - If you wish to remove mattermost-dev use: @@ -103,7 +103,7 @@ Local Machine Setup (Docker) AWS Elastic Beanstalk Setup (Docker) ------------------------------------ -1. Create a new elastic beanstalk docker application using the [Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json) file provided. +1. Create a new Elastic Beanstalk Docker application using the [Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json) file provided. 1. From the AWS console select Elastic Beanstalk. 2. Select "Create New Application" from the top right. 3. Name the application and press next. @@ -125,41 +125,41 @@ AWS Elastic Beanstalk Setup (Docker) Configuration Settings ---------------------- -There are a few configuration settings you might want to adjust when setting up your instance of Mattermost. You can edit them in [config/config.json](config/config.json) or [docker/0.6/config_docker.json](docker/0.6/config_docker.json) if you're running a docker instance. +There are a few configuration settings you might want to adjust when setting up your instance of Mattermost. You can edit them in [config/config.json](config/config.json) or [docker/0.6/config_docker.json](docker/0.6/config_docker.json) if you're running a Docker instance. * *EmailSettings*:*ByPassEmail* - If this is set to true, then users on the system will not need to verify their email addresses when signing up. In addition, no emails will ever be sent. * *ServiceSettings*:*UseLocalStorage* - If this is set to true, then your Mattermost server will store uploaded files in the storage directory specified by *StorageDirectory*. *StorageDirectory* must be set if *UseLocalStorage* is set to true. * *ServiceSettings*:*StorageDirectory* - The file path where files will be stored locally if *UseLocalStorage* is set to true. The operating system user that is running the Mattermost application must have read and write privileges to this directory. * *AWSSettings*:*S3*\* - If *UseLocalStorage* is set to false, and the S3 settings are configured here, then Mattermost will store files in the provided S3 bucket. -Upgrading Mattermost ---------------------- +Upgrading Mattermost Preview +---------------------------- ### Docker ### -To upgrade your docker image to the latest release (NOTE: this will destroy all data in the docker container): +To upgrade your Docker image to a preview of the latest stable release (NOTE: this will erase all data in the Docker container, including the database): -1. Stop your docker container by running: +1. Stop your Docker container by running: ``` bash docker stop mattermost-dev ``` -2. Delete your docker container by running: +2. Delete your Docker container by running: ``` bash docker rm mattermost-dev ``` -3. Update your docker image by running: +3. Update your Docker image by running: ``` bash docker pull mattermost/platform ``` -4. Start your docker container by running: +4. Start your Docker container by running: ``` bash docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform ``` -To upgrade to the latest master from the repository replace `mattermost/platform` with `mattermost/platform:dev` in the above instructions. +To upgrade to the latest development build on master from the repository replace `mattermost/platform` with `mattermost/platform:dev` in the instructions 3) and 4) above. Contributing ------------ From aaa0bb9d4dcaca0212a7bf1a7dc3dbd9b78fb6c5 Mon Sep 17 00:00:00 2001 From: nickago Date: Thu, 20 Aug 2015 17:02:47 -0700 Subject: [PATCH 2/8] Added help text to profile picture screen --- web/react/components/setting_picture.jsx | 4 ++++ web/templates/head.html | 2 ++ web/web.go | 2 ++ 3 files changed, 8 insertions(+) diff --git a/web/react/components/setting_picture.jsx b/web/react/components/setting_picture.jsx index e97b67706f..5b12ad7e9e 100644 --- a/web/react/components/setting_picture.jsx +++ b/web/react/components/setting_picture.jsx @@ -48,6 +48,7 @@ module.exports = React.createClass({ } confirmButton = Save; } + var helpText = 'Upload a profile picture in either JPG or PNG format, at least ' + config.ProfileWidth + 'px in width and ' + config.ProfileHeight + 'px height.' var self = this; return ( @@ -58,6 +59,9 @@ module.exports = React.createClass({
  • {img}
    • +
  • + {helpText} +
  • {serverError} {clientError} diff --git a/web/templates/head.html b/web/templates/head.html index 5448b09ed4..02904e7649 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -50,6 +50,8 @@ config = {}; } config.SiteName = '{{ .SiteName }}'; + config.ProfileWidth = '{{ .Props.ProfileWidth }}' + config.ProfileHeight = '{{ .Props.ProfileHeight }}' diff --git a/web/web.go b/web/web.go index d6f8d553b2..e449d2d3ab 100644 --- a/web/web.go +++ b/web/web.go @@ -30,6 +30,8 @@ func NewHtmlTemplatePage(templateName string, title string) *HtmlTemplatePage { props := make(map[string]string) props["AnalyticsUrl"] = utils.Cfg.ServiceSettings.AnalyticsUrl + props["ProfileHeight"] = fmt.Sprintf("%v", utils.Cfg.ImageSettings.ProfileHeight) + props["ProfileWidth"] = fmt.Sprintf("%v", utils.Cfg.ImageSettings.ProfileWidth) return &HtmlTemplatePage{TemplateName: templateName, Title: title, SiteName: utils.Cfg.ServiceSettings.SiteName, Props: props} } From 8230b49014481154af1c6c9c41944010f0fbec50 Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 21 Aug 2015 08:41:36 -0700 Subject: [PATCH 3/8] remove search term after the RHS is closed --- web/react/components/search_bar.jsx | 7 +++++++ web/react/components/search_results.jsx | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index e39cf5d46f..b11b39e9ed 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -47,6 +47,13 @@ module.exports = React.createClass({ results: null }); + AppDispatcher.handleServerAction({ + type: ActionTypes.RECIEVED_SEARCH_TERM, + term: null, + do_search: false, + is_mention_search: false + }); + AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_POST_SELECTED, results: null diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx index 643ad112b2..b1efd76854 100644 --- a/web/react/components/search_results.jsx +++ b/web/react/components/search_results.jsx @@ -23,6 +23,13 @@ var RhsHeaderSearch = React.createClass({ results: null }); + AppDispatcher.handleServerAction({ + type: ActionTypes.RECIEVED_SEARCH_TERM, + term: null, + do_search: false, + is_mention_search: false + }); + AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_POST_SELECTED, results: null From d3c5a30ab9ec9ebf6e495c31ef0955e7c31c6ca9 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 21 Aug 2015 23:12:26 +0500 Subject: [PATCH 4/8] MM-1989 - Hiding Cancel text in LHS that messes up the RHS --- web/sass-files/sass/partials/_headers.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 571c7ff1f1..c311941b6b 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -200,6 +200,9 @@ } } } + .search__clear { + display: none; + } } #navbar { From 65349d0259647bd163fbc80b78ee0dfb3622ceaf Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 21 Aug 2015 15:20:01 -0700 Subject: [PATCH 5/8] Added fullscreen capability to youtube embed --- web/react/utils/utils.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 09cd299df0..4571312bb8 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -271,11 +271,12 @@ function getYoutubeEmbed(link) { iframe.setAttribute('src', 'https://www.youtube.com/embed/' + div.id + - '?autoplay=1&autohide=1&border=0&wmode=opaque&enablejsapi=1'); + '?autoplay=1&autohide=1&border=0&wmode=opaque&fs=1&enablejsapi=1'); iframe.setAttribute('width', '480px'); iframe.setAttribute('height', '360px'); iframe.setAttribute('type', 'text/html'); iframe.setAttribute('frameborder', '0'); + iframe.setAttribute('allowfullscreen', 'allowfullscreen'); div.parentNode.replaceChild(iframe, div); } From e0724ceaf61781b0c77c918b7eb5ce93c7e74998 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 21 Aug 2015 22:17:07 -0700 Subject: [PATCH 6/8] Renaming "Feature Settings"->"Advanced Features" --- web/react/components/team_feature_tab.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/react/components/team_feature_tab.jsx b/web/react/components/team_feature_tab.jsx index ee0bfa8747..4f28d84c6d 100644 --- a/web/react/components/team_feature_tab.jsx +++ b/web/react/components/team_feature_tab.jsx @@ -133,10 +133,10 @@ module.exports = React.createClass({
    -

    Feature Settings

    +

    Advanced Features

    -

    Feature Settings

    +

    Advanced Features

    {valetSection}
    From 4920ca387f0c5e86161ce4c9700ffa8ca5c28a35 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 21 Aug 2015 22:19:48 -0700 Subject: [PATCH 7/8] Changing "Features"->"Advanced" in Team Settings Also changing order of menu items, so Advanced (least used) is at the bottom) --- web/react/components/team_settings_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx index c9f479a222..ef2564de05 100644 --- a/web/react/components/team_settings_modal.jsx +++ b/web/react/components/team_settings_modal.jsx @@ -27,8 +27,8 @@ module.exports = React.createClass({ }, render: function() { var tabs = []; - tabs.push({name: 'feature', uiName: 'Features', icon: 'glyphicon glyphicon-wrench'}); tabs.push({name: 'import', uiName: 'Import', icon: 'glyphicon glyphicon-upload'}); + tabs.push({name: 'feature', uiName: 'Advanced', icon: 'glyphicon glyphicon-wrench'}); return (