Merge pull request #439 from nickago/MM-1822

MM-1822 Added help text to profile picture screen

web/react/components/setting_picture.jsx

@@ -48,6 +48,7 @@ module.exports = React.createClass({
             }
             confirmButton = <a className={confirmButtonClass} onClick={this.props.submit}>Save</a>;
         }
+        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({
                         <li className='setting-list-item'>
                             {img}
                         </li>
+                        <li className='setting-list-item'>
+                            {helpText}
+                        </li>
                         <li className='setting-list-item'>
                             {serverError}
                             {clientError}