StatusBarArea height of 50px when typing/calling

Change the height of the StatusBar (and for calls, typing) to 48px such that with the StatusAreaBox_line, they add to 50px.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,44 @@
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 0.x.y <!-- check the user settings panel if unsure -->

CHANGELOG.md

@@ -1,3 +1,18 @@
+Changes in [0.9.7](https://github.com/vector-im/riot-web/releases/tag/v0.9.7) (2017-02-04)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.3...v0.9.7)
+
+ * Update to matrix-js-sdk 0.7.5 (no changes from 0.7.5-rc.3)
+ * Update to matrix-react-sdk 0.8.6 (no changes from 0.8.6-rc.3)
+
+Changes in [0.9.7-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.3) (2017-02-03)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.2...v0.9.7-rc.3)
+ * Update to latest Olm to fix key import/export and use of megolm sessions
+   created on more recent versions
+ * Update to latest matrix-react-sdk and matrix-js-sdk to fix e2e device
+   handling
+
 Changes in [0.9.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.2) (2017-02-03)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.1...v0.9.7-rc.2)
@@ -5,7 +20,6 @@ Changes in [0.9.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.
  * Update matrix-js-sdk to get new device change
    notifications interface for more reliable e2e crypto
 
-
 Changes in [0.9.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.1) (2017-02-03)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.6...v0.9.7-rc.1)

CONTRIBUTING.rst

@@ -1,4 +1,4 @@
-Contributing code to Vector
-===========================
+Contributing code to Riot
+=========================
 
-Vector follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
+Riot follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst.

README.md

@@ -21,6 +21,9 @@ released version of Riot:
    as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!
 
+Releases are signed by PGP, and can be checked against the public key
+at https://riot.im/packages/keys/riot-master.asc
+
 Note that Chrome does not allow microphone or webcam access for sites served
 over http (except localhost), so for working VoIP you will need to serve Riot
 over https.

electron/riot.im/config.json

