From 3ff628254d41908b5224f5d1caec92caf3b9191c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Jul 2017 15:56:40 +0100
Subject: [PATCH 01/88] CSS for group userlist

---
 src/components/structures/RightPanel.js | 98 ++++++++++++++-----------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 6c5c1fe1..f3c16021 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import sdk from 'matrix-react-sdk';
@@ -33,19 +32,21 @@ module.exports = React.createClass({
     propTypes: {
         userId: React.PropTypes.string, // if showing an orphaned MemberInfo page, this is set
         roomId: React.PropTypes.string, // if showing panels for a given room, this is set
+        groupId: React.PropTypes.string, // if showing panels for a given group, this is set
         collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel
     },
 
     Phase: {
-        MemberList: 'MemberList',
+        RoomMemberList: 'RoomMemberList',
+        GroupMemberList: 'GroupMemberList',
         FilePanel: 'FilePanel',
         NotificationPanel: 'NotificationPanel',
-        MemberInfo: 'MemberInfo',
+        RoomMemberInfo: 'RoomMemberInfo',
     },
 
     componentWillMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         cli.on("RoomState.members", this.onRoomStateMember);
     },
 
@@ -58,21 +59,25 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         if (this.props.userId) {
-            var member = new Matrix.RoomMember(null, this.props.userId);
+            const member = new Matrix.RoomMember(null, this.props.userId);
             return {
-                phase: this.Phase.MemberInfo,
+                phase: this.Phase.RoomMemberInfo,
                 member: member,
             };
+        } else if (this.props.groupId) {
+            return {
+                phase: this.Phase.GroupMemberList
+            };
         } else {
             return {
-                phase: this.Phase.MemberList
+                phase: this.Phase.RoomMemberList
             };
         }
     },
 
     onMemberListButtonClick: function() {
         Analytics.trackEvent('Right Panel', 'Member List Button', 'click');
-        this.setState({ phase: this.Phase.MemberList });
+        this.setState({ phase: this.Phase.RoomMemberList });
     },
 
     onFileListButtonClick: function() {
@@ -106,10 +111,10 @@ module.exports = React.createClass({
 
     onRoomStateMember: function(ev, state, member) {
         // redraw the badge on the membership list
-        if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
+        if (this.state.phase == this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
             this._delayedUpdate();
         }
-        else if (this.state.phase === this.Phase.MemberInfo && member.roomId === this.props.roomId &&
+        else if (this.state.phase === this.Phase.RoomMemberInfo && member.roomId === this.props.roomId &&
                 member.userId === this.state.member.userId) {
             // refresh the member info (e.g. new power level)
             this._delayedUpdate();
@@ -127,39 +132,45 @@ module.exports = React.createClass({
             });
             if (payload.member) {
                 this.setState({
-                    phase: this.Phase.MemberInfo,
+                    phase: this.Phase.RoomMemberInfo,
                     member: payload.member,
                 });
-            }
-            else {
-                this.setState({
-                    phase: this.Phase.MemberList
-                });
+            } else {
+                if (this.props.roomId) {
+                    this.setState({
+                        phase: this.Phase.RoomMemberList
+                    });
+                } else if (this.props.groupId) {
+                    this.setState({
+                        phase: this.Phase.GroupMemberList
+                    });
+                }
             }
         }
         else if (payload.action === "view_room") {
-            if (this.state.phase === this.Phase.MemberInfo) {
+            if (this.state.phase === this.Phase.RoomMemberInfo) {
                 this.setState({
-                    phase: this.Phase.MemberList
+                    phase: this.Phase.RoomMemberList
                 });
             }
         }
     },
 
     render: function() {
-        var MemberList = sdk.getComponent('rooms.MemberList');
-        var NotificationPanel = sdk.getComponent('structures.NotificationPanel');
-        var FilePanel = sdk.getComponent('structures.FilePanel');
-        var TintableSvg = sdk.getComponent("elements.TintableSvg");
-        var buttonGroup;
-        var inviteGroup;
-        var panel;
+        const MemberList = sdk.getComponent('rooms.MemberList');
+        const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
+        const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
+        const FilePanel = sdk.getComponent('structures.FilePanel');
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        let buttonGroup;
+        let inviteGroup;
+        let panel;
 
-        var filesHighlight;
-        var membersHighlight;
-        var notificationsHighlight;
+        let filesHighlight;
+        let membersHighlight;
+        let notificationsHighlight;
         if (!this.props.collapsed) {
-            if (this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) {
+            if (this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo) {
                 membersHighlight = <div className="mx_RightPanel_headerButton_highlight"></div>;
             }
             else if (this.state.phase == this.Phase.FilePanel) {
@@ -170,11 +181,11 @@ module.exports = React.createClass({
             }
         }
 
-        var membersBadge;
-        if ((this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) && this.props.roomId) {
-            var cli = MatrixClientPeg.get();
-            var room = cli.getRoom(this.props.roomId);
-            var user_is_in_room;
+        let membersBadge;
+        if ((this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo) && this.props.roomId) {
+            const cli = MatrixClientPeg.get();
+            const room = cli.getRoom(this.props.roomId);
+            let user_is_in_room;
             if (room) {
                 membersBadge = room.getJoinedMembers().length;
                 user_is_in_room = room.hasMembershipState(
@@ -224,17 +235,16 @@ module.exports = React.createClass({
         }
 
         if (!this.props.collapsed) {
-            if(this.props.roomId && this.state.phase == this.Phase.MemberList) {
+            if (this.props.roomId && this.state.phase == this.Phase.RoomMemberList) {
                 panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />
-            }
-            else if(this.state.phase == this.Phase.MemberInfo) {
-                var MemberInfo = sdk.getComponent('rooms.MemberInfo');
+            } else if (this.props.groupId && this.state.phase == this.Phase.GroupMemberList) {
+                panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />
+            } else if(this.state.phase == this.Phase.RoomMemberInfo) {
+                const MemberInfo = sdk.getComponent('rooms.MemberInfo');
                 panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.props.userId} />
-            }
-            else if (this.state.phase == this.Phase.NotificationPanel) {
+            } else if (this.state.phase == this.Phase.NotificationPanel) {
                 panel = <NotificationPanel />
-            }
-            else if (this.state.phase == this.Phase.FilePanel) {
+            } else if (this.state.phase == this.Phase.FilePanel) {
                 panel = <FilePanel roomId={this.props.roomId} />
             }
         }
@@ -243,7 +253,7 @@ module.exports = React.createClass({
             panel = <div className="mx_RightPanel_blank"></div>;
         }
 
-        var classes = "mx_RightPanel mx_fadable";
+        let classes = "mx_RightPanel mx_fadable";
         if (this.props.collapsed) {
             classes += " collapsed";
         }

From 6bfdd692790becbd1b9560c82a1279aac8e322ab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 31 Jul 2017 12:08:41 +0100
Subject: [PATCH 02/88] add devtools dialog

---
 .../views/dialogs/DevtoolsDialog.js           | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/components/views/dialogs/DevtoolsDialog.js

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
new file mode 100644
index 00000000..c4248fa9
--- /dev/null
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -0,0 +1,206 @@
+/*
+Copyright 2017 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import sdk from 'matrix-react-sdk';
+import Modal from 'matrix-react-sdk/lib/Modal';
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+
+class SendCustomEvent extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onFinished: React.PropTypes.func.isRequired,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this._send = this._send.bind(this);
+        this.onCancel = this.onCancel.bind(this);
+    }
+
+    async _send() {
+        try {
+            const content = JSON.parse(this.refs.evContent.value);
+            await MatrixClientPeg.get().sendEvent(this.refs.roomId.value, this.refs.eventType.value, content);
+            this.props.onFinished(true);
+        } catch (e) {
+            this.props.onFinished(false);
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+            Modal.createDialog(ErrorDialog, {
+                title: 'Failed to send custom event',
+                description: e.toString(),
+            });
+        }
+    }
+
+    onCancel() {
+        this.props.onFinished(false);
+    }
+
+    render() {
+        return <div>
+            <div className="mx_Dialog_content">
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="roomId"> Room ID </label>
+                </div>
+                <div>
+                    <input id="roomId" ref="roomId" className="mx_TextInputDialog_input" defaultValue={this.props.roomId} size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="eventType"> Event Type </label>
+                </div>
+                <div>
+                    <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="evContent"> Event Content </label>
+                </div>
+                <div>
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} size="64" />
+                </div>
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this._send}>Send</button>
+                <button onClick={this.onCancel}>Cancel</button>
+            </div>
+        </div>;
+    }
+}
+
+class SendCustomStateEvent extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onFinished: React.PropTypes.func.isRequired,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this._send = this._send.bind(this);
+        this.onCancel = this.onCancel.bind(this);
+    }
+
+    async _send() {
+        try {
+            const content = JSON.parse(this.refs.evContent.value);
+            await MatrixClientPeg.get().sendStateEvent(this.refs.roomId.value, this.refs.eventType.value, content, this.refs.stateKey.value);
+            this.props.onFinished(true);
+        } catch (e) {
+            this.props.onFinished(false);
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+            Modal.createDialog(ErrorDialog, {
+                title: 'Failed to send custom event',
+                description: e.toString(),
+            });
+        }
+    }
+
+    onCancel() {
+        this.props.onFinished(false);
+    }
+
+    render() {
+        return <div>
+            <div className="mx_Dialog_content">
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="roomId"> Room ID </label>
+                </div>
+                <div>
+                    <input id="roomId" ref="roomId" className="mx_TextInputDialog_input" defaultValue={this.props.roomId} size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="stateKey"> State Key </label>
+                </div>
+                <div>
+                    <input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="eventType"> Event Type </label>
+                </div>
+                <div>
+                    <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="evContent"> Event Content </label>
+                </div>
+                <div>
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} size="64" />
+                </div>
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this._send}>Send</button>
+                <button onClick={this.onCancel}>Cancel</button>
+            </div>
+        </div>;
+    }
+}
+
+export default class DevtoolsDialog extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onFinished: React.PropTypes.func.isRequired,
+    };
+
+    state = {
+        mode: null,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this.onCancel = this.onCancel.bind(this);
+    }
+
+    componentWillUnmount() {
+        this._unmounted = true;
+    }
+
+    _setMode(mode) {
+        return () => {
+            this.setState({ mode });
+        };
+    }
+
+    onCancel() {
+        this.props.onFinished(false);
+    }
+
+    render() {
+        let body;
+
+        if (this.state.mode) {
+            body = <this.state.mode {...this.props} />;
+        } else {
+            body = <div>
+                <div className="mx_Dialog_content">
+                    <button onClick={this._setMode(SendCustomEvent)}>Send Custom Event</button>
+                    <button onClick={this._setMode(SendCustomStateEvent)}>Send Custom State Event</button>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onCancel}>Cancel</button>
+                </div>
+            </div>;
+        }
+
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        return <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title="Developer Tools">
+            { body }
+        </BaseDialog>;
+    }
+}

From 131d1c74c996253bdf444a9482fffc23dba21e74 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2017 00:59:40 +0100
Subject: [PATCH 03/88] add room state explorer to devtools

---
 .../views/dialogs/DevtoolsDialog.js           | 91 ++++++++++++++++++-
 1 file changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index c4248fa9..9a518fd0 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -152,6 +152,89 @@ class SendCustomStateEvent extends React.Component {
     }
 }
 
+class RoomStateExplorer extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onFinished: React.PropTypes.func.isRequired,
+        onBack: React.PropTypes.func.isRequired,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+
+        this.onBack = this.onBack.bind(this);
+    }
+
+    state = {
+        eventType: null,
+    };
+
+    browseEventType(eventType) {
+        const self = this;
+        return () => {
+            self.setState({ eventType });
+        };
+    }
+
+    onViewSourceClick(ev) {
+        const ViewSource = sdk.getComponent('structures.ViewSource');
+        return () => {
+            Modal.createDialog(ViewSource, {
+                content: ev,
+            }, 'mx_Dialog_viewsource');
+        };
+    }
+
+    onBack() {
+        if (this.state.eventType === null) {
+            this.props.onBack();
+        } else {
+            this.setState({ eventType: null });
+        }
+    }
+
+    render() {
+        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+        const roomStateEvents = room.currentState.events;
+
+        const rows = [];
+
+        if (this.state.eventType === null) {
+            Object.keys(roomStateEvents).forEach((evType) => {
+                const stateGroup = roomStateEvents[evType];
+                const keys = Object.keys(stateGroup);
+
+                if (keys.length > 1) {
+                    rows.push(<button key={evType} onClick={this.browseEventType(evType)}>{evType}</button>);
+                } else if (keys.length === 1) {
+                    rows.push(<button key={evType} onClick={this.onViewSourceClick(stateGroup[keys[0]])}>{evType}</button>);
+                }
+            });
+        } else {
+            const evType = this.state.eventType;
+            const stateGroup = roomStateEvents[evType];
+            Object.keys(stateGroup).forEach((stateKey) => {
+                const ev = stateGroup[stateKey];
+                rows.push(<button key={stateKey} onClick={this.onViewSourceClick(ev)}>{stateKey}</button>);
+            });
+        }
+
+        return <div>
+            <div className="mx_Dialog_content">
+                <div className="mx_TextInputDialog_label">
+                    Room ID: {this.props.roomId}
+                </div>
+                <div>
+                    {rows}
+                </div>
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this.onBack}>Back</button>
+            </div>
+        </div>;
+    }
+}
+
 export default class DevtoolsDialog extends React.Component {
     static propTypes = {
         roomId: React.PropTypes.string.isRequired,
@@ -164,6 +247,7 @@ export default class DevtoolsDialog extends React.Component {
 
     constructor(props, context) {
         super(props, context);
+        this.onBack = this.onBack.bind(this);
         this.onCancel = this.onCancel.bind(this);
     }
 
@@ -177,6 +261,10 @@ export default class DevtoolsDialog extends React.Component {
         };
     }
 
+    onBack() {
+        this.setState({ mode: null });
+    }
+
     onCancel() {
         this.props.onFinished(false);
     }
@@ -185,12 +273,13 @@ export default class DevtoolsDialog extends React.Component {
         let body;
 
         if (this.state.mode) {
-            body = <this.state.mode {...this.props} />;
+            body = <this.state.mode {...this.props} onBack={this.onBack} />;
         } else {
             body = <div>
                 <div className="mx_Dialog_content">
                     <button onClick={this._setMode(SendCustomEvent)}>Send Custom Event</button>
                     <button onClick={this._setMode(SendCustomStateEvent)}>Send Custom State Event</button>
+                    <button onClick={this._setMode(RoomStateExplorer)}>Explore Room State</button>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onCancel}>Cancel</button>

From 9ab30b7b1792cdd134d18be92bc44f2e88b6f959 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2017 01:05:05 +0100
Subject: [PATCH 04/88] fix line-length and copyright header

---
 src/components/views/dialogs/DevtoolsDialog.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 9a518fd0..9ef71c3b 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 OpenMarket Ltd
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -97,7 +97,9 @@ class SendCustomStateEvent extends React.Component {
     async _send() {
         try {
             const content = JSON.parse(this.refs.evContent.value);
-            await MatrixClientPeg.get().sendStateEvent(this.refs.roomId.value, this.refs.eventType.value, content, this.refs.stateKey.value);
+            await MatrixClientPeg.get().sendStateEvent(this.refs.roomId.value, this.refs.eventType.value, content,
+                this.refs.stateKey.value);
+
             this.props.onFinished(true);
         } catch (e) {
             this.props.onFinished(false);
@@ -207,7 +209,9 @@ class RoomStateExplorer extends React.Component {
                 if (keys.length > 1) {
                     rows.push(<button key={evType} onClick={this.browseEventType(evType)}>{evType}</button>);
                 } else if (keys.length === 1) {
-                    rows.push(<button key={evType} onClick={this.onViewSourceClick(stateGroup[keys[0]])}>{evType}</button>);
+                    rows.push(
+                        <button key={evType} onClick={this.onViewSourceClick(stateGroup[keys[0]])}>{evType}</button>
+                    );
                 }
             });
         } else {

From 1b004f170dce0de49d55fa05de9a3a3e84b0b0f4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 3 Aug 2017 01:10:32 +0100
Subject: [PATCH 05/88] make eslint happy

---
 src/components/views/dialogs/DevtoolsDialog.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 9ef71c3b..32cf0c0c 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -204,15 +204,16 @@ class RoomStateExplorer extends React.Component {
         if (this.state.eventType === null) {
             Object.keys(roomStateEvents).forEach((evType) => {
                 const stateGroup = roomStateEvents[evType];
-                const keys = Object.keys(stateGroup);
+                const stateKeys = Object.keys(stateGroup);
 
-                if (keys.length > 1) {
-                    rows.push(<button key={evType} onClick={this.browseEventType(evType)}>{evType}</button>);
-                } else if (keys.length === 1) {
-                    rows.push(
-                        <button key={evType} onClick={this.onViewSourceClick(stateGroup[keys[0]])}>{evType}</button>
-                    );
+                let onClickFn;
+                if (stateKeys.length > 1) {
+                    onClickFn = this.browseEventType(evType);
+                } else if (stateKeys.length === 1) {
+                    onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
                 }
+
+                rows.push(<button key={evType} onClick={onClickFn}>{ evType }</button>);
             });
         } else {
             const evType = this.state.eventType;

From 7c4b6739fcba85a5b63d76506d5eb7cd3aebe818 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 9 Aug 2017 15:36:51 +0100
Subject: [PATCH 06/88] Add group member right panel

---
 src/components/structures/RightPanel.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index f3c16021..4af7c6a4 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -42,6 +42,7 @@ module.exports = React.createClass({
         FilePanel: 'FilePanel',
         NotificationPanel: 'NotificationPanel',
         RoomMemberInfo: 'RoomMemberInfo',
+        GroupMemberInfo: 'GroupMemberInfo',
     },
 
     componentWillMount: function() {
@@ -57,6 +58,10 @@ module.exports = React.createClass({
         }
     },
 
+    componentWillReceiveProps: function(newprops) {
+        this.setState(this.getInitialState());
+    },
+
     getInitialState: function() {
         if (this.props.userId) {
             const member = new Matrix.RoomMember(null, this.props.userId);
@@ -142,12 +147,19 @@ module.exports = React.createClass({
                     });
                 } else if (this.props.groupId) {
                     this.setState({
-                        phase: this.Phase.GroupMemberList
+                        phase: this.Phase.GroupMemberList,
+                        groupId: payload.groupId,
+                        member: payload.member,
                     });
                 }
             }
-        }
-        else if (payload.action === "view_room") {
+        } else if (payload.action === "view_group_user") {
+            this.setState({
+                phase: this.Phase.GroupMemberInfo,
+                groupId: payload.groupId,
+                member: payload.member,
+            });
+        } else if (payload.action === "view_room") {
             if (this.state.phase === this.Phase.RoomMemberInfo) {
                 this.setState({
                     phase: this.Phase.RoomMemberList
@@ -239,9 +251,12 @@ module.exports = React.createClass({
                 panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />
             } else if (this.props.groupId && this.state.phase == this.Phase.GroupMemberList) {
                 panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />
-            } else if(this.state.phase == this.Phase.RoomMemberInfo) {
+            } else if (this.state.phase == this.Phase.RoomMemberInfo) {
                 const MemberInfo = sdk.getComponent('rooms.MemberInfo');
                 panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.props.userId} />
+            } else if (this.state.phase == this.Phase.GroupMemberInfo) {
+                const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
+                panel = <GroupMemberInfo member={this.state.member} groupId={this.props.groupId} key={this.state.member.user_id} />
             } else if (this.state.phase == this.Phase.NotificationPanel) {
                 panel = <NotificationPanel />
             } else if (this.state.phase == this.Phase.FilePanel) {

From 3fd1a366bf4eece8cf3de88fd190d08f10a70826 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 10 Aug 2017 23:13:40 +0100
Subject: [PATCH 07/88] add back button to all pages and widen textarea

---
 .../views/dialogs/DevtoolsDialog.js           | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 32cf0c0c..b384cfdf 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -22,13 +22,12 @@ import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 class SendCustomEvent extends React.Component {
     static propTypes = {
         roomId: React.PropTypes.string.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        onBack: React.PropTypes.func.isRequired,
     };
 
     constructor(props, context) {
         super(props, context);
         this._send = this._send.bind(this);
-        this.onCancel = this.onCancel.bind(this);
     }
 
     async _send() {
@@ -46,10 +45,6 @@ class SendCustomEvent extends React.Component {
         }
     }
 
-    onCancel() {
-        this.props.onFinished(false);
-    }
-
     render() {
         return <div>
             <div className="mx_Dialog_content">
@@ -71,12 +66,12 @@ class SendCustomEvent extends React.Component {
                     <label htmlFor="evContent"> Event Content </label>
                 </div>
                 <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} size="64" />
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="64" />
                 </div>
             </div>
             <div className="mx_Dialog_buttons">
+                <button onClick={this.props.onBack}>Back</button>
                 <button onClick={this._send}>Send</button>
-                <button onClick={this.onCancel}>Cancel</button>
             </div>
         </div>;
     }
@@ -85,13 +80,12 @@ class SendCustomEvent extends React.Component {
 class SendCustomStateEvent extends React.Component {
     static propTypes = {
         roomId: React.PropTypes.string.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        onBack: React.PropTypes.func.isRequired,
     };
 
     constructor(props, context) {
         super(props, context);
         this._send = this._send.bind(this);
-        this.onCancel = this.onCancel.bind(this);
     }
 
     async _send() {
@@ -105,16 +99,12 @@ class SendCustomStateEvent extends React.Component {
             this.props.onFinished(false);
             const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             Modal.createDialog(ErrorDialog, {
-                title: 'Failed to send custom event',
+                title: 'Failed to send custom state event',
                 description: e.toString(),
             });
         }
     }
 
-    onCancel() {
-        this.props.onFinished(false);
-    }
-
     render() {
         return <div>
             <div className="mx_Dialog_content">
@@ -143,12 +133,12 @@ class SendCustomStateEvent extends React.Component {
                     <label htmlFor="evContent"> Event Content </label>
                 </div>
                 <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} size="64" />
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="64" />
                 </div>
             </div>
             <div className="mx_Dialog_buttons">
+                <button onClick={this.props.onBack}>Back</button>
                 <button onClick={this._send}>Send</button>
-                <button onClick={this.onCancel}>Cancel</button>
             </div>
         </div>;
     }
@@ -157,18 +147,21 @@ class SendCustomStateEvent extends React.Component {
 class RoomStateExplorer extends React.Component {
     static propTypes = {
         roomId: React.PropTypes.string.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
         onBack: React.PropTypes.func.isRequired,
     };
 
     constructor(props, context) {
         super(props, context);
 
+        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+        this.roomStateEvents = room.currentState.events;
+
         this.onBack = this.onBack.bind(this);
     }
 
     state = {
         eventType: null,
+        event: null,
     };
 
     browseEventType(eventType) {
@@ -178,32 +171,40 @@ class RoomStateExplorer extends React.Component {
         };
     }
 
-    onViewSourceClick(ev) {
-        const ViewSource = sdk.getComponent('structures.ViewSource');
+    onViewSourceClick(event) {
+        const self = this;
         return () => {
-            Modal.createDialog(ViewSource, {
-                content: ev,
-            }, 'mx_Dialog_viewsource');
+            self.setState({ event });
         };
     }
 
     onBack() {
-        if (this.state.eventType === null) {
-            this.props.onBack();
-        } else {
+        if (this.state.event) {
+            this.setState({ event: null });
+        } else if (this.state.eventType) {
             this.setState({ eventType: null });
+        } else {
+            this.props.onBack();
         }
     }
 
     render() {
-        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
-        const roomStateEvents = room.currentState.events;
+        if (this.state.event) {
+            return <div className="mx_ViewSource">
+                <div className="mx_Dialog_content">
+                    <pre>{JSON.stringify(this.state.event, null, 2)}</pre>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onBack}>Back</button>
+                </div>
+            </div>;
+        }
 
         const rows = [];
 
         if (this.state.eventType === null) {
-            Object.keys(roomStateEvents).forEach((evType) => {
-                const stateGroup = roomStateEvents[evType];
+            Object.keys(this.roomStateEvents).forEach((evType) => {
+                const stateGroup = this.roomStateEvents[evType];
                 const stateKeys = Object.keys(stateGroup);
 
                 let onClickFn;
@@ -217,7 +218,7 @@ class RoomStateExplorer extends React.Component {
             });
         } else {
             const evType = this.state.eventType;
-            const stateGroup = roomStateEvents[evType];
+            const stateGroup = this.roomStateEvents[evType];
             Object.keys(stateGroup).forEach((stateKey) => {
                 const ev = stateGroup[stateKey];
                 rows.push(<button key={stateKey} onClick={this.onViewSourceClick(ev)}>{stateKey}</button>);

From 84f4fbe1428cbaea83eca7481459cf1cca179c4e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 10 Aug 2017 23:55:22 +0100
Subject: [PATCH 08/88] DRY up code and change flow to be less destructive

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 130 ++++++++----------
 1 file changed, 61 insertions(+), 69 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index b384cfdf..f9ee7c5d 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import sdk from 'matrix-react-sdk';
-import Modal from 'matrix-react-sdk/lib/Modal';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 
 class SendCustomEvent extends React.Component {
@@ -28,33 +27,56 @@ class SendCustomEvent extends React.Component {
     constructor(props, context) {
         super(props, context);
         this._send = this._send.bind(this);
+        this.onBack = this.onBack.bind(this);
     }
 
-    async _send() {
-        try {
-            const content = JSON.parse(this.refs.evContent.value);
-            await MatrixClientPeg.get().sendEvent(this.refs.roomId.value, this.refs.eventType.value, content);
-            this.props.onFinished(true);
-        } catch (e) {
-            this.props.onFinished(false);
-            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-            Modal.createDialog(ErrorDialog, {
-                title: 'Failed to send custom event',
-                description: e.toString(),
-            });
+    state = {
+        message: null,
+    };
+
+    onBack() {
+        if (this.state.message) {
+            this.setState({ message: null });
+        } else {
+            this.props.onBack();
         }
     }
 
+    _buttons() {
+        return <div className="mx_Dialog_buttons">
+            <button onClick={this.onBack}>Back</button>
+            {!this.state.message && <button onClick={this._send}>Send</button>}
+        </div>;
+    }
+
+    send(content) {
+        return MatrixClientPeg.get().sendEvent(this.props.roomId, this.refs.eventType.value, content);
+    }
+
+    async _send() {
+        let message;
+        try {
+            const content = JSON.parse(this.refs.evContent.value);
+            await this.send(content);
+            message = 'Event sent!';
+        } catch (e) {
+            message = 'Failed to send custom event.' + ` (${e.toString()})`;
+        }
+        this.setState({ message });
+    }
+
     render() {
+        if (this.state.message) {
+            return <div>
+                <div className="mx_Dialog_content">
+                    {this.state.message}
+                </div>
+                {this._buttons()}
+            </div>;
+        }
+
         return <div>
             <div className="mx_Dialog_content">
-                <div className="mx_TextInputDialog_label">
-                    <label htmlFor="roomId"> Room ID </label>
-                </div>
-                <div>
-                    <input id="roomId" ref="roomId" className="mx_TextInputDialog_input" defaultValue={this.props.roomId} size="64" />
-                </div>
-
                 <div className="mx_TextInputDialog_label">
                     <label htmlFor="eventType"> Event Type </label>
                 </div>
@@ -66,55 +88,32 @@ class SendCustomEvent extends React.Component {
                     <label htmlFor="evContent"> Event Content </label>
                 </div>
                 <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="64" />
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
                 </div>
             </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.props.onBack}>Back</button>
-                <button onClick={this._send}>Send</button>
-            </div>
+            {this._buttons()}
         </div>;
     }
 }
 
-class SendCustomStateEvent extends React.Component {
-    static propTypes = {
-        roomId: React.PropTypes.string.isRequired,
-        onBack: React.PropTypes.func.isRequired,
-    };
-
-    constructor(props, context) {
-        super(props, context);
-        this._send = this._send.bind(this);
-    }
-
-    async _send() {
-        try {
-            const content = JSON.parse(this.refs.evContent.value);
-            await MatrixClientPeg.get().sendStateEvent(this.refs.roomId.value, this.refs.eventType.value, content,
-                this.refs.stateKey.value);
-
-            this.props.onFinished(true);
-        } catch (e) {
-            this.props.onFinished(false);
-            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-            Modal.createDialog(ErrorDialog, {
-                title: 'Failed to send custom state event',
-                description: e.toString(),
-            });
-        }
+class SendCustomStateEvent extends SendCustomEvent {
+    send(content) {
+        return MatrixClientPeg.get().sendStateEvent(this.props.roomId, this.refs.eventType.value, content,
+            this.refs.stateKey.value);
     }
 
     render() {
+        if (this.state.message) {
+            return <div>
+                <div className="mx_Dialog_content">
+                    {this.state.message}
+                </div>
+                {this._buttons()}
+            </div>;
+        }
+
         return <div>
             <div className="mx_Dialog_content">
-                <div className="mx_TextInputDialog_label">
-                    <label htmlFor="roomId"> Room ID </label>
-                </div>
-                <div>
-                    <input id="roomId" ref="roomId" className="mx_TextInputDialog_input" defaultValue={this.props.roomId} size="64" />
-                </div>
-
                 <div className="mx_TextInputDialog_label">
                     <label htmlFor="stateKey"> State Key </label>
                 </div>
@@ -133,13 +132,10 @@ class SendCustomStateEvent extends React.Component {
                     <label htmlFor="evContent"> Event Content </label>
                 </div>
                 <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="64" />
+                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
                 </div>
             </div>
-            <div className="mx_Dialog_buttons">
-                <button onClick={this.props.onBack}>Back</button>
-                <button onClick={this._send}>Send</button>
-            </div>
+            {this._buttons()}
         </div>;
     }
 }
@@ -227,12 +223,7 @@ class RoomStateExplorer extends React.Component {
 
         return <div>
             <div className="mx_Dialog_content">
-                <div className="mx_TextInputDialog_label">
-                    Room ID: {this.props.roomId}
-                </div>
-                <div>
-                    {rows}
-                </div>
+                {rows}
             </div>
             <div className="mx_Dialog_buttons">
                 <button onClick={this.onBack}>Back</button>
@@ -295,6 +286,7 @@ export default class DevtoolsDialog extends React.Component {
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title="Developer Tools">
+            <div>Room ID: {this.props.roomId}</div>
             { body }
         </BaseDialog>;
     }

From 57eb2feeb638589f44fa65e973a1e8546ff3f378 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 15 Aug 2017 13:18:16 +0100
Subject: [PATCH 09/88] Make right panel collpasing work in GroupView

---
 src/components/structures/RightPanel.js       | 101 +++++++++++-------
 src/i18n/strings/en_EN.json                   |   3 +-
 .../structures/_GroupView.scss                |   4 +
 3 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 18adcda6..acd92e3f 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -98,11 +98,15 @@ module.exports = React.createClass({
             return;
         }
 
-        // call ChatInviteDialog
-        dis.dispatch({
-            action: 'view_invite',
-            roomId: this.props.roomId,
-        });
+        if (this.state.phase === this.Phase.GroupMemberList) {
+            // TODO: display UserPickeDialog
+        } else {
+            // call UserPickerDialog
+            dis.dispatch({
+                action: 'view_invite',
+                roomId: this.props.roomId,
+            });
+        }
     },
 
     onRoomStateMember: function(ev, state, member) {
@@ -169,7 +173,6 @@ module.exports = React.createClass({
         const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
         const FilePanel = sdk.getComponent('structures.FilePanel');
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
-        let buttonGroup;
         let inviteGroup;
         let panel;
 
@@ -212,50 +215,72 @@ module.exports = React.createClass({
 
         }
 
+        let headerButtons = [];
         if (this.props.roomId) {
-            buttonGroup =
-                    <div className="mx_RightPanel_headerButtonGroup">
-                        <AccessibleButton className="mx_RightPanel_headerButton"
-                                title={ _t('Members') } onClick={ this.onMemberListButtonClick }>
-                            <div className="mx_RightPanel_headerButton_badge">{ membersBadge ? membersBadge : <span>&nbsp;</span>}</div>
-                            <TintableSvg src="img/icons-people.svg" width="25" height="25"/>
-                            { membersHighlight }
-                        </AccessibleButton>
-                        <AccessibleButton
-                                className="mx_RightPanel_headerButton mx_RightPanel_filebutton"
-                                title={ _t('Files') } onClick={ this.onFileListButtonClick }>
-                            <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
-                            <TintableSvg src="img/icons-files.svg" width="25" height="25"/>
-                            { filesHighlight }
-                        </AccessibleButton>
-                        <AccessibleButton
-                                className="mx_RightPanel_headerButton mx_RightPanel_notificationbutton"
-                                title={ _t('Notifications') } onClick={ this.onNotificationListButtonClick }>
-                            <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
-                            <TintableSvg src="img/icons-notifications.svg" width="25" height="25"/>
-                            { notificationsHighlight }
-                        </AccessibleButton>
-                        <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" title={ _t("Hide panel") } onClick={ this.onCollapseClick }>
-                            <TintableSvg src="img/minimise.svg" width="10" height="16"/>
-                        </div>
-                    </div>;
+            headerButtons.push(
+                <AccessibleButton className="mx_RightPanel_headerButton" key="_membersButton"
+                        title={ _t('Members') } onClick={ this.onMemberListButtonClick }>
+                    <div className="mx_RightPanel_headerButton_badge">{ membersBadge ? membersBadge : <span>&nbsp;</span>}</div>
+                    <TintableSvg src="img/icons-people.svg" width="25" height="25"/>
+                    { membersHighlight }
+                </AccessibleButton>
+            );
+            headerButtons.push(
+                <AccessibleButton
+                        className="mx_RightPanel_headerButton mx_RightPanel_filebutton" key="_filesButton"
+                        title={ _t('Files') } onClick={ this.onFileListButtonClick }>
+                    <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
+                    <TintableSvg src="img/icons-files.svg" width="25" height="25"/>
+                    { filesHighlight }
+                </AccessibleButton>
+            );
+            headerButtons.push(
+                <AccessibleButton
+                        className="mx_RightPanel_headerButton mx_RightPanel_notificationbutton" key="_notifsButton"
+                        title={ _t('Notifications') } onClick={ this.onNotificationListButtonClick }>
+                    <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
+                    <TintableSvg src="img/icons-notifications.svg" width="25" height="25"/>
+                    { notificationsHighlight }
+                </AccessibleButton>
+            );
+        }
+
+        if (this.props.roomId || this.props.groupId) {
+            // Hiding the right panel hides it completely and relies on an 'expand' button
+            // being put in the RoomHeader or GroupView header, so only show the minimise
+            // button on these 2 screens or you won't be able to re-expand the panel.
+            headerButtons.push(
+                <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" key="_minimizeButton"
+                    title={ _t("Hide panel") } onClick={ this.onCollapseClick }
+                >
+                    <TintableSvg src="img/minimise.svg" width="10" height="16"/>
+                </div>
+            );
         }
 
         if (!this.props.collapsed) {
             if (this.props.roomId && this.state.phase == this.Phase.RoomMemberList) {
                 panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />
             } else if (this.props.groupId && this.state.phase == this.Phase.GroupMemberList) {
-                panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />
+                panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
+                inviteGroup = (
+                    <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+                        <div className="mx_RightPanel_icon" >
+                            <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
+                        </div>
+                        <div className="mx_RightPanel_message">{ _t('Invite to this group') }</div>
+                    </AccessibleButton>
+                );
             } else if (this.state.phase == this.Phase.RoomMemberInfo) {
                 const MemberInfo = sdk.getComponent('rooms.MemberInfo');
                 panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />
             } else if (this.state.phase == this.Phase.GroupMemberInfo) {
                 const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
-                panel = <GroupMemberInfo member={this.state.member} groupId={this.props.groupId} key={this.state.member.user_id} />
+                panel = <GroupMemberInfo member={this.state.member} groupId={this.props.groupId} key={this.state.member.user_id} />;
             } else if (this.state.phase == this.Phase.NotificationPanel) {
-                panel = <NotificationPanel />
+                panel = <NotificationPanel />;
             } else if (this.state.phase == this.Phase.FilePanel) {
-                panel = <FilePanel roomId={this.props.roomId} />
+                panel = <FilePanel roomId={this.props.roomId} />;
             }
         }
 
@@ -271,7 +296,9 @@ module.exports = React.createClass({
         return (
             <aside className={classes} style={{ opacity: this.props.opacity }}>
                 <div className="mx_RightPanel_header">
-                    { buttonGroup }
+                    <div className="mx_RightPanel_headerButtonGroup">
+                        {headerButtons}
+                    </div>
                 </div>
                 { panel }
                 <div className="mx_RightPanel_footer">
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cecb248c..81f10e16 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -205,5 +205,6 @@
   "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
   "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
   "Set Password": "Set Password",
-  "Couldn't load home page": "Couldn't load home page"
+  "Couldn't load home page": "Couldn't load home page",
+  "Invite to this group": "Invite to this group"
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index ae9f97b2..7045188d 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -70,6 +70,10 @@ limitations under the License.
     flex: 1;
 }
 
+.mx_GroupView_header_rightCol {
+    display: flex;
+}
+
 .mx_GroupView_saveButton, .mx_GroupView_cancelButton {
     display: table-cell;
 }

From 1a7a670c96296009a1d42db9c7a6cd5697141e91 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 16 Aug 2017 14:59:00 +0100
Subject: [PATCH 10/88] Show the group invite dialog

What to TODO said!
---
 src/components/structures/RightPanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index acd92e3f..242997bf 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -25,6 +25,7 @@ import Analytics from 'matrix-react-sdk/lib/Analytics';
 import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
 import Modal from 'matrix-react-sdk/lib/Modal';
 import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+import { showGroupInviteDialog } from 'matrix-react-sdk/lib/GroupInvite';
 
 module.exports = React.createClass({
     displayName: 'RightPanel',
@@ -99,7 +100,7 @@ module.exports = React.createClass({
         }
 
         if (this.state.phase === this.Phase.GroupMemberList) {
-            // TODO: display UserPickeDialog
+            showGroupInviteDialog(this.props.groupId);
         } else {
             // call UserPickerDialog
             dis.dispatch({

From ee6e36cd904adb49c468f3897c9b607b5f031567 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 18 Aug 2017 11:23:55 +0100
Subject: [PATCH 11/88] Allow extra tiles to be put into room sub lists

So we can put in tiles for group invites & other stuff
---
 src/components/structures/RoomSubList.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 7c6b1622..0ca595c8 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -88,6 +88,7 @@ var RoomSubList = React.createClass({
         searchFilter: React.PropTypes.string,
         emptyContent: React.PropTypes.node, // content shown if the list is empty
         headerItems: React.PropTypes.node, // content shown in the sublist header
+        extraTiles: React.PropTypes.arrayOf(React.PropTypes.node), // extra elements added beneath tiles
     },
 
     getInitialState: function() {
@@ -101,7 +102,8 @@ var RoomSubList = React.createClass({
     getDefaultProps: function() {
         return {
             onHeaderClick: function() {}, // NOP
-            onShowMoreRooms: function() {} // NOP
+            onShowMoreRooms: function() {}, // NOP
+            extraTiles: [],
         };
     },
 
@@ -532,13 +534,14 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
+        if (this.state.sortedList.length == 0 && !this.props.searchFilter && !this.props.extraTiles) {
             content = this.props.emptyContent;
         } else {
             content = this.makeRoomTiles();
+            content.push(...this.props.extraTiles);
         }
 
-        if (this.state.sortedList.length > 0 || this.props.editable) {
+        if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {
             var subList;
             var classes = "mx_RoomSubList";
 

From 07b6e215a13dbdb12ce63e139dafc2079757e693 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 18 Aug 2017 11:24:52 +0100
Subject: [PATCH 12/88] CSS for group invite tiles

---
 src/skins/vector/css/_components.scss         |  1 +
 .../views/groups/_GroupInviteTile.scss        | 74 +++++++++++++++++++
 src/skins/vector/css/themes/_base.scss        |  2 +
 3 files changed, 77 insertions(+)
 create mode 100644 src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss

diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 00c19b13..3493336a 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -32,6 +32,7 @@
 @import "./matrix-react-sdk/views/elements/_ProgressBar.scss";
 @import "./matrix-react-sdk/views/elements/_RichText.scss";
 @import "./matrix-react-sdk/views/elements/_RoleButton.scss";
+@import "./matrix-react-sdk/views/groups/_GroupInviteTile.scss";
 @import "./matrix-react-sdk/views/login/_InteractiveAuthEntryComponents.scss";
 @import "./matrix-react-sdk/views/login/_ServerConfig.scss";
 @import "./matrix-react-sdk/views/messages/_MEmoteBody.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
new file mode 100644
index 00000000..6b4034b9
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
@@ -0,0 +1,74 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_GroupInviteTile {
+    position: relative;
+    cursor: pointer;
+    font-size: 13px;
+    display: block;
+    height: 34px;
+}
+
+.mx_GroupInviteTile_nameContainer {
+    display: inline-block;
+    width: 180px;
+    height: 24px;
+}
+
+.mx_GroupInviteTile_avatarContainer {
+    display: inline-block;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 16px;
+    padding-right: 6px;
+    width: 24px;
+    height: 24px;
+    vertical-align: middle;
+}
+
+.mx_GroupInviteTile_name {
+    display: inline-block;
+    position: relative;
+    width: 165px;
+    vertical-align: middle;
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-top: 2px;
+    padding-bottom: 3px;
+    color: $roomtile-name-color;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.mx_GroupInviteTile_badge {
+    display: inline-block;
+    min-width: 15px;
+    height: 15px;
+    position: absolute;
+    right: 8px; /*gutter */
+    top: 9px;
+    border-radius: 8px;
+    color: $accent-fg-color;
+    background-color: $group-alert-color;
+    font-weight: 600;
+    font-size: 10px;
+    text-align: center;
+    padding-top: 1px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 6f613e38..a13c517b 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -22,6 +22,8 @@ $warning-color: #ff0064;
 $mention-user-pill-bg-color: #ff0064;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
+$group-alert-color: #774f7e;
+
 $preview-bar-bg-color: #f7f7f7;
 
 // left-panel style muted accent color

From 013f2ce66aeb1e218b55635aea65736e831e752a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 21 Aug 2017 19:34:31 +0100
Subject: [PATCH 13/88] More CSS for group membership lifecycle

---
 .../structures/_GroupView.scss                 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 7045188d..f9932f6f 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -74,8 +74,12 @@ limitations under the License.
     display: flex;
 }
 
-.mx_GroupView_saveButton, .mx_GroupView_cancelButton {
-    display: table-cell;
+.mx_GroupView_membership_buttonContainer {
+    margin-top: 10px;
+}
+
+.mx_GroupView_textButton {
+    display: inline-block;
 }
 
 .mx_GroupView_header_groupid {
@@ -130,6 +134,16 @@ limitations under the License.
     top: 5px;
 }
 
+.mx_GroupView_invitedSection {
+    width: 70%;
+    padding: 20px;
+    border: 1px solid $group-alert-color;
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 20px;
+    text-align: center;
+}
+
 .mx_GroupView_featuredThings {
     margin-top: 20px;
 }

From a673cbcf1e4f62676926c33eb875fb2810cca70f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 25 Aug 2017 13:00:43 +0100
Subject: [PATCH 15/88] s/member/groupMember/

---
 src/components/structures/RightPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 242997bf..4d3337d0 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -277,7 +277,7 @@ module.exports = React.createClass({
                 panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />
             } else if (this.state.phase == this.Phase.GroupMemberInfo) {
                 const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
-                panel = <GroupMemberInfo member={this.state.member} groupId={this.props.groupId} key={this.state.member.user_id} />;
+                panel = <GroupMemberInfo groupMember={this.state.member} groupId={this.props.groupId} key={this.state.member.user_id} />;
             } else if (this.state.phase == this.Phase.NotificationPanel) {
                 panel = <NotificationPanel />;
             } else if (this.state.phase == this.Phase.FilePanel) {

From a437f23e9df6b63c2dee2d329cb138433a5af25a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 26 Aug 2017 18:48:24 +0100
Subject: [PATCH 16/88] add i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 33 ++++++++++---------
 src/i18n/strings/en_EN.json                   | 10 ++++++
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index f9ee7c5d..dc8f8769 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from 'matrix-react-sdk';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 
 class SendCustomEvent extends React.Component {
@@ -44,8 +45,8 @@ class SendCustomEvent extends React.Component {
 
     _buttons() {
         return <div className="mx_Dialog_buttons">
-            <button onClick={this.onBack}>Back</button>
-            {!this.state.message && <button onClick={this._send}>Send</button>}
+            <button onClick={this.onBack}>{ _t('Back') }</button>
+            {!this.state.message && <button onClick={this._send}>{ _t('Send') }</button>}
         </div>;
     }
 
@@ -58,9 +59,9 @@ class SendCustomEvent extends React.Component {
         try {
             const content = JSON.parse(this.refs.evContent.value);
             await this.send(content);
-            message = 'Event sent!';
+            message = _t('Event sent!');
         } catch (e) {
-            message = 'Failed to send custom event.' + ` (${e.toString()})`;
+            message = `${_t('Failed to send custom event.')} (${e.toString()})`;
         }
         this.setState({ message });
     }
@@ -78,14 +79,14 @@ class SendCustomEvent extends React.Component {
         return <div>
             <div className="mx_Dialog_content">
                 <div className="mx_TextInputDialog_label">
-                    <label htmlFor="eventType"> Event Type </label>
+                    <label htmlFor="eventType"> { _t('Event Type') } </label>
                 </div>
                 <div>
                     <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
                 </div>
 
                 <div className="mx_TextInputDialog_label">
-                    <label htmlFor="evContent"> Event Content </label>
+                    <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
                     <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
@@ -115,21 +116,21 @@ class SendCustomStateEvent extends SendCustomEvent {
         return <div>
             <div className="mx_Dialog_content">
                 <div className="mx_TextInputDialog_label">
-                    <label htmlFor="stateKey"> State Key </label>
+                    <label htmlFor="stateKey"> { _t('State Key') } </label>
                 </div>
                 <div>
                     <input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" />
                 </div>
 
                 <div className="mx_TextInputDialog_label">
-                    <label htmlFor="eventType"> Event Type </label>
+                    <label htmlFor="eventType"> { _t('Event Type') } </label>
                 </div>
                 <div>
                     <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
                 </div>
 
                 <div className="mx_TextInputDialog_label">
-                    <label htmlFor="evContent"> Event Content </label>
+                    <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
                     <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
@@ -191,7 +192,7 @@ class RoomStateExplorer extends React.Component {
                     <pre>{JSON.stringify(this.state.event, null, 2)}</pre>
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button onClick={this.onBack}>Back</button>
+                    <button onClick={this.onBack}>{ _t('Back') }</button>
                 </div>
             </div>;
         }
@@ -226,7 +227,7 @@ class RoomStateExplorer extends React.Component {
                 {rows}
             </div>
             <div className="mx_Dialog_buttons">
-                <button onClick={this.onBack}>Back</button>
+                <button onClick={this.onBack}>{ _t('Back') }</button>
             </div>
         </div>;
     }
@@ -274,18 +275,18 @@ export default class DevtoolsDialog extends React.Component {
         } else {
             body = <div>
                 <div className="mx_Dialog_content">
-                    <button onClick={this._setMode(SendCustomEvent)}>Send Custom Event</button>
-                    <button onClick={this._setMode(SendCustomStateEvent)}>Send Custom State Event</button>
-                    <button onClick={this._setMode(RoomStateExplorer)}>Explore Room State</button>
+                    <button onClick={this._setMode(SendCustomEvent)}>{ _t('Send Custom Event') }</button>
+                    <button onClick={this._setMode(SendCustomStateEvent)}>{ _t('Send Custom State Event') }</button>
+                    <button onClick={this._setMode(RoomStateExplorer)}>{ _t('Explore Room State') }</button>
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>Cancel</button>
+                    <button onClick={this.onCancel}>{ _t('Cancel') }</button>
                 </div>
             </div>;
         }
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        return <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title="Developer Tools">
+        return <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
             <div>Room ID: {this.props.roomId}</div>
             { body }
         </BaseDialog>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cecb248c..b755400f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -9,6 +9,7 @@
   "All Rooms": "All Rooms",
   "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
   "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
+  "Back": "Back",
   "Call invitation": "Call invitation",
   "Cancel": "Cancel",
   "Cancel Sending": "Cancel Sending",
@@ -25,6 +26,7 @@
   "delete the alias.": "delete the alias.",
   "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
   "Describe your problem here.": "Describe your problem here.",
+  "Developer Tools": "Developer Tools",
   "Direct Chat": "Direct Chat",
   "Directory": "Directory",
   "Dismiss": "Dismiss",
@@ -49,6 +51,7 @@
   "Failed to get public room list": "Failed to get public room list",
   "Failed to join the room": "Failed to join the room",
   "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+  "Failed to send custom event.": "Failed to send custom event.",
   "Failed to send report: ": "Failed to send report: ",
   "Failed to set direct chat tag": "Failed to set direct chat tag",
   "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
@@ -116,6 +119,9 @@
   "Search for a room": "Search for a room",
   "Send": "Send",
   "Send logs": "Send logs",
+  "Send Custom Event": "Send Custom Event",
+  "Send Custom State Event": "Send Custom State Event",
+  "Explore Room State": "Explore Room State",
   "Settings": "Settings",
   "Source URL": "Source URL",
   "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
@@ -162,6 +168,10 @@
   "Warning": "Warning",
   "Checking for an update...": "Checking for an update...",
   "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+  "Event sent!": "Event sent!",
+  "Event Type": "Event Type",
+  "Event Content": "Event Content",
+  "State Key": "State Key",
   "No update available.": "No update available.",
   "Downloading update...": "Downloading update...",
   "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",

From d14f16f0e93a2c28444b9d6ac72e8c0e8b4454c0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 27 Aug 2017 17:25:51 +0100
Subject: [PATCH 17/88] look at event property of the mxEv, this way we won't
 have all the additional internal keys :)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DevtoolsDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index dc8f8769..e343f152 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -171,7 +171,7 @@ class RoomStateExplorer extends React.Component {
     onViewSourceClick(event) {
         const self = this;
         return () => {
-            self.setState({ event });
+            self.setState({ event: event.event });
         };
     }
 

From e5912b996dc0aa882a2bb4830d7f0167724d5ffc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 30 Aug 2017 09:23:20 +0100
Subject: [PATCH 18/88] copyright

---
 src/components/structures/RightPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 4d3337d0..62adaa74 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From ce0861d5bdc515b8c35b62384875157848b40bac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 31 Aug 2017 09:25:06 +0100
Subject: [PATCH 19/88] undo `` as its hard to read

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DevtoolsDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index e343f152..83bb910f 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -61,7 +61,7 @@ class SendCustomEvent extends React.Component {
             await this.send(content);
             message = _t('Event sent!');
         } catch (e) {
-            message = `${_t('Failed to send custom event.')} (${e.toString()})`;
+            message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
         }
         this.setState({ message });
     }

From 68fc2020867a4e501ebe3c5ec7c9d7211638996c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 31 Aug 2017 09:45:46 +0100
Subject: [PATCH 20/88] remove pointless self vars and DRY render method of
 send custom events

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 49 +++++--------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 83bb910f..6b553eed 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -66,6 +66,10 @@ class SendCustomEvent extends React.Component {
         this.setState({ message });
     }
 
+    _additionalFields() {
+        return <div></div>;
+    }
+
     render() {
         if (this.state.message) {
             return <div>
@@ -78,6 +82,7 @@ class SendCustomEvent extends React.Component {
 
         return <div>
             <div className="mx_Dialog_content">
+                {this._additionalFields()}
                 <div className="mx_TextInputDialog_label">
                     <label htmlFor="eventType"> { _t('Event Type') } </label>
                 </div>
@@ -103,40 +108,14 @@ class SendCustomStateEvent extends SendCustomEvent {
             this.refs.stateKey.value);
     }
 
-    render() {
-        if (this.state.message) {
-            return <div>
-                <div className="mx_Dialog_content">
-                    {this.state.message}
-                </div>
-                {this._buttons()}
-            </div>;
-        }
-
+    _additionalFields() {
         return <div>
-            <div className="mx_Dialog_content">
-                <div className="mx_TextInputDialog_label">
-                    <label htmlFor="stateKey"> { _t('State Key') } </label>
-                </div>
-                <div>
-                    <input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" />
-                </div>
-
-                <div className="mx_TextInputDialog_label">
-                    <label htmlFor="eventType"> { _t('Event Type') } </label>
-                </div>
-                <div>
-                    <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
-                </div>
-
-                <div className="mx_TextInputDialog_label">
-                    <label htmlFor="evContent"> { _t('Event Content') } </label>
-                </div>
-                <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
-                </div>
+            <div className="mx_TextInputDialog_label">
+                <label htmlFor="stateKey"> { _t('State Key') } </label>
+            </div>
+            <div>
+                <input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" />
             </div>
-            {this._buttons()}
         </div>;
     }
 }
@@ -162,16 +141,14 @@ class RoomStateExplorer extends React.Component {
     };
 
     browseEventType(eventType) {
-        const self = this;
         return () => {
-            self.setState({ eventType });
+            this.setState({ eventType });
         };
     }
 
     onViewSourceClick(event) {
-        const self = this;
         return () => {
-            self.setState({ event: event.event });
+            this.setState({ event: event.event });
         };
     }
 

From b84f258f87b41db5138dc527a03e40c885aeec6d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 31 Aug 2017 13:49:52 +0100
Subject: [PATCH 21/88] add bottom margin to navigation buttons of room state
 explorer

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           |  9 +++++++--
 src/skins/vector/css/_components.scss         |  1 +
 .../views/dialogs/_DevtoolsDialog.scss        | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 6b553eed..a7ac9fb1 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -188,14 +188,19 @@ class RoomStateExplorer extends React.Component {
                     onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
                 }
 
-                rows.push(<button key={evType} onClick={onClickFn}>{ evType }</button>);
+                rows.push(<button className="mx_DevTools_RoomStateExplorer_button" key={evType} onClick={onClickFn}>
+                    { evType }
+                </button>);
             });
         } else {
             const evType = this.state.eventType;
             const stateGroup = this.roomStateEvents[evType];
             Object.keys(stateGroup).forEach((stateKey) => {
                 const ev = stateGroup[stateKey];
-                rows.push(<button key={stateKey} onClick={this.onViewSourceClick(ev)}>{stateKey}</button>);
+                rows.push(<button className="mx_DevTools_RoomStateExplorer_button" key={stateKey}
+                                  onClick={this.onViewSourceClick(ev)}>
+                    { stateKey }
+                </button>);
             });
         }
 
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 00c19b13..8caf15ca 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -74,6 +74,7 @@
 @import "./vector-web/views/context_menus/_MessageContextMenu.scss";
 @import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
 @import "./vector-web/views/dialogs/_ChangelogDialog.scss";
+@import "./vector-web/views/dialogs/_DevtoolsDialog.scss";
 @import "./vector-web/views/dialogs/_SetEmailDialog.scss";
 @import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
 @import "./vector-web/views/directory/_NetworkDropdown.scss";
diff --git a/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
new file mode 100644
index 00000000..c22a3834
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
@@ -0,0 +1,19 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_DevTools_RoomStateExplorer_button {
+    margin-bottom: 10px;
+}

From 4511805e3d0f484e7f12d25066a019ed094037c7 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Mon, 4 Sep 2017 16:12:33 +0000
Subject: [PATCH 22/88] Translated using Weblate (Finnish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
---
 src/i18n/strings/fi.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 1aa4d3f9..e2838155 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -195,5 +195,17 @@
     "You have successfully set a password and an email address!": "Olet onnistuneesti asettanut salasanan ja sähköpostiosoitteen!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Muista että voit aina asettaa sähköpostiosoitteen käyttäjäasetuksista jos muutat mielesi.",
     "To return to your account in future you need to <u>set a password</u>": "Voidaksesi tulevaisuudessa palata tilillesi sinut pitää <u>asettaa salasana</u>",
-    "Couldn't load home page": "Kotisivun lataus epäonnistui"
+    "Couldn't load home page": "Kotisivun lataus epäonnistui",
+    "Bug report sent": "Virheraportti lähetetty",
+    "Failed to set Direct Message status of room": "Huoneen suoran viestittelyn tilan asettaminen epäonnistui",
+    "(HTTP status %(httpStatus)s)": "(HTTP tila %(httpStatus)s)",
+    "Notify for all other messages/rooms": "Ilmoita kaikista muista viesteistä/huoneista",
+    "powered by Matrix": "Matrix-pohjainen",
+    "Riot is not supported on mobile web. Install the app?": "Riot ei tue mobiiliselaimia. Asenna sovellus?",
+    "Thank you!": "Kiitos!",
+    "Design and implementation of E2E in Matrix": "Matrix päästä-päähän salauksen suunnittelu ja implementointi",
+    "Contributing code to Matrix and Riot": "Osallistu Matrix ja Riot kehitykseen",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s selaimella %(browserName)s käyttöjärjestelmällä %(osName)s",
+    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Matrix-pohjainen hajautettu, salattu viestittely ja yhteistyö"
 }

From b15b4735bb89d453cf3c72c4145cf6c50dacd2f4 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Mon, 4 Sep 2017 16:40:51 +0000
Subject: [PATCH 23/88] Translated using Weblate (Swedish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
---
 src/i18n/strings/sv.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 66dbf467..e7736ce8 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -206,5 +206,7 @@
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chatt",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chatt",
     "Admin support for Dendrite": "Hjälp för administratörer av Dendrite",
-    "Building services on Matrix": "Bygga tjänster med Matrix"
+    "Building services on Matrix": "Bygga tjänster med Matrix",
+    "Bug report sent": "Buggraporten skickades",
+    "Thank you!": "Tack!"
 }

From c39df96b1d597e3c444ee604a91945ea59b53ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jerzy=20Ko=C5=82osowski?= <jerzy@kolosowscy.pl>
Date: Mon, 4 Sep 2017 20:23:13 +0000
Subject: [PATCH 24/88] Translated using Weblate (Polish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
---
 src/i18n/strings/pl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index f1eeb87c..09926edf 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -206,5 +206,7 @@
     "Error encountered (%(errorDetail)s).": "Wystąpił błąd (%(errorDetail)s).",
     "Downloading update...": "Pobieranie aktualizacji...",
     "Checking for an update...": "Sprawdzanie aktualizacji...",
-    "Couldn't load home page": "Nie można załadować strony startowej"
+    "Couldn't load home page": "Nie można załadować strony startowej",
+    "Bug report sent": "Raport błędu wysłany",
+    "Thank you!": "Dziękujemy!"
 }

From ae287dfc0025622a0ef40ccb45c75799f5783835 Mon Sep 17 00:00:00 2001
From: uppps <uppps@gustr.com>
Date: Tue, 5 Sep 2017 10:05:31 +0000
Subject: [PATCH 25/88] Translated using Weblate (Spanish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 7a1862a4..9ddd0429 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -125,15 +125,15 @@
     "Hide panel": "Ocultar panel",
     "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
-    "Changelog": "Bitácora de cambios",
+    "Changelog": "Registro de cambios",
     "Collapse panel": "Colapsar panel",
     "Remember, you can always set an email address in user settings if you change your mind.": "Recuerde que, si es necesario, puede establecer una dirección de email en las preferencias de usuario.",
     "All Rooms": "Todas las salas",
     "Expand panel": "Expandir panel",
     "Failed to": "Falló",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, las trazas de este cliente serán enviadas adjuntas a este informe de defecto. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
-    "Login": "Abrir sesión",
-    "Report a bug": "Informe un defecto",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, los registros de este cliente serán enviadas adjuntas a este informe de fallo. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
+    "Login": "Iniciar sesión",
+    "Report a bug": "Informe de un fallo",
     "Search…": "Buscar…",
     "Send": "Enviar",
     "Send logs": "Enviar trazas",
@@ -158,12 +158,12 @@
     "Loading bug report module": "Cargando módulo de reporte de errores",
     "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
     "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. Qué acción ejecutó? Cuál era el resultado que esperaba? Que pasó realmente?",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. ¿Qué acción ejecutó? ¿Cuál era el resultado que esperaba? ¿Que pasó realmente?",
     "Please describe the bug and/or send logs.": "Por favor describa el error y/o envíe los registros.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Google Chrome</a> o <a href=\"https://getfirefox.com\">Mozilla Firefox</a> para una mejor experiencia.",
     "powered by Matrix": "con el poder de Matrix",
     "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. Quieres instalar la aplicación?",
+    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. ¿Quieres instalar la aplicación?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está usando Riot como invitado. ¡<a>Regístrese</a> o <a>inicie sesión</a> para acceder más salas y características!",
     "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
@@ -206,5 +206,7 @@
     "To return to your account in future you need to <u>set a password</u>": "Para regresar a su cuenta en el futuro Ud. debe <u>establecer una contraseña</u>",
     "Set Password": "Establezca la contraseña",
     "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
-    "Couldn't load home page": "No se puede cargar la página principal"
+    "Couldn't load home page": "No se puede cargar la página principal",
+    "Bug report sent": "Informe de fallo enviado",
+    "Thank you!": "¡Gracias!"
 }

From 3615ba2bdb566f29d74a45d394f277b062f0911a Mon Sep 17 00:00:00 2001
From: uppps <uppps@gustr.com>
Date: Tue, 5 Sep 2017 10:13:41 +0000
Subject: [PATCH 26/88] Translated using Weblate (Spanish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 9ddd0429..7d1af1bb 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -5,7 +5,7 @@
     "An error occurred whilst saving your email notification preferences.": "Se ha producido un error al guardar las preferencias de notificación por email.",
     "Call invitation": "Invitación a la llamada",
     "Cancel Sending": "Cancelar envío",
-    "Can't update user notification settings": "No se puede actualizar la configuración de notificación de usuario",
+    "Can't update user notification settings": "No se puede actualizar la configuración de notificaciones del usuario",
     "Close": "Cerrar",
     "Create new room": "Crear nueva sala",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincidiera",
@@ -150,7 +150,7 @@
     "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
     "All messages (loud)": "Todos los mensajes (ruidoso)",
-    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas en todos los objetivos.",
+    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas para todos los objetivos.",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Collecting logs": "Recolectando registros",
     "Dismiss": "Omitir",

From 4327b264bc0550d956c86afe08e39934e17cc2f2 Mon Sep 17 00:00:00 2001
From: uppps <uppps@gustr.com>
Date: Tue, 5 Sep 2017 10:43:33 +0000
Subject: [PATCH 27/88] Translated using Weblate (Spanish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 7d1af1bb..73e7d4c6 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -10,9 +10,9 @@
     "Create new room": "Crear nueva sala",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincidiera",
     "Custom Server Options": "Opciones de Servidor Personalizado",
-    "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás invitar usuarios por dirección de email, ni ser invitado por email por ti mismo.",
+    "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás ni invitar usuarios ni ser invitado a través de tu dirección de correo electrónico.",
     "delete the alias.": "borrar el alias.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar la sala alias %(alias)s y retirar %(name)s del directorio?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar el alias de la sala %(alias)s y eliminar %(name)s del directorio?",
     "Direct Chat": "Conversación directa",
     "Directory": "Directorio",
     "Download this file": "Descargar este archivo",
@@ -30,9 +30,9 @@
     "Failed to change settings": "Error al cambiar la configuración",
     "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
     "Failed to update keywords": "Error al actualizar las palabras clave",
-    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos de Home Server",
+    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos desde el Home Server",
     "Failed to get public room list": "No se pudo obtener la lista de salas públicas",
-    "Failed to join the room": "Falló al unirse a la sala",
+    "Failed to join the room": "Error al unirse a la sala",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Failed to set direct chat tag": "Error al establecer la etiqueta de chat directo",
     "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
@@ -50,7 +50,7 @@
     "Low Priority": "Baja Prioridad",
     "Members": "Miembros",
     "Mentions only": "Sólo menciones",
-    "Messages containing my display name": "Mensajes que contienen mi nombre para mostrar",
+    "Messages containing my display name": "Mensajes que contienen mi nombre",
     "Messages containing my user name": "Mensajes que contienen mi nombre de usuario",
     "Messages in group chats": "Mensajes en chats de grupo",
     "Messages in one-to-one chats": "Mensajes en chats uno a uno",
@@ -131,19 +131,19 @@
     "All Rooms": "Todas las salas",
     "Expand panel": "Expandir panel",
     "Failed to": "Falló",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, los registros de este cliente serán enviadas adjuntas a este informe de fallo. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, los registros de este cliente serán enviados adjuntos a este informe de fallo. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
     "Login": "Iniciar sesión",
     "Report a bug": "Informe de un fallo",
     "Search…": "Buscar…",
     "Send": "Enviar",
-    "Send logs": "Enviar trazas",
+    "Send logs": "Enviar registros",
     "Sorry, your browser is <b>not</b> able to run Riot.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar Riot.",
     "This Room": "Esta sala",
     "Unavailable": "No disponible",
     "Unknown device": "Dispositivo desconocido",
     "Update": "Actualizar",
     "Uploading report": "Enviando informe",
-    "What's New": "Lo que hay de nuevo",
+    "What's New": "Novedades",
     "What's new?": "¿Qué hay de nuevo?",
     "Waiting for response from server": "Esperando una respuesta del servidor",
     "You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
@@ -154,7 +154,7 @@
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Collecting logs": "Recolectando registros",
     "Dismiss": "Omitir",
-    "Failed to send report: ": "Error al enviar reporte: ",
+    "Failed to send report: ": "Error al enviar informe: ",
     "Loading bug report module": "Cargando módulo de reporte de errores",
     "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
     "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
@@ -167,12 +167,12 @@
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está usando Riot como invitado. ¡<a>Regístrese</a> o <a>inicie sesión</a> para acceder más salas y características!",
     "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Welcome to Riot.im": "Bienvenido a Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones &amp; colaboración cifradas y descentralizadas con el poder de [matrix]",
     "Search the room directory": "Buscar en el directorio de salas",
     "Chat with Riot Bot": "Conversar con el Bot de Riot",
-    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos tips de Riot Bot!",
+    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!",
     "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot",
     "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!",
     "Riot/Web &amp; Desktop chat": "Conversaciones de Riot/Web &amp; Desktop",

From 60c23385433d2cb671df6ff9db972b338cc55e3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 6 Sep 2017 11:27:04 +0100
Subject: [PATCH 28/88] generic contextual menu for tooltip/responses

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../context_menus/GenericTextContextMenu.js   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/components/views/context_menus/GenericTextContextMenu.js

diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.js
new file mode 100644
index 00000000..7df52dc1
--- /dev/null
+++ b/src/components/views/context_menus/GenericTextContextMenu.js
@@ -0,0 +1,29 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+import React, {PropTypes} from 'react';
+
+export default class GenericTextContextMenu extends React.Component {
+    static PropTypes = {
+        message: PropTypes.string.isRequired,
+    };
+
+    render() {
+        return <div>{ this.props.message }</div>;
+    }
+}

From 2e5a79e76cdeba89c2368ddf699b85b65d0f7d91 Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Wed, 6 Sep 2017 10:50:16 +0000
Subject: [PATCH 29/88] Translated using Weblate (Dutch)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
---
 src/i18n/strings/nl.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index adaca084..2511f4f1 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -86,7 +86,7 @@
     "Settings": "Instellingen",
     "Source URL": "Bron-URL",
     "Start chat": "Gesprek starten",
-    "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
+    "The Home Server may be too old to support third party networks": "De thuisserver is misschien te oud om netwerken van derde partijen te ondersteunen",
     "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet getoond worden",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbelast",
     "This room is inaccessible to guests. You may be able to join if you register.": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien kunnen deelnemen als je geregistreerd bent.",
@@ -196,7 +196,7 @@
     "Discussion of the Identity Service API": "Discussie over de Identity Service API",
     "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
     "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
-    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite ontwikkelteam",
+    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam",
     "You have successfully set a password and an email address!": "Het instellen van een wachtwoord en e-mailadres is geslaagd!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt.",
     "Warning": "Waarschuwing",
@@ -206,5 +206,7 @@
     "Downloading update...": "Update aan het downloaden...",
     "To return to your account in future you need to <u>set a password</u>": "Om in de toekomst naar je account terug te gaan moet je <u>een wachtwoord instellen</u>",
     "Set Password": "Wachtwoord instellen",
-    "Couldn't load home page": "Kon de home pagina niet laden"
+    "Couldn't load home page": "Kon de home pagina niet laden",
+    "Bug report sent": "Bug report verzonden",
+    "Thank you!": "Bedankt!"
 }

From b6a20f6441f9f3969adddddd0e7c6bfcb42d388a Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Wed, 6 Sep 2017 10:59:50 +0000
Subject: [PATCH 30/88] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index f6eeffbd..ec48f6cd 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -139,7 +139,7 @@
     "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上传",
     "Uploading report": "上传报告",
     "View Decrypted Source": "查看解密的来源",
-    "View Source": "查看来源",
+    "View Source": "查看源码",
     "What's New": "新鲜事",
     "What's new?": "有什么新闻？",
     "Waiting for response from server": "正在等待来自服务器的回应",

From 32ea675c9284622d3710a9ac970638e63a740863 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 6 Sep 2017 14:20:12 +0100
Subject: [PATCH 31/88] fix (C) header

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/context_menus/GenericTextContextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.js
index 7df52dc1..92cee781 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 95947323a28e844e26083486b62efea8fb2853ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20N=C3=A9meth?= <Kusaha1@gmail.com>
Date: Wed, 6 Sep 2017 16:43:16 +0000
Subject: [PATCH 32/88] Translated using Weblate (Hungarian)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
---
 src/i18n/strings/hu.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7a551587..69324620 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -129,7 +129,7 @@
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "A jelenlegi bőngésződdel teljesen hibás lehet az alkalmazás kinézete és bizonyos funkciók, ha nem az összes, nem fog működni. Ha mindenképpen ki akarod próbálni, folytathatod de egyedül vagy minden felbukkanó problémával!",
     "Messages containing <span>keywords</span>": "Az üzenet <span>kulcsszavakat</span> tartalmaz",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s alkalmazás %(browserName)s böngészőn %(osName)s rendszeren",
-    "A new version of Riot is available.": "Új verzió érhető el a Riot-ból.",
+    "A new version of Riot is available.": "Elérhető egy új Riot verzió.",
     "All Rooms": "Minden szobában",
     "Cancel": "Mégse",
     "Changelog": "Változások",
@@ -206,5 +206,7 @@
     "Error encountered (%(errorDetail)s).": "Hiba történt (%(errorDetail)s).",
     "No update available.": "Frissítés nem érthető el.",
     "Downloading update...": "Frissítés letöltése...",
-    "Couldn't load home page": "Kezdőképernyő betöltése sikertelen"
+    "Couldn't load home page": "Kezdőképernyő betöltése sikertelen",
+    "Bug report sent": "Hibajelentés elküldve",
+    "Thank you!": "Köszönjük!"
 }

From 5511fdd0c3832f51ec4ee60113606a11bac77f38 Mon Sep 17 00:00:00 2001
From: Ramon Vilar <ramon.vilar@gmail.com>
Date: Thu, 7 Sep 2017 09:12:29 +0000
Subject: [PATCH 33/88] Added translation using Weblate (Catalan)

---
 src/i18n/strings/ca.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/ca.json

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/strings/ca.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 7a62b058c90268f888a5c4cdc1b02c3686d13bb6 Mon Sep 17 00:00:00 2001
From: Ramon Vilar <ramon.vilar@gmail.com>
Date: Thu, 7 Sep 2017 13:15:07 +0000
Subject: [PATCH 34/88] Translated using Weblate (Catalan)

Currently translated at 54.5% (114 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
---
 src/i18n/strings/ca.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 9e26dfee..a40468be 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1 +1,116 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "Hi ha una nova versió del Riot disponible.",
+    "All messages": "Tots els missatges",
+    "Cancel": "Cancel·la",
+    "Close": "Tanca",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s a %(osName)s",
+    "Failed to change password. Is your password correct?": "Hi ha hagut un error al canviar la vostra contrasenya. És correcte la vostra contrasenya?",
+    "Continue": "Continua",
+    "All Rooms": "Totes les sales",
+    "Create new room": "Crea una nova sala",
+    "Couldn't find a matching Matrix room": "No s'ha pogut trobar una sala de Matrix que coincideixi",
+    "Failed to add tag %(tagName)s to room": "No s'ha pogut afegir l'etiqueta %(tagName)s a la sala",
+    "Failed to forget room %(errCode)s": "No s'ha pogut oblidar la sala %(errCode)s",
+    "Failed to get public room list": "No s'ha pogut obtenir el llistat de sales públiques",
+    "Failed to join the room": "No s'ha pogut unir a la sala",
+    "Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
+    "Filter room names": "Filtra els noms de les sales",
+    "Couldn't load home page": "No s'ha pogut carregar la pàgina d'inici",
+    "All messages (loud)": "Tots els missatges (sorollós)",
+    "Mentions only": "Només mencions",
+    "Mute": "Silenciat",
+    "Direct Chat": "Xat directe",
+    "Directory": "Directori",
+    "Failed to set direct chat tag": "No s'ha pogut establir l'etiqueta del xat directe",
+    "Room directory": "Directori de sales",
+    "Start chat": "Inicia un xat",
+    "Invite to this room": "Convida a aquesta sala",
+    "No rooms to show": "No hi ha sales a mostrar",
+    "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
+    "Room not found": "No s'ha trobat la sala",
+    "Unnamed room": "Sala sense nom",
+    "#example": "#exemple",
+    "Settings": "Paràmetres",
+    "Failed to change settings": "No s'han pogut modificar els paràmetres",
+    "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web",
+    "Enable desktop notifications": "Habilita les notificacions d'escriptori",
+    "Enable email notifications": "Habilita les notificacions per correu electrònic",
+    "Enable notifications for this account": "Habilita les notificacions per aquest compte",
+    "Low Priority": "Baixa prioritat",
+    "Members": "Membres",
+    "Changelog": "Registre de canvis",
+    "Describe your problem here.": "Descriu aquí el teu problema.",
+    "Download this file": "Descarrega aquest fitxer",
+    "Enable them now": "Habilita-ho ara",
+    "Error": "Error",
+    "Favourite": "Favorit",
+    "Files": "Fitxers",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "També funcionen el <a href=\"http://apple.com/safari\">Safari</a> i l'<a href=\"http://opera.com\">Opera</a>.",
+    "Add an email address above to configure email notifications": "Afegiu una adreça de correu electrònic més amunt per configurar les notificacions",
+    "Advanced notification settings": "Paràmetres avançats de notificacions",
+    "All notifications are currently disabled for all targets.": "Actualment totes les notificacions estan inhabilitades per a tots els objectius.",
+    "An error occurred whilst saving your email notification preferences.": "Hi ha hagut un error al desar les vostres preferències de notificació per correu electrònic.",
+    "Bug report sent": "S'ha enviat l'informe d'error",
+    "Call invitation": "Invitació a la trucada",
+    "Can't update user notification settings": "No es poden actualitzar els paràmetres de notificació de l'usuari",
+    "Collecting app version information": "Recol·lectant la informació de la versió de l'aplicació",
+    "Collecting logs": "Recol·lectant els registres",
+    "Custom Server Options": "Opcions de servidor personalitzat",
+    "Dismiss": "Omet",
+    "Enter keywords separated by a comma:": "Introdueix paraules clau separades per una coma:",
+    "Login": "Inicia sessió",
+    "Leave": "Abandona",
+    "Messages containing <span>keywords</span>": "Missatges que contenen <span>paraules clau</span>",
+    "Messages containing my user name": "Missatges que contenen el meu nom d'usuari",
+    "Messages in group chats": "Missatges a xats de grup",
+    "Messages containing my display name": "Missatges que contenen el meu nom",
+    "Messages in one-to-one chats": "Missatges en xats un a un",
+    "Messages sent by bot": "Missatges enviats pel bot",
+    "more": "més",
+    "Noisy": "Sorollós",
+    "Notification targets": "Objectius de notificació",
+    "Notifications": "Notificacions",
+    "Notify me for anything else": "Notifica'm per qualsevol altra cosa",
+    "Notify for all other messages/rooms": "Notifica per a tots els altres missatges/sales",
+    "Off": "Apagat",
+    "On": "Engegat",
+    "Permalink": "Enllaç permanent",
+    "Remove": "Elimina",
+    "remove %(name)s from the directory.": "elimina %(name)s del directori.",
+    "Remove from Directory": "Elimina del directori",
+    "Report a bug": "Informa d'una errada",
+    "Resend": "Reenvia",
+    "Search…": "Cerca…",
+    "Send": "Envia",
+    "Source URL": "URL origen",
+    "The server may be unavailable or overloaded": "El servidor pot no estar disponible o sobrecarregat",
+    "This Room": "Aquesta sala",
+    " to room": " a la sala",
+    "Unavailable": "No disponible",
+    "Unknown device": "Dispositiu desconegut",
+    "unknown error code": "codi d'error desconegut",
+    "What's New": "Novetats",
+    "What's new?": "Què hi ha de nou?",
+    "Waiting for response from server": "Esperant una resposta del servidor",
+    "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%code)s)",
+    "You cannot delete this message. (%(code)s)": "No podeu eliminar aquest missatge. (%code)s)",
+    "You are not receiving desktop notifications": "No esteu rebent notificacions d'escriptori",
+    "Thank you!": "Gràcies!",
+    "Sunday": "Diumenge",
+    "Monday": "Dilluns",
+    "Tuesday": "Dimarts",
+    "Wednesday": "Dimecres",
+    "Thursday": "Dijous",
+    "Friday": "Divendres",
+    "Saturday": "Dissabte",
+    "Today": "Avui",
+    "Yesterday": "Ahir",
+    "OK": "D'acord",
+    "Warning": "Advertència",
+    "Checking for an update...": "Comprovant si hi ha actualitzacions...",
+    "No update available.": "No hi ha cap actualització disponible.",
+    "Downloading update...": "Descarregant l'actualització...",
+    "Welcome page": "Pàgina de benvinguda",
+    "Welcome to Riot.im": "Benvingut a Riot.im",
+    "Chat with Riot Bot": "Conversa amb el Bot de Riot"
+}

From 95af34ca995b3bb8eed421565e98c1d7e541a609 Mon Sep 17 00:00:00 2001
From: Jan Kudrik <jan@kudrik.cz>
Date: Sun, 10 Sep 2017 10:42:15 +0000
Subject: [PATCH 35/88] Translated using Weblate (Czech)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
---
 src/i18n/strings/cs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 9329e811..1361aa66 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -30,7 +30,7 @@
     "Error": "Chyba",
     "Failed to change settings": "Nepodařilo se změnit nastavení",
     "Failed to get public room list": "Nepodařilo se získat seznam veřejných místností",
-    "Failed to join the room": "Nepodařilo se vstoupit do místnosti",
+    "Failed to join the room": "Vstup do místnosti se nezdařil",
     "Favourite": "V oblíbených",
     "Guests can join": "Hosté mohou vstoupit",
     "Guest users can't invite users. Please register to invite.": "Hosté nemohou zvát uživatele. Zaregistrujte se a budete moci zvát.",

From b7f31d0a648de75510a291211cbdafe8a2603eb7 Mon Sep 17 00:00:00 2001
From: av3n <mh@hirschstein.it>
Date: Sat, 9 Sep 2017 20:21:22 +0000
Subject: [PATCH 36/88] Translated using Weblate (Italian)

Currently translated at 99.5% (208 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
---
 src/i18n/strings/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d3d90dc4..b5bf32f3 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -205,5 +205,6 @@
     "Discussion of all things Matrix!": "Discussione su tutto quanto riguardi Matrix!",
     "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
     "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!"
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
+    "Thank you!": "Grazie!"
 }

From 3a77d8aa21baae2dda5ffe2dc2898d1a077bf09c Mon Sep 17 00:00:00 2001
From: Akcja Demokracja Open-Source <wolontariat@akcjademokracja.pl>
Date: Mon, 11 Sep 2017 12:05:59 +0000
Subject: [PATCH 37/88] Translated using Weblate (Polish)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
---
 src/i18n/strings/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 09926edf..699b71d0 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -35,7 +35,7 @@
     "Collapse panel": "Ukryj panel",
     "customServer_text": "Możesz używać opcji serwera niestandardowego do logowania się na inne serwery Matrix, określając inny adres URL serwera domowego.<br/>Pozwala to na wykorzystanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Można również ustawić niestandardowy serwer tożsamości, ale nie będzie można zapraszać użytkowników adresem e-mail, ani być zaproszonym przez adres e-mailowy.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Usuń alias %(alias)s i usuń %(name)s z katalogu?",
-    "Dismiss": "Zdymisjonować",
+    "Dismiss": "Zamknij",
     "Drop here %(toAction)s": "Upuść tutaj %(toAction)s",
     "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym",
     "Enable email notifications": "Włącz powiadomienia e-mailowe",

From dc6a7e742596565c05c6fffd08761623d231a89a Mon Sep 17 00:00:00 2001
From: Balaji Ravichandran <rbalajives@gmail.com>
Date: Sun, 10 Sep 2017 06:20:35 +0000
Subject: [PATCH 38/88] Translated using Weblate (Tamil)

Currently translated at 69.8% (146 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
---
 src/i18n/strings/ta.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index fc62b403..3e0e3463 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -143,5 +143,6 @@
     "World readable": "உலகமே படிக்கும்படி",
     "You cannot delete this image. (%(code)s)": "இந்த படத்தை நீங்கள் அழிக்க முடியாது. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "இந்த செய்தியை நீங்கள் அழிக்க முடியாது. (%(code)s)",
-    "You are not receiving desktop notifications": "திரை அறிவிப்புகளை நீங்கள் பெறவில்லை"
+    "You are not receiving desktop notifications": "திரை அறிவிப்புகளை நீங்கள் பெறவில்லை",
+    "Bug report sent": "வழு அறிக்கை அனுப்பப்பட்டது"
 }

From 728ffd37b893466070500a80e6c010815af7fd5b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:50:57 +0000
Subject: [PATCH 39/88] Translated using Weblate (Arabic)

Currently translated at 14.8% (31 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
---
 src/i18n/strings/ar.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 0140b0ec..dde9737a 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -24,7 +24,7 @@
     "Couldn't find a matching Matrix room": "لا يمكن إيجاد غرفة مايتركس متطابقة",
     "Custom Server Options": "إعدادات السيرفر خاصة",
     "delete the alias.": "إلغاء المُعرف.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "إلغاء مُعرف الغرفة %(alias) وحذف %(name) من الدليل؟",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "إلغاء مُعرف الغرفة %(alias)s وحذف %(name)s من الدليل؟",
     "Describe your problem here.": "صِف مشكلتك هنا.",
     "Direct Chat": "دردشة مباشرة",
     "Directory": "دليل",

From f48cfdcfe0e9bfc51b6361c38b1e5fcd01a52087 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:36:37 +0000
Subject: [PATCH 40/88] Translated using Weblate (Catalan)

Currently translated at 54.5% (114 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
---
 src/i18n/strings/ca.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index a40468be..56311ec7 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -92,8 +92,8 @@
     "What's New": "Novetats",
     "What's new?": "Què hi ha de nou?",
     "Waiting for response from server": "Esperant una resposta del servidor",
-    "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%code)s)",
-    "You cannot delete this message. (%(code)s)": "No podeu eliminar aquest missatge. (%code)s)",
+    "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "No podeu eliminar aquest missatge. (%(code)s)",
     "You are not receiving desktop notifications": "No esteu rebent notificacions d'escriptori",
     "Thank you!": "Gràcies!",
     "Sunday": "Diumenge",

From 30f81e21433fb34165b5b6c4c54d38e02aa17ad3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:36:57 +0000
Subject: [PATCH 41/88] Translated using Weblate (Dutch)

Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
---
 src/i18n/strings/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 2511f4f1..61638529 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -201,7 +201,7 @@
     "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt.",
     "Warning": "Waarschuwing",
     "Checking for an update...": "Aan het kijken voor een update...",
-    "Error encountered (%(errorDetail)s).": "Fout ondervonden (%errorDetail)s).",
+    "Error encountered (%(errorDetail)s).": "Fout ondervonden (%(errorDetail)s).",
     "No update available.": "Geen update beschikbaar.",
     "Downloading update...": "Update aan het downloaden...",
     "To return to your account in future you need to <u>set a password</u>": "Om in de toekomst naar je account terug te gaan moet je <u>een wachtwoord instellen</u>",

From a5a1b5fcd83e5b5dc736d14949b04ddab1ca7324 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:50:38 +0000
Subject: [PATCH 42/88] Translated using Weblate (Italian)

Currently translated at 99.5% (208 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
---
 src/i18n/strings/it.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index b5bf32f3..82ba060a 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -94,13 +94,13 @@
     "powered by Matrix": "offerto da Matrix",
     "Quote": "Cita",
     "Reject": "Rifiuta",
-    "Remove %(name)s from the directory?": "Rimuovere %(name) dalla lista?",
+    "Remove %(name)s from the directory?": "Rimuovere %(name)s dalla lista?",
     "Remove": "Rimuovi",
-    "remove %(name)s from the directory.": "rimuovi %(name) dalla lista.",
+    "remove %(name)s from the directory.": "rimuovi %(name)s dalla lista.",
     "Remove from Directory": "Rimuovi dalla lista",
     "Report a bug": "Segnala un errore",
     "Resend": "Reinvia",
-    "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)",
+    "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s",
     "Riot does not know how to join a room on this network": "Riot non sa come entrare nella stanza su questa rete",
     "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilizza molte funzioni avanzate del browser, alcune delle quali non sono disponibili o sono sperimentali nel tuo browser attuale.",

From 8513ea2a319e7316deda98562563c24c13559bae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:50:23 +0000
Subject: [PATCH 43/88] Translated using Weblate (Malayalam)

Currently translated at 98.5% (206 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
---
 src/i18n/strings/ml.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index f82e96a6..b099046d 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -153,7 +153,7 @@
     "OK": "ശരി",
     "Warning": "മുന്നറിയിപ്പ്",
     "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു...",
-    "Error encountered (%(errorDetail)s).": "എറര്‍ നേരിട്ടു (%errorDetail)s).",
+    "Error encountered (%(errorDetail)s).": "എറര്‍ നേരിട്ടു (%(errorDetail)s).",
     "No update available.": "അപ്ഡേറ്റുകള്‍ ലഭ്യമല്ല.",
     "Downloading update...": "അപ്ഡേറ്റ് ഡൌണ്‍ലോഡ് ചെയ്യുന്നു...",
     "You need to be using HTTPS to place a screen-sharing call.": "സ്ക്രീന്‍ ഷെയറിങ്ങ് കോള്‍ നടത്തണമെങ്കില്‍ https ഉപയോഗിക്കണം.",

From 9691173032cd702a35a9bdec34c20c7ee74a8b17 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 12 Sep 2017 10:49:55 +0000
Subject: [PATCH 44/88] Translated using Weblate (Tamil)

Currently translated at 69.8% (146 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
---
 src/i18n/strings/ta.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index 3e0e3463..092412b2 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -62,12 +62,12 @@
     "Enter keywords separated by a comma:": "ஒரு comma மூலம் முக்கிய வார்த்தைகளை உள்ளிடவும்:",
     "Error saving email notification preferences": "மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் கோளாறு",
     "Failed to get protocol list from Home Server": "முகப்பு சேவையகத்திலிருந்து நெறிமுறை பட்டியலைப் பெறுவதில் தோல்வி",
-    "Failed to remove tag %(tagName)s from room": "அறையில் இருந்து குறிச்சொல்% (tagName) களை அகற்றுவது தோல்வியடைந்தது",
+    "Failed to remove tag %(tagName)s from room": "அறையில் இருந்து குறிச்சொல் %(tagName)s களை அகற்றுவது தோல்வியடைந்தது",
     "Failed to set direct chat tag": "நேரடி அரட்டை குறியை அமைப்பதில் தோல்வி",
     "Failed to set Direct Message status of room": "அறையின் நேரடி செய்தி நிலையை அமைக்க தவறிவிட்டது",
     "Fetching third party location failed": "மூன்றாம் இடத்தில்  உள்ள  இடம் தோல்வி",
     "Forward Message": "முன்னோடி செய்தி",
-    "(HTTP status %(httpStatus)s)": "(HTTP நிலைகள்% (httpStatus) )",
+    "(HTTP status %(httpStatus)s)": "(HTTP நிலைகள் %(httpStatus)s)",
     "customServer_text": "நீங்கள் மற்ற Matrix வழங்கிகள் உள்நுழைய உங்கள் விருப்பமான வழங்கி இடப்புகளை உபயோகப்படுத்தலாம்.<br/>இது மற்ற வழங்கியில் உங்கள் Matrix கணக்கிணை Riot மூலம் பயன்படுத்த உதவும்.<br/><br/>நீங்கள் மற்ற அடையாள வழங்கியையும் பயன்படுத்தலாம், ஆனால் நீங்கள் மற்ற பயனர்களை மின்னஞ்சல் மூலம் அழைக்கவோ, நீங்கள் அழைக்கப்படவோ இயலாது.",
     "Guest users can't invite users. Please register to invite.": "விருந்தினர் பயனர்கள் பயனர்களை அழைக்க முடியாது. தயவுசெய்து அழைக்கவும்.",
     "I understand the risks and wish to continue": "நான் அபாயங்களைப் புரிந்துகொண்டு தொடர விரும்புகிறேன்",
@@ -96,9 +96,9 @@
     "powered by Matrix": "Matrix-ஆல் ஆனது",
     "Quote": "மேற்கோள்",
     "Reject": "நிராகரி",
-    "Remove %(name)s from the directory?": "அடைவிலிருந்து %(name)-ஐ நீக்கலாமா?",
+    "Remove %(name)s from the directory?": "அடைவிலிருந்து %(name)s-ஐ நீக்கலாமா?",
     "Remove": "நீக்கு",
-    "remove %(name)s from the directory.": "அடைவிலிருந்து %(name)-ஐ நீக்கு.",
+    "remove %(name)s from the directory.": "அடைவிலிருந்து %(name)s-ஐ நீக்கு.",
     "Remove from Directory": "அடைவிலிருந்து நீக்கு",
     "Report a bug": "வழுவைத் தெரியப்படுத்து",
     "Resend": "மீண்டும் அனுப்பு",

From 2316f4230eb6f19081d2d0cc96baaf947dff4a2d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 Sep 2017 14:23:35 +0100
Subject: [PATCH 45/88] install and use prop-types over React.PropTypes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                                 | 1 +
 src/components/views/context_menus/GenericTextContextMenu.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc41791b..fba685d1 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "matrix-react-sdk": "0.10.2",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
+    "prop-types": "^15.5.10",
     "react": "^15.6.0",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.js
index 92cee781..2319fe05 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.js
@@ -16,7 +16,8 @@ limitations under the License.
 
 'use strict';
 
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 export default class GenericTextContextMenu extends React.Component {
     static PropTypes = {

From ac0f593c7c9cf0a501cadfa12800ad7bf198ea18 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Sep 2017 15:34:45 -0600
Subject: [PATCH 46/88] CSS for unignore button in UserSettings

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 .../css/matrix-react-sdk/structures/_UserSettings.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 31686a7c..ec1cfd2e 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -80,6 +80,16 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_UserSettings_button.mx_UserSettings_buttonSmall {
+    height: 36px;
+    padding: 4px;
+    padding-left: 7px;
+    padding-right: 7px;
+    font-size: 12px;
+    margin-right: 5px;
+    line-height: 12px;
+}
+
 .mx_UserSettings_button.danger {
     background-color: $warning-color;
 }

From a4e33bf46aba1f48908eee3f1c784c02eadc3d7b Mon Sep 17 00:00:00 2001
From: turt2live <travpc@gmail.com>
Date: Thu, 14 Sep 2017 21:09:57 -0600
Subject: [PATCH 47/88] Fix alias on home page for identity room

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 res/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/home.html b/res/home.html
index 3ba2e964..4b8da3da 100644
--- a/res/home.html
+++ b/res/home.html
@@ -249,7 +249,7 @@
             <span class="mx_HomePage_desc">_t("Implementing VoIP services with Matrix")</span>
         </div>
         <div class="mx_HomePage_room">
-            <a href="#/room/#identity:matrix.org">
+            <a href="#/room/#matrix-identity:matrix.org">
                 <img class="mx_HomePage_icon" src="home/rooms/identity.jpg">
                 <span class="mx_HomePage_name">Matrix Identity</span>
             </a>

From b2e1a2956fbd6631c5ff8417d42cc812df6fdc51 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 Sep 2017 12:26:45 +0100
Subject: [PATCH 48/88] Include Finnish translation

Which is 100% on riot-web and 40% on react-sdk which is probably
at a point where it can be useful.
---
 scripts/copy-res.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index ac3daf60..59f71692 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -17,6 +17,7 @@ const INCLUDE_LANGS = [
     {'value': 'eo', 'label': 'Esperanto'},
     {'value': 'es', 'label': 'Español'},
     {'value': 'eu', 'label': 'Euskal'},
+    {'value': 'fi', 'label': 'Suomi'},
     {'value': 'fr', 'label': 'Français'},
     {'value': 'hu', 'label': 'Magyar'},
     {'value': 'ko', 'label': '한국어'},

From 30efd02d22c0b47948c17b0554805c82db6696b8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 Sep 2017 15:57:37 +0100
Subject: [PATCH 49/88] Fix test for new behaviour of 'joining' flag

It's no longer reset when the join request completes, so don't
assert it. (The important test is later, asserting that the room
object is non-null).
---
 test/app-tests/joining.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 9e0a84c7..c37fde6a 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -176,9 +176,6 @@ describe('joining a room', function () {
 
                 return Promise.delay(1);
             }).then(() => {
-                // We've joined, expect this to false
-                expect(roomView.state.joining).toBe(false);
-
                 // now send the room down the /sync pipe
                 httpBackend.when('GET', '/sync').
                     respond(200, {

From 821ab6c13eb69d0af4372395d218b8f0928fa935 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Sep 2017 11:06:46 +0100
Subject: [PATCH 50/88] switch to controlled inputs and require eventType !==
 ''

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index a7ac9fb1..22fd712d 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -29,11 +29,14 @@ class SendCustomEvent extends React.Component {
         super(props, context);
         this._send = this._send.bind(this);
         this.onBack = this.onBack.bind(this);
-    }
+        this._onChange = this._onChange.bind(this);
 
-    state = {
-        message: null,
-    };
+        this.state = {
+            message: null,
+            input_eventType: '',
+            input_evContent: '{\n\n}',
+        };
+    }
 
     onBack() {
         if (this.state.message) {
@@ -51,13 +54,18 @@ class SendCustomEvent extends React.Component {
     }
 
     send(content) {
-        return MatrixClientPeg.get().sendEvent(this.props.roomId, this.refs.eventType.value, content);
+        return MatrixClientPeg.get().sendEvent(this.props.roomId, this.state.input_eventType, content);
     }
 
     async _send() {
+        if (this.state.input_eventType === '') {
+            this.setState({ message: _t('You must specify an event type!') });
+            return;
+        }
+
         let message;
         try {
-            const content = JSON.parse(this.refs.evContent.value);
+            const content = JSON.parse(this.state.input_evContent);
             await this.send(content);
             message = _t('Event sent!');
         } catch (e) {
@@ -67,7 +75,11 @@ class SendCustomEvent extends React.Component {
     }
 
     _additionalFields() {
-        return <div></div>;
+        return <div/>;
+    }
+
+    _onChange(e) {
+        this.setState({[`input_${e.target.id}`]: e.target.value});
     }
 
     render() {
@@ -87,14 +99,14 @@ class SendCustomEvent extends React.Component {
                     <label htmlFor="eventType"> { _t('Event Type') } </label>
                 </div>
                 <div>
-                    <input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" />
+                    <input id="eventType" onChange={this._onChange} value={this.state.input_eventType} className="mx_TextInputDialog_input" size="64" />
                 </div>
 
                 <div className="mx_TextInputDialog_label">
                     <label htmlFor="evContent"> { _t('Event Content') } </label>
                 </div>
                 <div>
-                    <textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" />
+                    <textarea id="evContent" onChange={this._onChange} value={this.state.input_evContent} className="mx_TextInputDialog_input" cols="63" rows="5" />
                 </div>
             </div>
             {this._buttons()}
@@ -103,9 +115,14 @@ class SendCustomEvent extends React.Component {
 }
 
 class SendCustomStateEvent extends SendCustomEvent {
+    constructor(props, context) {
+        super(props, context);
+        this.state['input_stateKey'] = '';
+    }
+
     send(content) {
-        return MatrixClientPeg.get().sendStateEvent(this.props.roomId, this.refs.eventType.value, content,
-            this.refs.stateKey.value);
+        const cli = MatrixClientPeg.get();
+        return cli.sendStateEvent(this.props.roomId, this.state.input_eventType, content, this.state.input_stateKey);
     }
 
     _additionalFields() {
@@ -114,7 +131,7 @@ class SendCustomStateEvent extends SendCustomEvent {
                 <label htmlFor="stateKey"> { _t('State Key') } </label>
             </div>
             <div>
-                <input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" />
+                <input id="stateKey" onChange={this._onChange} value={this.state.input_stateKey} className="mx_TextInputDialog_input" size="64" />
             </div>
         </div>;
     }

From af450df513887eb83405c04413d5cc00dca853b9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Sep 2017 11:27:31 +0100
Subject: [PATCH 51/88] add ability to jump from RSE to Send Custom State Event
 prefilled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DevtoolsDialog.js           | 66 +++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 22fd712d..6f9d6316 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -23,6 +23,14 @@ class SendCustomEvent extends React.Component {
     static propTypes = {
         roomId: React.PropTypes.string.isRequired,
         onBack: React.PropTypes.func.isRequired,
+
+        eventType: React.PropTypes.string.isRequired,
+        evContent: React.PropTypes.string.isRequired,
+    };
+
+    static defaultProps = {
+        eventType: '',
+        evContent: '{\n\n}',
     };
 
     constructor(props, context) {
@@ -33,8 +41,8 @@ class SendCustomEvent extends React.Component {
 
         this.state = {
             message: null,
-            input_eventType: '',
-            input_evContent: '{\n\n}',
+            input_eventType: this.props.eventType,
+            input_evContent: this.props.evContent,
         };
     }
 
@@ -115,9 +123,24 @@ class SendCustomEvent extends React.Component {
 }
 
 class SendCustomStateEvent extends SendCustomEvent {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onBack: React.PropTypes.func.isRequired,
+
+        eventType: React.PropTypes.string.isRequired,
+        evContent: React.PropTypes.string.isRequired,
+        stateKey: React.PropTypes.string.isRequired,
+    };
+
+    static defaultProps = {
+        eventType: '',
+        evContent: '{\n\n}',
+        stateKey: '',
+    };
+
     constructor(props, context) {
         super(props, context);
-        this.state['input_stateKey'] = '';
+        this.state['input_stateKey'] = this.props.stateKey;
     }
 
     send(content) {
@@ -139,6 +162,7 @@ class SendCustomStateEvent extends SendCustomEvent {
 
 class RoomStateExplorer extends React.Component {
     static propTypes = {
+        setMode: React.PropTypes.func.isRequired,
         roomId: React.PropTypes.string.isRequired,
         onBack: React.PropTypes.func.isRequired,
     };
@@ -150,6 +174,7 @@ class RoomStateExplorer extends React.Component {
         this.roomStateEvents = room.currentState.events;
 
         this.onBack = this.onBack.bind(this);
+        this.editEv = this.editEv.bind(this);
     }
 
     state = {
@@ -165,7 +190,7 @@ class RoomStateExplorer extends React.Component {
 
     onViewSourceClick(event) {
         return () => {
-            this.setState({ event: event.event });
+            this.setState({ event });
         };
     }
 
@@ -179,14 +204,24 @@ class RoomStateExplorer extends React.Component {
         }
     }
 
+    editEv() {
+        const ev = this.state.event;
+        this.props.setMode(SendCustomStateEvent, {
+            eventType: ev.getType(),
+            evContent: JSON.stringify(ev.getContent(), null, '\t'),
+            stateKey: ev.getStateKey(),
+        });
+    }
+
     render() {
         if (this.state.event) {
             return <div className="mx_ViewSource">
                 <div className="mx_Dialog_content">
-                    <pre>{JSON.stringify(this.state.event, null, 2)}</pre>
+                    <pre>{JSON.stringify(this.state.event.event, null, 2)}</pre>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onBack}>{ _t('Back') }</button>
+                    <button onClick={this.editEv}>{ _t('Edit') }</button>
                 </div>
             </div>;
         }
@@ -240,11 +275,13 @@ export default class DevtoolsDialog extends React.Component {
 
     state = {
         mode: null,
+        modeArgs: {},
     };
 
     constructor(props, context) {
         super(props, context);
         this.onBack = this.onBack.bind(this);
+        this.setMode = this.setMode.bind(this);
         this.onCancel = this.onCancel.bind(this);
     }
 
@@ -254,10 +291,14 @@ export default class DevtoolsDialog extends React.Component {
 
     _setMode(mode) {
         return () => {
-            this.setState({ mode });
+            this.setMode(mode);
         };
     }
 
+    setMode(mode, modeArgs={}) {
+        this.setState({ mode, modeArgs });
+    }
+
     onBack() {
         this.setState({ mode: null });
     }
@@ -270,7 +311,8 @@ export default class DevtoolsDialog extends React.Component {
         let body;
 
         if (this.state.mode) {
-            body = <this.state.mode {...this.props} onBack={this.onBack} />;
+            body =
+                <this.state.mode {...this.props} {...this.state.modeArgs} onBack={this.onBack} setMode={this.setMode} />;
         } else {
             body = <div>
                 <div className="mx_Dialog_content">
@@ -285,9 +327,11 @@ export default class DevtoolsDialog extends React.Component {
         }
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        return <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
-            <div>Room ID: {this.props.roomId}</div>
-            { body }
-        </BaseDialog>;
+        return (
+            <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
+                <div>Room ID: { this.props.roomId }</div>
+                { body }
+            </BaseDialog>
+        );
     }
 }

From dccee6d419222c4996e2daa74fd57cbb63e296a8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Sep 2017 12:03:11 +0100
Subject: [PATCH 52/88] add ability to filter room state types/results

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DevtoolsDialog.js      | 13 +++++++++++++
 .../vector-web/views/dialogs/_DevtoolsDialog.scss   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 6f9d6316..9c5948b4 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -175,9 +175,11 @@ class RoomStateExplorer extends React.Component {
 
         this.onBack = this.onBack.bind(this);
         this.editEv = this.editEv.bind(this);
+        this.onQuery = this.onQuery.bind(this);
     }
 
     state = {
+        query: '',
         eventType: null,
         event: null,
     };
@@ -213,6 +215,10 @@ class RoomStateExplorer extends React.Component {
         });
     }
 
+    onQuery(ev) {
+        this.setState({ query: ev.target.value });
+    }
+
     render() {
         if (this.state.event) {
             return <div className="mx_ViewSource">
@@ -230,6 +236,9 @@ class RoomStateExplorer extends React.Component {
 
         if (this.state.eventType === null) {
             Object.keys(this.roomStateEvents).forEach((evType) => {
+                // Skip this entry if does not contain search query
+                if (this.state.query && !evType.includes(this.state.query)) return;
+
                 const stateGroup = this.roomStateEvents[evType];
                 const stateKeys = Object.keys(stateGroup);
 
@@ -248,6 +257,9 @@ class RoomStateExplorer extends React.Component {
             const evType = this.state.eventType;
             const stateGroup = this.roomStateEvents[evType];
             Object.keys(stateGroup).forEach((stateKey) => {
+                // Skip this entry if does not contain search query
+                if (this.state.query && !stateKey.includes(this.state.query)) return;
+
                 const ev = stateGroup[stateKey];
                 rows.push(<button className="mx_DevTools_RoomStateExplorer_button" key={stateKey}
                                   onClick={this.onViewSourceClick(ev)}>
@@ -258,6 +270,7 @@ class RoomStateExplorer extends React.Component {
 
         return <div>
             <div className="mx_Dialog_content">
+                <input onChange={this.onQuery} placeholder={_t('Filter results')} size="64" className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query" value={this.state.query} />
                 {rows}
             </div>
             <div className="mx_Dialog_buttons">
diff --git a/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
index c22a3834..975ee8c1 100644
--- a/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
+++ b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DevTools_RoomStateExplorer_button {
+.mx_DevTools_RoomStateExplorer_button, .mx_DevTools_RoomStateExplorer_query {
     margin-bottom: 10px;
 }

From 00976d93385552d2deb683b944c522368d6258ac Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Sep 2017 12:04:11 +0100
Subject: [PATCH 53/88] i18n new DevTools strings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4f4a788b..f7b02bf7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -59,6 +59,7 @@
   "Favourite": "Favourite",
   "Fetching third party location failed": "Fetching third party location failed",
   "Files": "Files",
+  "Filter results": "Filter results",
   "Filter room names": "Filter room names",
   "Forget": "Forget",
   "Forward Message": "Forward Message",
@@ -156,6 +157,7 @@
   "You are not receiving desktop notifications": "You are not receiving desktop notifications",
   "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
   "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+  "You must specify an event type!": "You must specify an event type!",
   "Thank you!": "Thank you!",
   "Sunday": "Sunday",
   "Monday": "Monday",

From d97224e69e21edd0e0d2595235f32d901a31fb4e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Sep 2017 00:53:44 +0100
Subject: [PATCH 54/88] fix really dumb blunder/typo preventing system from
 going to sleep.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron_app/src/electron-main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index ce5ac384..4ffe2110 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -84,7 +84,7 @@ let powerSaveBlockerId;
 electron.ipcMain.on('app_onAction', function(ev, payload) {
     switch (payload.action) {
         case 'call_state':
-            if (powerSaveBlockerId && powerSaveBlockerId.isStarted(powerSaveBlockerId)) {
+            if (powerSaveBlockerId && electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) {
                 if (payload.state === 'ended') {
                     electron.powerSaveBlocker.stop(powerSaveBlockerId);
                 }

From c32e736754b2935b422a887c9e4b7fd0c9ad08c9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 Sep 2017 10:23:12 +0100
Subject: [PATCH 55/88] Comment why we don't expect joining flag to reset

---
 test/app-tests/joining.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index c37fde6a..29da3413 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -176,6 +176,10 @@ describe('joining a room', function () {
 
                 return Promise.delay(1);
             }).then(() => {
+                // NB. we don't expect the 'joining' flag to reset at any point:
+                // it will stay set and we observe whether we have Room object for
+                // the room and whether our member event shows we're joined.
+
                 // now send the room down the /sync pipe
                 httpBackend.when('GET', '/sync').
                     respond(200, {

From 38c0d624782c6dd9625b7fd46e5ec1e45553171f Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 19 Sep 2017 10:46:00 +0100
Subject: [PATCH 56/88] Fix typo for integs error button error

---
 .../vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
index 517ff94c..87befcfa 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -42,7 +42,7 @@ limitations under the License.
     float: right;
 }
 .mx_RoomSettings_integrationsButton_error {
-    pointer: not-allowed;
+    cursor: not-allowed;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
     position: absolute;

From 57851cd508ce16916ff951eeeb7baf67192b9b53 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 Sep 2017 10:54:35 +0100
Subject: [PATCH 57/88] js-sdk & react-sdk rc.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6866799a..16385324 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.8.2",
-    "matrix-react-sdk": "0.10.3",
+    "matrix-js-sdk": "0.8.3-rc.1",
+    "matrix-react-sdk": "0.10.4-rc.1",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "prop-types": "^15.5.10",

From 8a4710b270fe7cc399bfddd9abde171b5be24f1e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 Sep 2017 10:55:28 +0100
Subject: [PATCH 58/88] v0.12.4-rc.1

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index ea0932b6..e2b34eac 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.12.3",
+  "version": "0.12.4-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From ab66833c45574d001ce170eefd9850ed4b67c68c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 Sep 2017 10:57:01 +0100
Subject: [PATCH 59/88] Prepare changelog for v0.12.4-rc.1

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2541d19..95eb0766 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+Changes in [0.12.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.4-rc.1) (2017-09-19)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3...v0.12.4-rc.1)
+
+ * Fix test for new behaviour of 'joining' flag
+   [\#5053](https://github.com/vector-im/riot-web/pull/5053)
+ * fix really dumb blunder/typo preventing system from going to sleep.
+   [\#5080](https://github.com/vector-im/riot-web/pull/5080)
+ * T3chguy/devtools
+   [\#4735](https://github.com/vector-im/riot-web/pull/4735)
+ * CSS for unignore button in UserSettings
+   [\#5042](https://github.com/vector-im/riot-web/pull/5042)
+ * Fix alias on home page for identity room
+   [\#5044](https://github.com/vector-im/riot-web/pull/5044)
+ * generic contextual menu for tooltip/responses
+   [\#4989](https://github.com/vector-im/riot-web/pull/4989)
+ * Update from Weblate.
+   [\#5018](https://github.com/vector-im/riot-web/pull/5018)
+ * Avoid re-rendering RoomList on room switch
+   [\#5015](https://github.com/vector-im/riot-web/pull/5015)
+ * Fix menu on change keyboard language issue #4345
+   [\#4623](https://github.com/vector-im/riot-web/pull/4623)
+ * Make isInvite default to false
+   [\#4999](https://github.com/vector-im/riot-web/pull/4999)
+ * Revert "Implement sticky date separators"
+   [\#4991](https://github.com/vector-im/riot-web/pull/4991)
+ * Implement sticky date separators
+   [\#4939](https://github.com/vector-im/riot-web/pull/4939)
+
 Changes in [0.12.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.3) (2017-09-06)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.3...v0.12.3)

From ca50d1f04ad1dab34b73e7b408c97e138a539b8d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 Sep 2017 10:57:02 +0100
Subject: [PATCH 60/88] v0.12.4-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 16385324..828e649e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.12.3",
+  "version": "0.12.4-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From d25c3be6274c642336f3e7dcefc7751392777c40 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 19 Sep 2017 11:59:51 +0100
Subject: [PATCH 61/88] CSS to fix ugly integrations button

See matrix-org/matrix-react-sdk#1399
---
 .../views/rooms/_RoomSettings.scss            | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
index 87befcfa..9e269ac2 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -21,9 +21,7 @@ limitations under the License.
 }
 
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_unbanButton,
-.mx_RoomSettings_integrationsButton,
-.mx_RoomSettings_integrationsButton_error {
+.mx_RoomSettings_unbanButton {
     position: relative;
     height: 36px;
     background-color: $accent-color;
@@ -36,25 +34,37 @@ limitations under the License.
     padding-left: 12px;
     padding-right: 12px;
 }
+.mx_RoomSettings_integrationsButton_error {
+    position: relative;
+    cursor: not-allowed;
+}
+.mx_RoomSettings_integrationsButton_error img {
+    position: absolute;
+    right: -5px;
+    top: -5px;
+}
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_integrationsButton,
 .mx_RoomSettings_integrationsButton_error {
     float: right;
 }
-.mx_RoomSettings_integrationsButton_error {
-    cursor: not-allowed;
+.mx_RoomSettings_integrationsButton_error .mx_RoomSettings_integrationsButton_errorPopup {
+    display: none;
+}
+.mx_RoomSettings_integrationsButton_error:hover .mx_RoomSettings_integrationsButton_errorPopup {
+    display: inline;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
     position: absolute;
     top: 110%;
-    left: -26%;
-    width: 150%;
+    left: -125%;
+    width: 348%;
     padding: 2%;
     font-size: 10pt;
     line-height: 1.5em;
     border-radius: 5px;
     background-color: $accent-color;
     color: $accent-fg-color;
+    text-align: center;
 }
 .mx_RoomSettings_unbanButton {
     display: inline;

From 7469ab5ed917934ece17bbd5e54969af8bee86d0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 19 Sep 2017 16:56:46 +0100
Subject: [PATCH 62/88] Alter opacity for flair

Apply 0.7 opacity to flair, but keep name and aux at 0.5
---
 .../css/matrix-react-sdk/views/rooms/_EventTile.scss   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index e9c62d3a..91e09601 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -45,7 +45,6 @@ limitations under the License.
 
 .mx_EventTile .mx_SenderProfile {
     color: $primary-fg-color;
-    opacity: 0.5;
     font-size: 14px;
     display: block; /* anti-zalgo, with overflow hidden */
     overflow-y: hidden;
@@ -57,6 +56,15 @@ limitations under the License.
     line-height: 22px;
 }
 
+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_name,
+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_aux {
+    opacity: 0.5;
+}
+
+.mx_EventTile .mx_SenderProfile .mx_Flair {
+    opacity: 0.7;
+}
+
 .mx_EventTile .mx_MessageTimestamp {
     display: block;
     visibility: hidden;

From e4082d4f45fb212d5fa04279b69731f607e288f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 14:25:33 +0100
Subject: [PATCH 63/88] Support multiple configs on the command line

---
 scripts/deploy.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index e7ad3f78..65c3bac6 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -165,7 +165,7 @@ if __name__ == "__main__":
         )
     )
     parser.add_argument(
-        "--config", nargs='?', default='./config.json', help=(
+        "--config", nargs='*', default='./config.json', help=(
             "Write a symlink at config.json in the extracted tarball to this \
             location. (Default: '%(default)s')"
         )
@@ -182,8 +182,7 @@ if __name__ == "__main__":
     deployer.packages_path = args.packages_dir
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
-    deployer.config_locations = {
-        "config.json": args.config,
-    }
+
+    deployer.config_locations = { os.path.basename(c): c for c in args.config }
 
     deployer.deploy(args.tarball, args.extract_path)

From be938ac0f4cbc701a101df5cb7e2b2b4e9ece96e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 14:38:41 +0100
Subject: [PATCH 64/88] Accept globs for the config location

and make the default config*.sjon so we'll automatically symlink
any config files in the current dir.
---
 scripts/deploy.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index 65c3bac6..e710e2c3 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -14,6 +14,7 @@ import subprocess
 import sys
 import tarfile
 import shutil
+import glob
 
 try:
     # python3
@@ -165,7 +166,7 @@ if __name__ == "__main__":
         )
     )
     parser.add_argument(
-        "--config", nargs='*', default='./config.json', help=(
+        "--config", nargs='*', default='./config*.json', help=(
             "Write a symlink at config.json in the extracted tarball to this \
             location. (Default: '%(default)s')"
         )
@@ -183,6 +184,9 @@ if __name__ == "__main__":
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
 
-    deployer.config_locations = { os.path.basename(c): c for c in args.config }
+    deployer.config_locations = {}
+
+    for c in args.config:
+        deployer.config_locations.update({ os.path.basename(c): pth for pth in glob.iglob(c) })
 
     deployer.deploy(args.tarball, args.extract_path)

From d957f0cdd70cc9748d23f0b32f9712299bff5683 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 15:16:42 +0100
Subject: [PATCH 65/88] released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 828e649e..b1cbe110 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.8.3-rc.1",
-    "matrix-react-sdk": "0.10.4-rc.1",
+    "matrix-js-sdk": "0.8.3",
+    "matrix-react-sdk": "0.10.4",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "prop-types": "^15.5.10",

From e814eb4555b830f29cc053a0bfd6f26d08143eef Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 15:18:17 +0100
Subject: [PATCH 66/88] v0.12.4

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index e2b34eac..5f897136 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.12.4-rc.1",
+  "version": "0.12.4",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From d96759b8ad0e16ee5a3716a1748adaf7a069fe2c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 15:19:10 +0100
Subject: [PATCH 67/88] Prepare changelog for v0.12.4

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95eb0766..9ab5a7ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.4](https://github.com/vector-im/riot-web/releases/tag/v0.12.4) (2017-09-20)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4-rc.1...v0.12.4)
+
+ * No changes
+
 Changes in [0.12.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.4-rc.1) (2017-09-19)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3...v0.12.4-rc.1)

From 2ea9fc3f9a20050b6eb4dbdbae6a62ac52f251d9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 15:19:10 +0100
Subject: [PATCH 68/88] v0.12.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b1cbe110..083bd946 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.12.4-rc.1",
+  "version": "0.12.4",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 6ff91789b2a93c1bd5b33c3fded78f24327dce1b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 17:04:31 +0100
Subject: [PATCH 69/88] Rename 'config' option to 'symlink'

because that's really all it's doing and we can use it for other
things
---
 scripts/deploy.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index e710e2c3..d80f5329 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -67,7 +67,7 @@ class Deployer:
         self.bundles_path = None
         self.should_clean = False
         # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
-        self.config_locations = {}
+        self.symlink_paths = {}
         self.verify_signature = True
 
     def deploy(self, tarball, extract_path):
@@ -99,11 +99,11 @@ class Deployer:
 
         print ("Extracted into: %s" % extracted_dir)
 
-        if self.config_locations:
-            for config_filename, config_loc in self.config_locations.iteritems():
+        if self.symlink_paths:
+            for link_path, file_path in self.symlink_paths.iteritems():
                 create_relative_symlink(
-                    target=config_loc,
-                    linkname=os.path.join(extracted_dir, config_filename)
+                    target=file_path,
+                    linkname=os.path.join(extracted_dir, link_path)
                 )
 
         if self.bundles_path:
@@ -166,9 +166,10 @@ if __name__ == "__main__":
         )
     )
     parser.add_argument(
-        "--config", nargs='*', default='./config*.json', help=(
-            "Write a symlink at config.json in the extracted tarball to this \
-            location. (Default: '%(default)s')"
+        "--symlink", nargs='*', default='./config*.json', help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
         )
     )
     parser.add_argument(
@@ -184,9 +185,11 @@ if __name__ == "__main__":
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
 
-    deployer.config_locations = {}
+    deployer.symlink_paths = {}
 
-    for c in args.config:
-        deployer.config_locations.update({ os.path.basename(c): pth for pth in glob.iglob(c) })
+    for symlink in args.symlink:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(symlink) })
+
+    print("%r", (deployer.symlink_paths,))
 
     deployer.deploy(args.tarball, args.extract_path)

From 0d4b3b41f96777da3e1bc3e2183118687369e017 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 20 Sep 2017 17:07:32 +0100
Subject: [PATCH 70/88] CSS for GroupView: Add a User

codep matrix-org/matrix-react-sdk#1402
---
 .../structures/_GroupView.scss                | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index f9932f6f..70b13599 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -160,9 +160,30 @@ limitations under the License.
     margin-top: 10px;
 }
 
+.mx_GroupView_featuredThings_container {
+    display: flex;
+}
+
+.mx_GroupView_featuredThings_addButton,
 .mx_GroupView_featuredThing {
-    cursor: pointer;
     display: table-cell;
+    text-align: center;
+
+    width: 100px;
+    margin: 0px 20px;
+}
+
+.mx_GroupView_featuredThing .mx_BaseAvatar {
+    /* To prevent misalignment with mx_TintableSvg (in addButton) */
+    vertical-align: initial;
+}
+
+.mx_GroupView_featuredThings_addButton object {
+    pointer-events: none;
+}
+
+.mx_GroupView_featuredThing_name {
+    word-wrap: break-word;
 }
 
 .mx_GroupView_uploadInput {

From b9b4ac3166d20038e2723366e6e54658f254ba22 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 17:22:47 +0100
Subject: [PATCH 71/88] Rename symlink to 'include' & add to redeploy

Because redeploy.py already has a 'symlink' option that does
something else.
---
 scripts/deploy.py   |  6 +++---
 scripts/redeploy.py | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index d80f5329..0f877ab0 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -166,7 +166,7 @@ if __name__ == "__main__":
         )
     )
     parser.add_argument(
-        "--symlink", nargs='*', default='./config*.json', help=(
+        "--include", nargs='*', default='./config*.json', help=(
             "Symlink these files into the root of the deployed tarball. \
              Useful for config files and home pages. Supports glob syntax. \
              (Default: '%(default)s')"
@@ -187,8 +187,8 @@ if __name__ == "__main__":
 
     deployer.symlink_paths = {}
 
-    for symlink in args.symlink:
-        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(symlink) })
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 
     print("%r", (deployer.symlink_paths,))
 
diff --git a/scripts/redeploy.py b/scripts/redeploy.py
index e10a48c0..a43fb8a1 100755
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -15,6 +15,7 @@ import json, requests, tarfile, argparse, os, errno
 import time
 import traceback
 from urlparse import urljoin
+import glob
 
 from flask import Flask, jsonify, request, abort
 
@@ -188,15 +189,12 @@ if __name__ == "__main__":
         )
     )
 
-    def _raise(ex):
-        raise ex
-
-    # --config config.json=../../config.json --config config.localhost.json=./localhost.json
+    # --include ../../config.json ./localhost.json homepages/*
     parser.add_argument(
-        "--config", action="append", dest="configs",
-        type=lambda kv: kv.split("=", 1) if "=" in kv else _raise(Exception("Missing =")), help=(
-            "A list of configs to symlink into the extracted tarball. \
-            For example, --config config.json=../config.json config2.json=../test/config.json"
+        "--include", nargs='*', default='./config*.json', help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
         )
     )
     parser.add_argument(
@@ -220,7 +218,11 @@ if __name__ == "__main__":
     deployer = Deployer()
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
-    deployer.config_locations = dict(args.configs) if args.configs else {}
+
+    deployer.symlink_paths = {}
+
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 
 
     # we don't pgp-sign jenkins artifacts; instead we rely on HTTPS access to
@@ -234,13 +236,13 @@ if __name__ == "__main__":
         deploy_tarball(args.tarball_uri, build_dir)
     else:
         print(
-            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Config locations: %s" %
+            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include patterns: %s" %
             (args.port,
              arg_extract_path,
              " (clean after)" if deployer.should_clean else "",
              arg_symlink,
              arg_jenkins_url,
-             deployer.config_locations,
+             deployer.symlink_paths,
             )
         )
         app.run(host="0.0.0.0", port=args.port, debug=True)

From 21d233b5af3efc8af7ac550f760c160d76e2b42e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 17:48:47 +0100
Subject: [PATCH 72/88] oops, leftover debug

---
 scripts/deploy.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index 0f877ab0..3501c250 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -190,6 +190,4 @@ if __name__ == "__main__":
     for include in args.include:
         deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 
-    print("%r", (deployer.symlink_paths,))
-
     deployer.deploy(args.tarball, args.extract_path)

From 6ec26932afcbe3618bec6d532e91f7e765536bee Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 17:54:52 +0100
Subject: [PATCH 73/88] This is the default anyway

---
 scripts/redeploy.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/redeploy.py b/scripts/redeploy.py
index a43fb8a1..fb550dcf 100755
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -219,8 +219,6 @@ if __name__ == "__main__":
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
 
-    deployer.symlink_paths = {}
-
     for include in args.include:
         deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 

From b4ea938be3feefdd79a75be6ebb5f91431897095 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 20 Sep 2017 18:17:06 +0100
Subject: [PATCH 74/88] This is the default

---
 scripts/deploy.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/deploy.py b/scripts/deploy.py
index 3501c250..e8fd9aa4 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -185,8 +185,6 @@ if __name__ == "__main__":
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
 
-    deployer.symlink_paths = {}
-
     for include in args.include:
         deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 

From 1cca4c21330acc0f05d21cec9e748eb0b100b458 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 10:26:07 +0100
Subject: [PATCH 75/88] Fix debug message to be clearer

---
 scripts/redeploy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/redeploy.py b/scripts/redeploy.py
index fb550dcf..2dac2931 100755
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -234,7 +234,7 @@ if __name__ == "__main__":
         deploy_tarball(args.tarball_uri, build_dir)
     else:
         print(
-            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include patterns: %s" %
+            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include files: %s" %
             (args.port,
              arg_extract_path,
              " (clean after)" if deployer.should_clean else "",

From 96bb804eb87adfba628e4a92c4221166dc6de42d Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 21 Sep 2017 15:04:16 +0100
Subject: [PATCH 76/88] Redesign membership section of GroupView

---
 .../structures/_GroupView.scss                | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 70b13599..712a7508 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -74,10 +74,6 @@ limitations under the License.
     display: flex;
 }
 
-.mx_GroupView_membership_buttonContainer {
-    margin-top: 10px;
-}
-
 .mx_GroupView_textButton {
     display: inline-block;
 }
@@ -134,14 +130,24 @@ limitations under the License.
     top: 5px;
 }
 
-.mx_GroupView_invitedSection {
-    width: 70%;
-    padding: 20px;
-    border: 1px solid $group-alert-color;
+.mx_GroupView_membershipSection {
     margin-left: auto;
     margin-right: auto;
-    margin-bottom: 20px;
-    text-align: center;
+    margin-bottom: 11px;
+    justify-content: space-between;
+    display: flex;
+    color: $greyed-fg-color;
+}
+
+.mx_GroupView_membershipSection_description {
+    /* To match textButton */
+    line-height: 34px;
+}
+
+.mx_GroupView_membershipSection .mx_GroupView_textButton {
+    margin-right: 0px;
+    margin-top: 0px;
+    margin-left: 8px;
 }
 
 .mx_GroupView_featuredThings {

From 96b9570465c43de69fc5b26e2284879d9c258194 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 21 Sep 2017 17:31:06 +0100
Subject: [PATCH 77/88] Update comment

---
 src/components/structures/RightPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 62adaa74..f867cd32 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -103,7 +103,7 @@ module.exports = React.createClass({
         if (this.state.phase === this.Phase.GroupMemberList) {
             showGroupInviteDialog(this.props.groupId);
         } else {
-            // call UserPickerDialog
+            // call AddressPickerDialog
             dis.dispatch({
                 action: 'view_invite',
                 roomId: this.props.roomId,

From 874e88c4a83f15fcbf40293ea6d1cdad97e55c99 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 18:05:22 +0100
Subject: [PATCH 78/88] react-sdk v0.10.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 083bd946..eea2a3fe 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.8.3",
-    "matrix-react-sdk": "0.10.4",
+    "matrix-react-sdk": "0.10.5",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "prop-types": "^15.5.10",

From f450ce422e6cea5748ad231c4c00231938d8707d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 18:06:03 +0100
Subject: [PATCH 79/88] v0.12.5

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index 5f897136..3ab6a6e9 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From dbd4cf875635ccb15ef6f63dc5aadea23e763a43 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 21 Sep 2017 18:06:41 +0100
Subject: [PATCH 80/88] Clean on prepublish (#5097)

Otherwise you can make broken releases on case insensitive file
systems
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 083bd946..5e0f56e5 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib webapp electron_app/dist",
-    "prepublish": "npm run build:compile",
+    "prepublish": "npm run clean && npm run build:compile",
     "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
     "test-multi": "karma start"
   },

From e8c347a7559e3f6342d59f6a238087f07ec5e5fa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 18:08:17 +0100
Subject: [PATCH 81/88] Prepare changelog for v0.12.5

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ab5a7ec..eb358856 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5)
+
+ * Use react-sdk v0.10.5 to fix build
+
 Changes in [0.12.4](https://github.com/vector-im/riot-web/releases/tag/v0.12.4) (2017-09-20)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4-rc.1...v0.12.4)

From fbccf22e0086b5421f21cc8cb7819405a5dc9cab Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 18:08:17 +0100
Subject: [PATCH 82/88] v0.12.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eea2a3fe..44839aad 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From aaff9133c7cad606bfad129aa38afe5796dd0bed Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 21:49:43 +0100
Subject: [PATCH 83/88] Newer js-sdk & react-sdk for js-sdk build fix

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 44839aad..4e9bb932 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.8.3",
-    "matrix-react-sdk": "0.10.5",
+    "matrix-js-sdk": "0.8.4",
+    "matrix-react-sdk": "0.10.6",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "prop-types": "^15.5.10",

From af3feccc2dbbfe23d890999d2af764ec8fee8041 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 21:50:48 +0100
Subject: [PATCH 84/88] v0.12.6

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index 3ab6a6e9..4d177690 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From b25075974c9be8d01d9edbbb123ed7588f4bd027 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 21:53:09 +0100
Subject: [PATCH 85/88] Prepare changelog for v0.12.6

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb358856..d3077644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.6](https://github.com/vector-im/riot-web/releases/tag/v0.12.6) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.5...v0.12.6)
+
+ * Use matrix-js-sdk v0.8.4 to fix build
+
 Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5)

From 2b7ee756f8945c933050b6c3a451340241c9bab2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 Sep 2017 21:53:09 +0100
Subject: [PATCH 86/88] v0.12.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4e9bb932..7d594802 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 1b67e7d60610a3d8a5d0a115d3247c9f96719170 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 22 Sep 2017 15:58:36 +0100
Subject: [PATCH 87/88] CSS for "X" in top right of features users/rooms

---
 .../css/matrix-react-sdk/structures/_GroupView.scss   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 712a7508..723a276d 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -179,6 +179,17 @@ limitations under the License.
     margin: 0px 20px;
 }
 
+.mx_GroupView_featuredThing {
+    position: relative;
+}
+
+.mx_GroupView_featuredThing .mx_GroupView_featuredThing_deleteButton {
+    position: absolute;
+    top: -7px;
+    right: 11px;
+    opacity: 0.4;
+}
+
 .mx_GroupView_featuredThing .mx_BaseAvatar {
     /* To prevent misalignment with mx_TintableSvg (in addButton) */
     vertical-align: initial;

From 813615610f96a146ee0762893cd420751b039982 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Sep 2017 19:27:36 +0100
Subject: [PATCH 88/88] CSS for publicity status & toggle button

---
 .../vector/css/matrix-react-sdk/structures/_GroupView.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 712a7508..b7ec168e 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -134,9 +134,14 @@ limitations under the License.
     margin-left: auto;
     margin-right: auto;
     margin-bottom: 11px;
+    color: $greyed-fg-color;
+}
+
+.mx_GroupView_membershipSubSection {
     justify-content: space-between;
     display: flex;
-    color: $greyed-fg-color;
+    margin-top: 2px;
+    margin-bottom: 2px;
 }
 
 .mx_GroupView_membershipSection_description {