From fead69769dcf223ebd48f2c09f7b529c672a1c7f Mon Sep 17 00:00:00 2001 From: sexybern Date: Mon, 5 Oct 2015 13:12:17 +0100 Subject: [PATCH 1/2] Update prod-ubuntu.md --- doc/install/prod-ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/prod-ubuntu.md b/doc/install/prod-ubuntu.md index d2490062d0..0f1373c1a1 100644 --- a/doc/install/prod-ubuntu.md +++ b/doc/install/prod-ubuntu.md @@ -1,7 +1,7 @@ # Production Installation on Ubuntu 14.04 LTS -## Install Ubuntu Server 14.04 LTS -1. Set up 3 machines with Ubuntu 14.04 with 2GB of RAM or more. The servers will be used for the Load Balancer, Mattermost, and Database. +## Install Ubuntu Server (x64) 14.04 LTS +1. Set up 3 machines with Ubuntu 14.04 with 2GB of RAM or more. The servers will be used for the Load Balancer, Mattermost (this must be x64 to use pre-built binaries), and Database. 1. Make sure the system is up to date with the most recent security patches. * ``` sudo apt-get update``` * ``` sudo apt-get upgrade``` From 6d50c6b2f0ea5a88ee4337e62454c75aa93efdbd Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 5 Oct 2015 17:02:35 -0400 Subject: [PATCH 2/2] Fixed Get Public Link button --- web/react/components/view_image.jsx | 2 +- web/react/components/view_image_popover_bar.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index a7fecb6896..fe34034dc4 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -350,7 +350,7 @@ export default class ViewImageModal extends React.Component { totalFiles={this.props.filenames.length} filename={name} fileURL={fileUrl} - onGetPublicLinkPressed={this.getPublicLink} + getPublicLink={this.getPublicLink} /> {leftArrow} diff --git a/web/react/components/view_image_popover_bar.jsx b/web/react/components/view_image_popover_bar.jsx index 68817d751e..132212afb3 100644 --- a/web/react/components/view_image_popover_bar.jsx +++ b/web/react/components/view_image_popover_bar.jsx @@ -14,7 +14,7 @@ export default class ViewImagePopoverBar extends React.Component { href='#' className='public-link text' data-title='Public Image' - onClick={this.getPublicLink} + onClick={this.props.getPublicLink} > {'Get Public Link'} @@ -62,5 +62,5 @@ ViewImagePopoverBar.propTypes = { totalFiles: React.PropTypes.number.isRequired, filename: React.PropTypes.string.isRequired, fileURL: React.PropTypes.string.isRequired, - onGetPublicLinkPressed: React.PropTypes.func.isRequired + getPublicLink: React.PropTypes.func.isRequired };