@@ -5,6 +5,7 @@
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
+    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "enableLabs": true,
     "roomDirectory": {
         "servers": [

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron/src/electron-main.js",
-  "version": "0.9.7-rc.2",
+  "version": "0.9.7",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {
@@ -62,8 +62,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.5-rc.2",
-    "matrix-react-sdk": "0.8.6-rc.2",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "q": "^1.4.1",
     "react": "^15.4.0",
@@ -133,7 +133,7 @@
     "webpack-dev-server": "^1.16.2"
   },
   "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-2.1.0.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
   },
   "build": {
     "appId": "im.riot.app",

res/vector-icons/manifest.json

@@ -2,37 +2,37 @@
 	"name": "Riot",
 	"icons": [
 		{
-			"src": "\/icons\/android-chrome-36x36.png",
+			"src": "android-chrome-36x36.png",
 			"sizes": "36x36",
 			"type": "image\/png",
 			"density": "0.75"
 		},
 		{
-			"src": "\/icons\/android-chrome-48x48.png",
+			"src": "android-chrome-48x48.png",
 			"sizes": "48x48",
 			"type": "image\/png",
 			"density": "1.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-72x72.png",
+			"src": "android-chrome-72x72.png",
 			"sizes": "72x72",
 			"type": "image\/png",
 			"density": "1.5"
 		},
 		{
-			"src": "\/icons\/android-chrome-96x96.png",
+			"src": "android-chrome-96x96.png",
 			"sizes": "96x96",
 			"type": "image\/png",
 			"density": "2.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-144x144.png",
+			"src": "android-chrome-144x144.png",
 			"sizes": "144x144",
 			"type": "image\/png",
 			"density": "3.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-192x192.png",
+			"src": "android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png",
 			"density": "4.0"

scripts/jenkins.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-export NVM_DIR="/home/jenkins/.nvm"
+export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 nvm use 6
 
@@ -11,13 +11,18 @@ set -x
 npm install
 
 # apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install matrix-react-sdk matrix-js-sdk
+npm install matrix-react-sdk matrix-js-sdk olm
 
 # install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
 # from our package.json (or even matrix-js-sdk's) in preference.
-tar -C olm -xz < olm/olm-*.tgz
-rm -r node_modules/olm
-cp -r olm/package node_modules/olm
+#
+# disabled for now, to avoid the annoying scenario of a release doing something
+# different to /develop. Instead, add it to the 'npm install' list above.
+# -- rav 2016/02/03
+#tar -C olm -xz < olm/olm-*.tgz
+#rm -r node_modules/olm
+#cp -r olm/package node_modules/olm
+
 
 # we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
 (cd node_modules/matrix-js-sdk && npm install)

scripts/rageshake.go

@@ -0,0 +1,146 @@
+// Run a web server capable of dumping bug reports sent by Riot.
+// Requires Go 1.5+
+// Usage:   BUGS_USER=user BUGS_PASS=password go run rageshake.go PORT
+// Example: BUGS_USER=alice BUGS_PASS=secret go run rageshake.go 8080
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"crypto/subtle"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"time"
+)
+
+var maxPayloadSize = 1024 * 1024 * 55 // 55 MB
+
+type LogEntry struct {
+	ID    string `json:"id"`
+	Lines string `json:"lines"`
+}
+
+type Payload struct {
+	Text      string     `json:"text"`
+	Version   string     `json:"version"`
+	UserAgent string     `json:"user_agent"`
+	Logs      []LogEntry `json:"logs"`
+}
+
+func respond(code int, w http.ResponseWriter) {
+	w.WriteHeader(code)
+	w.Write([]byte("{}"))
+}
+
+func gzipAndSave(data []byte, dirname, fpath string) error {
+	_ = os.MkdirAll(filepath.Join("bugs", dirname), os.ModePerm)
+	fpath = filepath.Join("bugs", dirname, fpath)
+
+	if _, err := os.Stat(fpath); err == nil {
+		return fmt.Errorf("file already exists") // the user can just retry
+	}
+	var b bytes.Buffer
+	gz := gzip.NewWriter(&b)
+	if _, err := gz.Write(data); err != nil {
+		return err
+	}
+	if err := gz.Flush(); err != nil {
+		return err
+	}
+	if err := gz.Close(); err != nil {
+		return err
+	}
+	if err := ioutil.WriteFile(fpath, b.Bytes(), 0644); err != nil {
+		return err
+	}
+	return nil
+}
+
+func basicAuth(handler http.Handler, username, password, realm string) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		user, pass, ok := r.BasicAuth() // pull creds from the request
+
+		// check user and pass securely
+		if !ok || subtle.ConstantTimeCompare([]byte(user), []byte(username)) != 1 || subtle.ConstantTimeCompare([]byte(pass), []byte(password)) != 1 {
+			w.Header().Set("WWW-Authenticate", `Basic realm="`+realm+`"`)
+			w.WriteHeader(401)
+			w.Write([]byte("Unauthorised.\n"))
+			return
+		}
+
+		handler.ServeHTTP(w, r)
+	})
+}
+
+func main() {
+	http.HandleFunc("/api/submit", func(w http.ResponseWriter, req *http.Request) {
+		if req.Method != "POST" && req.Method != "OPTIONS" {
+			respond(405, w)
+			return
+		}
+		// Set CORS
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
+		w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
+		if req.Method == "OPTIONS" {
+			respond(200, w)
+			return
+		}
+		if length, err := strconv.Atoi(req.Header.Get("Content-Length")); err != nil || length > maxPayloadSize {
+			respond(413, w)
+			return
+		}
+		var p Payload
+		if err := json.NewDecoder(req.Body).Decode(&p); err != nil {
+			respond(400, w)
+			return
+		}
+		// Dump bug report to disk as form:
+		//  "bugreport-20170115-112233.log.gz" => user text, version, user agent, # logs
+		//  "bugreport-20170115-112233-0.log.gz" => most recent log
+		//  "bugreport-20170115-112233-1.log.gz" => ...
+		//  "bugreport-20170115-112233-N.log.gz" => oldest log
+		t := time.Now().UTC()
+		prefix := t.Format("2006-01-02/150405")
+		summary := fmt.Sprintf(
+			"%s\n\nNumber of logs: %d\nVersion: %s\nUser-Agent: %s\n", p.Text, len(p.Logs), p.Version, p.UserAgent,
+		)
+		if err := gzipAndSave([]byte(summary), prefix, "details.log.gz"); err != nil {
+			respond(500, w)
+			return
+		}
+		for i, log := range p.Logs {
+			if err := gzipAndSave([]byte(log.Lines), prefix, fmt.Sprintf("logs-%d.log.gz", i)); err != nil {
+				respond(500, w)
+				return // TODO: Rollback?
+			}
+		}
+		respond(200, w)
+	})
+
+	// Make sure bugs directory exists
+	_ = os.Mkdir("bugs", os.ModePerm)
+
+	// serve files under "bugs"
+	fs := http.FileServer(http.Dir("bugs"))
+	fs = http.StripPrefix("/api/listing/", fs)
+
+	// set auth if env vars exist
+	usr := os.Getenv("BUGS_USER")
+	pass := os.Getenv("BUGS_PASS")
+	if usr == "" || pass == "" {
+		fmt.Println("BUGS_USER and BUGS_PASS env vars not found. No authentication is running for /api/listing")
+	} else {
+		fs = basicAuth(fs, usr, pass, "Riot bug reports")
+	}
+	http.Handle("/api/listing/", fs)
+
+	port := os.Args[1]
+	log.Fatal(http.ListenAndServe(":"+port, nil))
+}

