Merge branch 'develop' into travis/better-room-sorting

src/components/views/context_menus/TopLeftMenu.js

@@ -26,7 +26,6 @@ export class TopLeftMenu extends React.Component {
     constructor() {
         super();
         this.viewHomePage = this.viewHomePage.bind(this);
-        this.viewWelcomePage = this.viewWelcomePage.bind(this);
         this.openSettings = this.openSettings.bind(this);
         this.signIn = this.signIn.bind(this);
         this.signOut = this.signOut.bind(this);
@@ -67,9 +66,6 @@ export class TopLeftMenu extends React.Component {
 
         return <div className="mx_TopLeftMenu">
             {homePageSection}
-            <ul className="mx_TopLeftMenu_section">
-                <li className="mx_TopLeftMenu_icon_welcome" onClick={this.viewWelcomePage}>{_t("Welcome")}</li>
-            </ul>
             <ul className="mx_TopLeftMenu_section">
                 <li className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>{_t("Settings")}</li>
             </ul>
@@ -82,11 +78,6 @@ export class TopLeftMenu extends React.Component {
         this.closeMenu();
     }
 
-    viewWelcomePage() {
-        dis.dispatch({action: 'view_welcome_page'});
-        this.closeMenu();
-    }
-
     openSettings() {
         dis.dispatch({action: 'view_user_settings'});
         this.closeMenu();

src/components/views/dialogs/RedesignFeedbackDialog.js

@@ -20,14 +20,12 @@ import { _t } from '../../../languageHandler';
 
 export default (props) => {
     const existingIssuesUrl = "https://github.com/vector-im/riot-web/issues" +
-        "?q=is%3Aopen+is%3Aissue+label%3Aredesign+sort%3Areactions-%2B1-desc";
-    const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new" +
-        "?assignees=&labels=redesign&template=redesign_issue.md&title=";
+        "?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
+    const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
 
     const description1 =
-        _t("Thanks for testing the Riot Redesign. " +
-            "If you run into any bugs or visual issues, " +
-            "please let us know on GitHub.");
+        _t("If you run into any bugs or have feedback you'd like to share, " +
+           "please let us know on GitHub.");
     const description2 = _t("To help avoid duplicate issues, " +
         "please <existingIssuesLink>view existing issues</existingIssuesLink> " +
         "first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> " +

src/components/views/elements/LazyRenderList.js

@@ -73,12 +73,6 @@ export default class LazyRenderList extends React.Component {
         }
     }
 
-    shouldComponentUpdate(nextProps, nextState) {
-        const itemsChanged = nextProps.items !== this.props.items;
-        const rangeChanged = nextState.renderRange !== this.state.renderRange;
-        return itemsChanged || rangeChanged;
-    }
-
     render() {
         const {itemHeight, items, renderItem} = this.props;
 

src/components/views/groups/GroupInviteTile.js

@@ -150,6 +150,7 @@ export default React.createClass({
         const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
             'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
             'mx_RoomTile_selected': this.state.selected,
+            'mx_GroupInviteTile': true,
         });
 
         return (

src/components/views/settings/tabs/HelpSettingsTab.js

@@ -126,6 +126,26 @@ export default class HelpSettingsTab extends React.Component {
         );
     }
 
+    _renderCredits() {
+        // Note: This is not translated because it is legal text.
+        // Also,   is ugly but necessary.
+        return (
+            <div className='mx_SettingsTab_section'>
+                <span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
+                <ul>
+                    <li>
+                        The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noopener" target="_blank">
+                        default cover photo</a> is (C)&nbsp;
+                        <a href="https://www.flickr.com/golan" rel="noopener" target="_blank">Jesús Roncero</a>&nbsp;
+                        used under the terms of&nbsp;
+                        <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noopener" target="_blank">
+                        CC-BY-SA 4.0</a>. No warranties are given.
+                    </li>
+                </ul>
+            </div>
+        );
+    }
+
     render() {
         let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
             'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noopener' target='_blank'>{sub}</a>,
@@ -211,6 +231,7 @@ export default class HelpSettingsTab extends React.Component {
                     </div>
                 </div>
                 {this._renderLegal()}
+                {this._renderCredits()}
                 <div className='mx_SettingsTab_section mx_HelpSettingsTab_versions'>
                     <span className='mx_SettingsTab_subheading'>{_t("Advanced")}</span>
                     <div className='mx_SettingsTab_subsectionText'>

src/components/views/verification/VerificationShowSas.js

@@ -140,7 +140,7 @@ _td("Light bulb");
 _td("Book");
 _td("Pencil");
 _td("Paperclip");
-_td("Scisors");
+_td("Scissors");
 _td("Padlock");
 _td("Key");
 _td("Hammer");