Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

doc/install/Production-Ubuntu.md

@@ -1,7 +1,7 @@
 # Production Installation on Ubuntu 14.04 LTS
 
-## Install Ubuntu Server 14.04 LTS
+## 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, and Database.
+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```

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}
                         />
                     </div>
                     {leftArrow}

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'}
                     </a>
@@ -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
 };