src/component-index.js

@@ -34,6 +34,8 @@ import structures$LeftPanel from './components/structures/LeftPanel';
 structures$LeftPanel && (module.exports.components['structures.LeftPanel'] = structures$LeftPanel);
 import structures$RightPanel from './components/structures/RightPanel';
 structures$RightPanel && (module.exports.components['structures.RightPanel'] = structures$RightPanel);
+import structures$HomePage from './components/structures/HomePage';
+structures$HomePage && (module.exports.components['structures.HomePage'] = structures$HomePage);
 import structures$RoomDirectory from './components/structures/RoomDirectory';
 structures$RoomDirectory && (module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory);
 import structures$RoomSubList from './components/structures/RoomSubList';

src/components/structures/BottomLeftMenu.js

@@ -27,12 +27,14 @@ module.exports = React.createClass({
 
     propTypes: {
         collapsed: React.PropTypes.bool.isRequired,
+        teamToken: React.PropTypes.string,
     },
 
     getInitialState: function() {
         return({
             directoryHover : false,
             roomsHover : false,
+            homeHover: false,
             peopleHover : false,
             settingsHover : false,
         });
@@ -63,6 +65,19 @@ module.exports = React.createClass({
         this.setState({ roomsHover: false });
     },
 
+    // Home button events
+    onHomeClick: function() {
+        dis.dispatch({ action: 'view_home_page' });
+    },
+
+    onHomeMouseEnter: function() {
+        this.setState({ homeHover: true });
+    },
+
+    onHomeMouseLeave: function() {
+        this.setState({ homeHover: false });
+    },
+
     // People events
     onPeopleClick: function() {
         dis.dispatch({ action: 'view_create_chat' });
@@ -99,9 +114,21 @@ module.exports = React.createClass({
 
     render: function() {
         var TintableSvg = sdk.getComponent('elements.TintableSvg');
+
+        var homeButton;
+        if (this.props.teamToken) {
+            homeButton = (
+                <AccessibleButton className="mx_BottomLeftMenu_homePage" onClick={ this.onHomeClick } onMouseEnter={ this.onHomeMouseEnter } onMouseLeave={ this.onHomeMouseLeave } >
+                    <TintableSvg src="img/icons-home.svg" width="25" height="25" />
+                    { this.getLabel("Welcome page", this.state.homeHover) }
+                </AccessibleButton>
+            );
+        }
+
         return (
             <div className="mx_BottomLeftMenu">
                 <div className="mx_BottomLeftMenu_options">
+                    { homeButton }
                     <AccessibleButton className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } >
                         <TintableSvg src="img/icons-people.svg" width="25" height="25" />
                         { this.getLabel("Start chat", this.state.peopleHover) }

src/components/structures/HomePage.js

@@ -0,0 +1,40 @@
+/*
+Copyright 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.
+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 from 'react';
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import sdk from 'matrix-react-sdk';
+
+module.exports = React.createClass({
+    displayName: 'HomePage',
+
+    propTypes: {
+        teamServerUrl: React.PropTypes.string.isRequired,
+        teamToken: React.PropTypes.string.isRequired,
+        collapsedRhs: React.PropTypes.bool,
+    },
+
+    render: function() {
+        return (
+        <div className="mx_HomePage">
+            <iframe src={`${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`}/>
+        </div>
+        );
+    }
+});

src/components/structures/LeftPanel.js

@@ -28,6 +28,11 @@ var CallHandler = require("matrix-react-sdk/lib/CallHandler");
 var LeftPanel = React.createClass({
     displayName: 'LeftPanel',
 
+    propTypes: {
+        collapsed: React.PropTypes.bool.isRequired,
+        teamToken: React.PropTypes.string,
+    },
+
     getInitialState: function() {
         return {
             showCallElement: null,
@@ -124,7 +129,7 @@ var LeftPanel = React.createClass({
                     collapsed={this.props.collapsed}
                     searchFilter={this.state.searchFilter}
                     ConferenceHandler={VectorConferenceHandler} />
-                <BottomLeftMenu collapsed={this.props.collapsed}/>
+                <BottomLeftMenu collapsed={this.props.collapsed} teamToken={this.props.teamToken}/>
             </aside>
         );
     }

src/components/views/context_menus/RoomTagContextMenu.js

@@ -16,13 +16,15 @@ limitations under the License.
 
 'use strict';
 
-var q = require("q");
-var React = require('react');
-var classNames = require('classnames');
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var DMRoomMap = require('matrix-react-sdk/lib/utils/DMRoomMap');
-var Rooms = require('matrix-react-sdk/lib/Rooms');
+import q from 'q';
+import React from 'react';
+import classNames from 'classnames';
+import sdk from 'matrix-react-sdk';
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import dis from 'matrix-react-sdk/lib/dispatcher';
+import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
+import Rooms from 'matrix-react-sdk/lib/Rooms';
+import Modal from 'matrix-react-sdk/lib/Modal';
 
 module.exports = React.createClass({
     displayName: 'RoomTagContextMenu',
@@ -214,7 +216,7 @@ module.exports = React.createClass({
             'mx_RoomTagContextMenu_fieldDisabled': false,
         });
 
-        if (myMember && myMember.membership === "leave") {
+        if (myMember && (myMember.membership === "leave" || myMember.membership === "ban")) {
             return (
                 <div>
                     <div className={ leaveClasses } onClick={ this._onClickForget } >

src/skins/vector/css/_common.scss

@@ -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.
@@ -152,6 +153,7 @@ textarea {
     font-size: 15px;
     position: relative;
     padding-left: 58px;
+    padding-bottom: 36px;
     width: 60%;
     max-width: 704px;
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
@@ -184,6 +186,13 @@ textarea {
     pointer-events: none;
 }
 
+.mx_Dialog_cancelButton {
+    float: right;
+    margin-top: 5px;
+    margin-right: 5px;
+    cursor: pointer;
+}
+
 .mx_Dialog_content {
     margin: 24px 58px 68px 0;
     font-size: 14px;
@@ -191,10 +200,6 @@ textarea {
     word-wrap: break-word;
 }
 
-.mx_Dialog_buttons {
-    padding-bottom: 36px;
-}
-
 .mx_Dialog button, .mx_Dialog input[type="submit"] {
     border: 0px;
     height: 36px;
@@ -286,6 +291,10 @@ textarea {
     display: inline;
 }
 
+.mx_button_row {
+    margin-top: 69px;
+}
+
 .changelog_text {
     font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
 }

src/skins/vector/css/_components.scss

@@ -14,6 +14,7 @@
 @import "./matrix-react-sdk/views/avatars/_BaseAvatar.scss";
 @import "./matrix-react-sdk/views/dialogs/_BugReportDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_SetDisplayNameDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
@@ -53,6 +54,7 @@
 @import "./matrix-react-sdk/views/voip/_VideoView.scss";
 @import "./vector-web/_fonts.scss";
 @import "./vector-web/structures/_CompatibilityPage.scss";
+@import "./vector-web/structures/_HomePage.scss";
 @import "./vector-web/structures/_LeftPanel.scss";
 @import "./vector-web/structures/_RightPanel.scss";
 @import "./vector-web/structures/_RoomDirectory.scss";

src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss

@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_RoomStatusBar {
     margin-left: 65px;
-    min-height: 34px;
+    min-height: 48px;
 }
 
 /* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
@@ -24,15 +24,15 @@ limitations under the License.
     padding-left: 17px;
     padding-right: 12px;
     margin-left: -73px;
-    margin-top: 8px;
+    margin-top: 15px;
     float: left;
     width: 24px;
     text-align: center;
 }
 
 .mx_RoomStatusBar_callBar {
-    height: 50px;
-    line-height: 50px;
+    height: 48px;
+    line-height: 48px;
 }
 
 .mx_RoomStatusBar_placeholderIndicator span {
@@ -72,6 +72,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_typingIndicatorAvatars {
     width: 52px;
+    margin-top: -1px;
     text-align: left;
 }
 
@@ -102,6 +103,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_scrollDownIndicator {
     cursor: pointer;
+    padding-left: 1px;
 }
 
 .mx_RoomStatusBar_unreadMessagesBar {
@@ -112,7 +114,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_connectionLostBar {
     margin-top: 19px;
-    height: 58px;
+    min-height: 58px;
 }
 
 .mx_RoomStatusBar_connectionLostBar img {
@@ -144,7 +146,9 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_typingBar {
-    padding-top: 10px;
+    height: 48px;
+    line-height: 48px;
+
     color: $primary-fg-color;
     opacity: 0.5;
     overflow-y: hidden;

src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss

@@ -207,10 +207,12 @@ hr.mx_RoomView_myReadMarker {
 
 .mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
     border-top: 1px hidden;
+    padding-top: 1px;
 }
 
 .mx_RoomView_inCall .mx_MessageComposer_wrapper {
     border-top: 2px hidden;
+    padding-top: 1px;
 }
 
 .mx_RoomView_inCall .mx_RoomView_statusAreaBox {

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -101,6 +101,15 @@ limitations under the License.
     padding-right: 1em;
 }
 
+.mx_UserSettings_importExportButtons {
+    padding-top: 10px;
+    padding-left: 40px;
+}
+
+.mx_UserSettings_importExportButtons .mx_UserSettings_button {
+    margin-right: 1em;
+}
+
 .mx_UserSettings_toggle input {
     width: 16px;
     margin-right: 8px;

src/skins/vector/css/matrix-react-sdk/views/avatars/_BaseAvatar.scss

@@ -20,7 +20,6 @@ limitations under the License.
 
 .mx_BaseAvatar_initial {
     position: absolute;
-    z-index: 1;
     color: $avatar-initial-color;
     text-align: center;
     speak: none;

src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss

@@ -0,0 +1,35 @@
+/*
+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.
+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_ConfirmUserActionDialog_avatar {
+    float: left;
+    margin-right: 20px;
+}
+
+.mx_ConfirmUserActionDialog_name {
+    font-size: 150%;
+}
+
+.mx_ConfirmUserActionDialog_userId {
+    font-style: italic;
+}
+
+.mx_ConfirmUserActionDialog_reasonField {
+    margin-bottom: 40px;
+    width: 90%;
+    font-size: 120%;
+    height: 35px;
+}

src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss

@@ -1,3 +1,7 @@
+// XXX: bleurgh, what is this? These classes totally break the component
+// naming scheme; it's completely unclear where or how they're being used
+// --Matthew
+
 .mx_UserPill {
     color: white;
     background-color: $accent-color;
@@ -25,13 +29,13 @@
     padding: .2em 0;
     margin: 0;
     font-size: 85%;
-    background-color: rgba(0,0,0,.04);
+    background-color: $rte-code-bg-color;
     border-radius: 3px;
 }
 
 .mx_Markdown_HR {
     display: block;
-    background: #e7e7e7;
+    background: $rte-bg-color;
 }
 
 .mx_Markdown_STRIKETHROUGH {

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -251,6 +251,12 @@ limitations under the License.
     padding-left: 60px;
 }
 
+.mx_EventTile_selected .mx_EventTile_info .mx_EventTile_line,
+.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_info .mx_EventTile_line,
+.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_info .mx_EventTile_line {
+    padding-left: 78px;
+}
+
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
     border-left: $e2e-verified-color 5px solid;
 }

src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberInfo.scss

@@ -48,11 +48,10 @@ limitations under the License.
 }
 
 .mx_MemberInfo_avatar .mx_BaseAvatar {
-    cursor: not-allowed;
 }
 
 .mx_MemberInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
-    cursor: pointer;
+    cursor: zoom-in;
 }
 
 .mx_MemberInfo_profile {

src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss

@@ -28,7 +28,7 @@ limitations under the License.
 }
 
 .mx_MemberList .mx_Spinner {
-    flex: 0;
+    flex: 0 0 auto;
 }
 
 .mx_MemberList_chevron {

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss

@@ -22,6 +22,8 @@ limitations under the License.
     flex-direction: column;
     justify-content: center;
     display: flex;
+    background-color: $preview-bar-bg-color;
+    -webkit-align-items: center;
 }
 
 .mx_RoomPreviewBar_wrapper {

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss

@@ -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.
@@ -20,6 +21,7 @@ limitations under the License.
 }
 
 .mx_RoomSettings_leaveButton,
+.mx_RoomSettings_unbanButton,
 .mx_RoomSettings_integrationsButton,
 .mx_RoomSettings_integrationsButton_error {
     position: relative;
@@ -30,11 +32,15 @@ limitations under the License.
     color: $accent-fg-color;
     line-height: 34px;
     text-align: center;
-    float: right;
     cursor: pointer;
     padding-left: 12px;
     padding-right: 12px;
 }
+.mx_RoomSettings_leaveButton,
+.mx_RoomSettings_integrationsButton,
+.mx_RoomSettings_integrationsButton_error {
+    float: right;
+}
 .mx_RoomSettings_integrationsButton_error {
     pointer: not-allowed;
 }
@@ -50,6 +56,9 @@ limitations under the License.
     background-color: $accent-color;
     color: $accent-fg-color;
 }
+.mx_RoomSettings_unbanButton {
+    display: inline;
+}
 
 .mx_RoomSettings_e2eIcon {
     padding-left: 4px;
@@ -227,4 +236,4 @@ limitations under the License.
     padding: 6px;
     padding-left: 1em;
     padding-right: 1em;
-}
+}

src/skins/vector/css/matrix-react-sdk/views/settings/_IntegrationsManager.scss

@@ -24,7 +24,7 @@ limitations under the License.
 }
 
 .mx_IntegrationsManager iframe {
-    background-color: $primary-bg-color;
+    background-color: #fff;
     border: 0px;
     width: 100%;
     height: 100%;

src/skins/vector/css/themes/_base.scss

@@ -18,6 +18,8 @@ $selection-fg-color: $primary-bg-color;
 // red warning colour
 $warning-color: #ff0064;
 
+$preview-bar-bg-color: #f7f7f7;
+
 // left-panel style muted accent color
 $secondary-accent-color: #eaf5f0;
 
@@ -72,6 +74,9 @@ $settings-grey-fg-color: #a2a2a2;
 $voip-decline-color: #f48080;
 $voip-accept-color: #80f480;
 
+$rte-bg-color: #e9e9e9;
+$rte-code-bg-color: rgba(0, 0, 0, 0.04);
+
 // ********************
 
 $roomtile-name-color: rgba(69, 69, 69, 0.8);

src/skins/vector/css/themes/_dark.scss

@@ -13,11 +13,13 @@ $light-fg-color: #747474;
 $accent-fg-color: $primary-bg-color;
 $accent-color: #76CFA6;
 
-$selection-fg-color: $primary-bg-color;
+$selection-fg-color: $primary-fg-color;
 
 // red warning colour
 $warning-color: #ff0064;
 
+$preview-bar-bg-color: #333;
+
 // left-panel style muted accent color
 $secondary-accent-color: $primary-bg-color;
 
@@ -28,7 +30,7 @@ $plinth-bg-color: #474747;
 $droptarget-bg-color: rgba(45,45,45,0.5);
 
 // used by AddressSelector
-$selected-color: #eaf5f0;
+$selected-color: #000000;
 
 // selected for hoverover & selected event tiles
 $event-selected-color: #353535;
@@ -72,6 +74,9 @@ $settings-grey-fg-color: #a2a2a2;
 $voip-decline-color: #f48080;
 $voip-accept-color: #80f480;
 
+$rte-bg-color: #353535;
+$rte-code-bg-color: #000;
+
 // ********************
 
 $roomtile-name-color: rgba(186, 186, 186, 0.8);
@@ -85,7 +90,7 @@ $roomsublist-label-bg-color: #454545;
 
 // event tile lifecycle
 $event-encrypting-color: rgba(171, 221, 188, 0.4);
-$event-sending-color: #ddd;
+$event-sending-color: #888;
 $event-notsent-color: #f44;
 
 // event timestamp
@@ -117,11 +122,23 @@ $progressbar-color: #000;
     filter: invert();
 }
 
-.mx_EventTile_content .markdown-body pre,
-.mx_EventTile_content .markdown-body code {
-    filter: invert();
-}
+// markdown overrides:
+.mx_EventTile_content .markdown-body {
+    pre, code {
+        filter: invert();
+    }
 
-.mx_EventTile_content .markdown-body pre code {
-    filter: none;
-}
+    pre code {
+        filter: none;
+    }
+
+    table {
+        tr {
+            background-color: #000000;
+        }
+
+        tr:nth-child(2n) {
+            background-color: #080808;
+        }
+    }
+}

src/skins/vector/css/vector-web/structures/_HomePage.scss

@@ -0,0 +1,32 @@
+/*
+Copyright 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.
+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_HomePage {
+    max-width: 960px;
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+.mx_HomePage iframe {
+	width: 100%;
+	height: 90%;
+	border: 0px;
+}
+
+.mx_HomePage_body {
+    margin-left: 63px;
+}

src/skins/vector/css/vector-web/structures/_LeftPanel.scss

@@ -64,6 +64,7 @@ limitations under the License.
     pointer-events: none;
 }
 
+.mx_LeftPanel .mx_BottomLeftMenu_homePage,
 .mx_LeftPanel .mx_BottomLeftMenu_directory,
 .mx_LeftPanel .mx_BottomLeftMenu_createRoom,
 .mx_LeftPanel .mx_BottomLeftMenu_people,
@@ -72,6 +73,7 @@ limitations under the License.
     cursor: pointer;
 }
 
+.collapsed .mx_BottomLeftMenu_homePage,
 .collapsed .mx_BottomLeftMenu_directory,
 .collapsed .mx_BottomLeftMenu_createRoom,
 .collapsed .mx_BottomLeftMenu_people,
@@ -81,6 +83,7 @@ limitations under the License.
     padding-bottom: 3px ! important;
 }
 
+.mx_LeftPanel .mx_BottomLeftMenu_homePage,
 .mx_LeftPanel .mx_BottomLeftMenu_directory,
 .mx_LeftPanel .mx_BottomLeftMenu_createRoom,
 .mx_LeftPanel .mx_BottomLeftMenu_people {

src/skins/vector/css/vector-web/structures/_RightPanel.scss

@@ -42,7 +42,7 @@ limitations under the License.
 
 .mx_RightPanel_headerButton {
     cursor: pointer;
-    flex: 0;
+    flex: 0 0 auto;
     vertical-align: top;
     padding-left: 4px;
     padding-right: 5px;

src/skins/vector/img/icons-home.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
+<style type="text/css">
+	.st1{fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<g id="Layer_1">
+	<title>81230A28-D944-4572-B5DB-C03CAA2B1FCA</title>
+	<desc>Created with sketchtool.</desc>
+	<g id="Symbols">
+		<g id="Left-nav-default" transform="translate(-50.000000, -725.000000)">
+			<g id="Left-panel">
+				<g>
+					<g id="icons_people" transform="translate(50.000000, 725.000000)">
+						<path id="Oval-1-Copy-7" fill="#76cfa6" d="M12.5,25C19.4,25,25,19.4,25,12.5S19.4,0,12.5,0S0,5.6,0,12.5S5.6,25,12.5,25z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="Layer_2">
+	<rect x="7.8" y="10.7" class="st1" stroke="#ffffff" width="9.4" height="7.4"/>
+	<polygon class="st1" stroke="#ffffff" points="12.5,6 6.2,10.7 18.8,10.7 	"/>
+</g>
+</svg>

src/vector/index.html

@@ -62,24 +62,5 @@
         <source src="media/busy.mp3" type="audio/mpeg" />
     </audio>
     <audio id="remoteAudio"/>
-    <script>
-        if (
-                window.location.host === 'www.vector.im' ||
-                window.location.host === 'vector.im' ||
-                window.location.host === 'www.riot.im' ||
-                window.location.host === 'riot.im'
-            ) {
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-            ga('create', 'UA-54779209-2', 'auto');
-            ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash);
-        }
-        else {
-            var ga = null;
-        }
-    </script>
   </body>
 </html>

src/vector/index.js

@@ -135,7 +135,6 @@ var onNewScreen = function(screen) {
         var hash = '#/' + screen;
         lastLocationHashSet = hash;
         window.location.hash = hash;
-        if (ga) ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash);
     }
 }
 

test/app-tests/joining.js

@@ -95,7 +95,10 @@ describe('joining a room', function () {
             });
 
             var roomView;
-            httpBackend.flush().then(() => {
+            // wait for /sync to happen
+            return q.delay(1).then(() => {
+                return httpBackend.flush();
+            }).then(() => {
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomDirectory);