Merge branch 'develop' into start-in-tray

3 files changed, 8 insertions, 4 deletions

diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 83a05554b..e0b608b96 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -91,7 +91,7 @@ export default @observer class ImageUpload extends Component {
               onDrop={this.onDrop.bind(this)}
               className={cssClasses}
               multiple={multiple}
-              accept="image/jpeg, image/png"
+              accept="image/jpeg, image/png, image/svg+xml"
             >
               <i className="mdi mdi-file-image" />
               <p>
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 5f729844b..7930d98b4 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -11,7 +11,8 @@ import { matchRoute } from '../../helpers/routing-helpers';
 // TODO: create container component for this component
 export default @inject('stores') @observer class Link extends Component {
   onClick(e) {
-    if (this.props.target === '_blank') {
+    if (this.props.disabled) e.preventDefault();
+    else if (this.props.target === '_blank') {
       e.preventDefault();
       shell.openExternal(this.props.to);
     }
@@ -39,6 +40,7 @@ export default @inject('stores') @observer class Link extends Component {
     const linkClasses = classnames({
       [`${className}`]: true,
       [`${activeClassName}`]: match,
+      'is-disabled': this.props.disabled,
     });
 
     return (
@@ -68,12 +70,14 @@ Link.wrappedComponent.propTypes = {
   strictFilter: PropTypes.bool,
   target: PropTypes.string,
   style: PropTypes.object,
+  disabled: PropTypes.bool,
 };
 
 Link.wrappedComponent.defaultProps = {
   className: '',
   activeClassName: '',
   strictFilter: false,
+  disabled: false,
   target: '',
   style: {},
 };
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 923f10327..c58d69374 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -10,7 +10,7 @@ import styles from './styles';
 const messages = defineMessages({
   loading: {
     id: 'service.webviewLoader.loading',
-    defaultMessage: '!!!Loading',
+    defaultMessage: '!!!Loading {service}',
   },
 });
 
@@ -30,7 +30,7 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon
     return (
       <FullscreenLoader
         className={classes.component}
-        title={`${intl.formatMessage(messages.loading)} ${name}`}
+        title={`${intl.formatMessage(messages.loading, { service: name })}`}
       />
     );
   }