diff options
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/admin_console/privacy_settings.jsx | 2 | ||||
-rw-r--r-- | web/react/components/sidebar.jsx | 8 | ||||
-rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 2 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 4 | ||||
-rw-r--r-- | web/react/utils/text_formatting.jsx | 2 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx index 61393f1c6..78747d9f2 100644 --- a/web/react/components/admin_console/privacy_settings.jsx +++ b/web/react/components/admin_console/privacy_settings.jsx @@ -132,7 +132,7 @@ export default class PrivacySettings extends React.Component { /> {'false'} </label> - <p className='help-text'>{'When false, hides full name of users from other users including team owner and team administrators.'}</p> + <p className='help-text'>{'When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.'}</p> </div> </div> diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 22056bf29..cc2279b57 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -378,6 +378,13 @@ export default class Sidebar extends React.Component { ); } + var icon = null; + if (channel.type === 'O') { + icon = <div className='status'><i className='fa fa-globe'></i></div>; + } else if (channel.type === 'P') { + icon = <div className='status'><i className='fa fa-lock'></i></div>; + } + // set up click handler to switch channels (or create a new channel for non-existant ones) var handleClick = null; var href = '#'; @@ -461,6 +468,7 @@ export default class Sidebar extends React.Component { href={href} onClick={handleClick} > + {icon} {status} {channel.display_name} {badge} diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 55242ca7f..b7d90922a 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -92,7 +92,7 @@ export default class CustomThemeChooser extends React.Component { > <img width='200' - src={'/static/images/themes/code_themes/' + theme[element.id] + 'Large.png'} + src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'} /> </Popover> ); diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 7c1a1297f..014038dd4 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -9,6 +9,7 @@ import UserStore from '../../stores/user_store.jsx'; import ErrorStore from '../../stores/error_store.jsx'; import * as Client from '../../utils/client.jsx'; +import Constants from '../../utils/constants.jsx'; import * as AsyncClient from '../../utils/async_client.jsx'; import * as Utils from '../../utils/utils.jsx'; @@ -156,6 +157,9 @@ export default class UserSettingsGeneralTab extends React.Component { if (picture.type !== 'image/jpeg' && picture.type !== 'image/png') { this.setState({clientError: 'Only JPG or PNG images may be used for profile pictures.'}); return; + } else if (picture.size > Constants.MAX_FILE_SIZE) { + this.setState({clientError: 'Unable to upload profile image. File is too large.'}); + return; } var formData = new FormData(); diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index f0bd46f9d..e837ded53 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -256,7 +256,7 @@ function autolinkHashtags(text, tokens) { return prefix + alias; } - return output.replace(/(^|\W)(#[a-zA-Z][a-zA-Z0-9.\-_]*)\b/g, replaceHashtagWithToken); + return output.replace(/(^|\W)(#[a-zA-ZäöüÄÖÜß][a-zA-Z0-9äöüÄÖÜß.\-_]*)\b/g, replaceHashtagWithToken); } const puncStart = /^[.,()&$!\[\]{}':;\\]+/; diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index b12ce5881..2ade00d29 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -544,7 +544,7 @@ export function applyTheme(theme) { changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1); changeCss('.sidebar--left .nav-pills__container li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1); changeCss('.sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText, 1); - changeCss('.sidebar--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1); + changeCss('.sidebar--left .status path', 'fill:' + theme.sidebarText, 1); changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2); } |