Merge branch 'master' into post-metadata

.eslintrc.json

@@ -1,13 +1,16 @@
 {
  "extends": [
  "./node_modules/eslint-config-mattermost/.eslintrc.json",
- "./node_modules/eslint-config-mattermost/.eslintrc-react.json"
+ "./node_modules/eslint-config-mattermost/.eslintrc-react.json",
+ "plugin:cypress/recommended"
  ],
  "plugins": [
- "import"
+ "import",
+ "cypress"
  ],
  "env": {
- "jest": true
+ "jest": true,
+ "cypress/globals": true
  },
  "settings": {
  "import/resolver": "webpack",

.gitignore

@@ -8,4 +8,8 @@ node_modules
 tests/reports
 .DS_Store
 mattermost-webapp.iml
-.vscode/
+.vscode/
+
+# disable folders generated by Cypress
+cypress/screenshots
+cypress/videos

NOTICE.txt

@@ -212,6 +212,56 @@ THE SOFTWARE.
 
 ---
 
+## cypress
+
+This product contains 'cypress' by Cypress.
+
+Fast, easy and reliable testing for anything that runs in a browser.
+
+* HOMEPAGE:
+ * https://github.com/cypress-io/cypress
+
+* LICENSE: MIT
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Cypress.io, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+## eslint-plugin-cypress
+
+This product contains 'eslint-plugin-cypress' by Cypress.
+
+An ESLint plugin for projects that use Cypress
+
+* HOMEPAGE:
+ * https://github.com/cypress-io/eslint-plugin-cypress
+
+* LICENSE: MIT
+
+(No license text is stated in the homepage.)
+
+---
+
 ## exif2css
 
 This product contains 'exif2css' by Anton.
@@ -984,8 +1034,8 @@ THE SOFTWARE.
 
 ## Markdown
 
-Copyright © 2004, John Gruber 
-http:https://daringfireball.net/ 
+Copyright © 2004, John Gruber
+http:https://daringfireball.net/
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -1009,7 +1059,7 @@ Common code (API client, Redux stores, logic, utility functions) for building a
 
 * LICENSE: Apache-2.0
 
-Copyright 2015-present Mattermost, Inc. 
+Copyright 2015-present Mattermost, Inc.
 
  Apache License
  Version 2.0, January 2004

components/__snapshots__/setting_picture.test.jsx.snap

@@ -713,3 +713,140 @@ exports[`components/SettingItemMin should match snapshot, team icon on source 1`
  </li>
 </ul>
 `;
+
+exports[`components/SettingItemMin should match snapshot, user icon on source 1`] = `
+<ul
+ className="section-max form-horizontal"
+>
+ <li
+ className="col-xs-12 section-title"
+ >
+ Profile Picture
+ </li>
+ <li
+ className="col-xs-offset-3 col-xs-8"
+ >
+ <ul
+ className="setting-list"
+ >
+ <li
+ className="setting-list-item"
+ >
+ 
+ <div
+ className="profile-img__container"
+ >
+ <div
+ className="img-preview__image"
+ >
+ <img
+ alt="profile image"
+ className="profile-img"
+ src="http:https://localhost:8065/api/v4/users/src_id"
+ />
+ </div>
+ <OverlayTrigger
+ defaultOverlayShown={false}
+ delayShow={400}
+ overlay={
+ <Tooltip
+ bsClass="tooltip"
+ id="removeIcon"
+ placement="right"
+ >
+ <FormattedMessage
+ defaultMessage="Remove profile picture"
+ id="setting_picture.remove_profile_picture"
+ values={Object {}}
+ />
+ </Tooltip>
+ }
+ placement="right"
+ trigger={
+ Array [
+ "hover",
+ "focus",
+ ]
+ }
+ >
+ <a
+ className="profile-img__remove"
+ onClick={[Function]}
+ >
+ <span>
+ ×
+ </span>
+ </a>
+ </OverlayTrigger>
+ </div>
+ 
+ </li>
+ <li
+ className="setting-list-item padding-top x2"
+ >
+ <FormattedMessage
+ defaultMessage="Upload a picture in BMP, JPG or PNG format. Maximum file size: {max}"
+ id="setting_picture.help.profile"
+ values={
+ Object {
+ "max": "200MB",
+ }
+ }
+ />
+ </li>
+ <li
+ className="setting-list-item"
+ >
+ <hr />
+ <FormError
+ error={null}
+ errors={
+ Array [
+ "",
+ "",
+ ]
+ }
+ type="modal"
+ />
+ <div
+ className="btn btn-sm btn-primary btn-file sel-btn"
+ disabled={false}
+ >
+ <FormattedMessage
+ defaultMessage="Select"
+ id="setting_picture.select"
+ values={Object {}}
+ />
+ <input
+ accept=".jpg,.png,.bmp"
+ disabled={false}
+ onChange={[Function]}
+ type="file"
+ />
+ </div>
+ <a
+ className="btn btn-sm btn-inactive disabled"
+ onClick={[Function]}
+ >
+ <FormattedMessage
+ defaultMessage="Save"
+ id="setting_picture.save"
+ values={Object {}}
+ />
+ </a>
+ <a
+ className="btn btn-sm theme"
+ href="#"
+ onClick={[Function]}
+ >
+ <FormattedMessage
+ defaultMessage="Cancel"
+ id="setting_picture.cancel"
+ values={Object {}}
+ />
+ </a>
+ </li>
+ </ul>
+ </li>
+</ul>
+`;

components/admin_console/__snapshots__/message_export_settings.test.jsx.snap

@@ -4,15 +4,13 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
 <div
  className="wrapper--fixed"
 >
- <h3
- className="admin-console-header"
- >
+ <AdminHeader>
  <FormattedMessage
  defaultMessage="Compliance Export (Beta)"
  id="admin.complianceExport.title"
  values={Object {}}
  />
- </h3>
+ </AdminHeader>
  <form
  className="form-horizontal"
  onSubmit={[Function]}
@@ -185,15 +183,13 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
 <div
  className="wrapper--fixed"
 >
- <h3
- className="admin-console-header"
- >
+ <AdminHeader>
  <FormattedMessage
  defaultMessage="Compliance Export (Beta)"
  id="admin.complianceExport.title"
  values={Object {}}
  />
- </h3>
+ </AdminHeader>
  <form
  className="form-horizontal"
  onSubmit={[Function]}
@@ -476,15 +472,13 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
 <div
  className="wrapper--fixed"
 >
- <h3
- className="admin-console-header"
- >
+ <AdminHeader>
  <FormattedMessage
  defaultMessage="Compliance Export (Beta)"
  id="admin.complianceExport.title"
  values={Object {}}
  />
- </h3>
+ </AdminHeader>
  <form
  className="form-horizontal"
  onSubmit={[Function]}
@@ -657,15 +651,13 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
 <div
  className="wrapper--fixed"
 >
- <h3
- className="admin-console-header"
- >
+ <AdminHeader>
  <FormattedMessage
  defaultMessage="Compliance Export (Beta)"
  id="admin.complianceExport.title"
  values={Object {}}
  />
- </h3>
+ </AdminHeader>
  <form
  className="form-horizontal"
  onSubmit={[Function]}

components/admin_console/__snapshots__/schema_admin_settings.test.jsx.snap

@@ -38,14 +38,11 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
 <div
  className="wrapper--fixed"
 >
- <h3
- className="admin-console-header"
- >
- <FormattedMessage
- id="config"
- values={Object {}}
- />
- </h3>
+ <FormattedAdminHeader
+ defaultMessage="Configuration"
+ id="config"
+ values={Object {}}
+ />
  <form
  className="form-horizontal"
  onSubmit={[Function]}

components/admin_console/admin_settings.jsx

@@ -11,6 +11,8 @@ import SaveButton from 'components/save_button.jsx';
 import FormError from 'components/form_error.jsx';
 import Constants from 'utils/constants.jsx';
 
+import AdminHeader from 'components/widgets/admin_console/admin_header.jsx';
+
 export default class AdminSettings extends React.Component {
  static propTypes = {
 
@@ -190,9 +192,9 @@ export default class AdminSettings extends React.Component {
  render() {
  return (
  <div className='wrapper--fixed'>
- <h3 className='admin-console-header'>
+ <AdminHeader>
  {this.renderTitle()}
- </h3>
+ </AdminHeader>
  <form
  className='form-horizontal'
  role='form'

components/admin_console/audits/audits.jsx

@@ -10,6 +10,8 @@ import {localizeMessage} from 'utils/utils.jsx';
 import AuditTable from 'components/audit_table';
 import LoadingScreen from 'components/loading_screen.jsx';
 
+import AdminHeader from 'components/widgets/admin_console/admin_header.jsx';
+
 export default class Audits extends React.PureComponent {
  static propTypes = {
  isLicensed: PropTypes.bool.isRequired,
@@ -76,7 +78,7 @@ export default class Audits extends React.PureComponent {
  <ComplianceReports/>
 
  <div className='panel audit-panel'>
- <h3 className='admin-console-header'>
+ <AdminHeader>
  <FormattedMessage
  id='admin.audits.title'
  defaultMessage='User Activity Logs'
@@ -95,7 +97,7 @@ export default class Audits extends React.PureComponent {
  defaultMessage='Reload User Activity Logs'
  />
  </button>
- </h3>
+ </AdminHeader>
  <div className='audit-panel__table'>
  {content}
  </div>