Merge remote-tracking branch 'origin/develop' into develop

CHANGELOG.md

@@ -1,3 +1,90 @@
+Changes in [0.9.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.5) (2017-06-19)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.5-rc.2...v0.9.5)
+
+ * Don't peek when creating a room
+   [\#1113](https://github.com/matrix-org/matrix-react-sdk/pull/1113)
+ * More translations & translation fixes
+
+
+Changes in [0.9.5-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.5-rc.2) (2017-06-16)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.5-rc.1...v0.9.5-rc.2)
+
+ * Avoid getting stuck in a loop in CAS login
+   [\#1109](https://github.com/matrix-org/matrix-react-sdk/pull/1109)
+ * Update from Weblate.
+   [\#1101](https://github.com/matrix-org/matrix-react-sdk/pull/1101)
+ * Correctly inspect state when rejecting invite
+   [\#1108](https://github.com/matrix-org/matrix-react-sdk/pull/1108)
+ * Make sure to pass the roomAlias to the preview header if we have it
+   [\#1107](https://github.com/matrix-org/matrix-react-sdk/pull/1107)
+ * Make sure captcha disappears when container does
+   [\#1106](https://github.com/matrix-org/matrix-react-sdk/pull/1106)
+ * Fix URL previews
+   [\#1105](https://github.com/matrix-org/matrix-react-sdk/pull/1105)
+
+Changes in [0.9.5-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.5-rc.1) (2017-06-15)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.4...v0.9.5-rc.1)
+
+ * Groundwork for tests including a teamserver login
+   [\#1098](https://github.com/matrix-org/matrix-react-sdk/pull/1098)
+ * Show a spinner when accepting an invite and waitingForRoom
+   [\#1100](https://github.com/matrix-org/matrix-react-sdk/pull/1100)
+ * Display a spinner until new room object after join success
+   [\#1099](https://github.com/matrix-org/matrix-react-sdk/pull/1099)
+ * Luke/attempt fix peeking regression
+   [\#1097](https://github.com/matrix-org/matrix-react-sdk/pull/1097)
+ * Show correct text in set email password dialog (2)
+   [\#1096](https://github.com/matrix-org/matrix-react-sdk/pull/1096)
+ * Don't create a guest login if user went to /login
+   [\#1092](https://github.com/matrix-org/matrix-react-sdk/pull/1092)
+ * Give password confirmation correct title, description
+   [\#1095](https://github.com/matrix-org/matrix-react-sdk/pull/1095)
+ * Make enter submit change password form
+   [\#1094](https://github.com/matrix-org/matrix-react-sdk/pull/1094)
+ * When not specified, remove roomAlias state in RoomViewStore
+   [\#1093](https://github.com/matrix-org/matrix-react-sdk/pull/1093)
+ * Update from Weblate.
+   [\#1091](https://github.com/matrix-org/matrix-react-sdk/pull/1091)
+ * Fixed pagination infinite loop caused by long messages
+   [\#1045](https://github.com/matrix-org/matrix-react-sdk/pull/1045)
+ * Clear persistent storage on login and logout
+   [\#1085](https://github.com/matrix-org/matrix-react-sdk/pull/1085)
+ * DM guessing: prefer oldest joined member
+   [\#1087](https://github.com/matrix-org/matrix-react-sdk/pull/1087)
+ * Ask for email address after setting password for the first time
+   [\#1090](https://github.com/matrix-org/matrix-react-sdk/pull/1090)
+ * i18n for setting password flow
+   [\#1089](https://github.com/matrix-org/matrix-react-sdk/pull/1089)
+ * remove mx_filterFlipColor from verified e2e icon so its not purple :/
+   [\#1088](https://github.com/matrix-org/matrix-react-sdk/pull/1088)
+ * width and height must be int otherwise synapse cries
+   [\#1083](https://github.com/matrix-org/matrix-react-sdk/pull/1083)
+ * remove RoomViewStore listener from MatrixChat on unmount
+   [\#1084](https://github.com/matrix-org/matrix-react-sdk/pull/1084)
+ * Add script to copy translations between files
+   [\#1082](https://github.com/matrix-org/matrix-react-sdk/pull/1082)
+ * Only process user_directory response if it's for the current query
+   [\#1081](https://github.com/matrix-org/matrix-react-sdk/pull/1081)
+ * Fix regressions with starting a 1-1.
+   [\#1080](https://github.com/matrix-org/matrix-react-sdk/pull/1080)
+ * allow forcing of TURN
+   [\#1079](https://github.com/matrix-org/matrix-react-sdk/pull/1079)
+ * Remove a bunch of dead code from react-sdk
+   [\#1077](https://github.com/matrix-org/matrix-react-sdk/pull/1077)
+ * Improve error logging/reporting in megolm import/export
+   [\#1061](https://github.com/matrix-org/matrix-react-sdk/pull/1061)
+ * Delinting
+   [\#1064](https://github.com/matrix-org/matrix-react-sdk/pull/1064)
+ * Show reason for a call hanging up unexpectedly.
+   [\#1071](https://github.com/matrix-org/matrix-react-sdk/pull/1071)
+ * Add reason for ban in room settings
+   [\#1072](https://github.com/matrix-org/matrix-react-sdk/pull/1072)
+ * adds mx_filterFlipColor so that the dark theme will invert this image
+   [\#1070](https://github.com/matrix-org/matrix-react-sdk/pull/1070)
+
 Changes in [0.9.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.4) (2017-06-14)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.3...v0.9.4)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -64,7 +64,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.11",
+    "matrix-js-sdk": "0.7.12",
     "optimist": "^0.6.1",
     "prop-types": "^15.5.8",
     "q": "^1.4.1",

src/components/structures/MatrixChat.js

@@ -133,11 +133,6 @@ module.exports = React.createClass({
             // a thing to call showScreen with once login completes.
             screenAfterLogin: this.props.initialScreenAfterLogin,
 
-            // Stashed guest credentials if the user logs out
-            // whilst logged in as a guest user (so they can change
-            // their mind & log back in)
-            guestCreds: null,
-
             // What the LoggedInView would be showing if visible
             page_type: null,
 
@@ -385,13 +380,6 @@ module.exports = React.createClass({
                 this._startRegistration(payload.params || {});
                 break;
             case 'start_login':
-                if (MatrixClientPeg.get() &&
-                    MatrixClientPeg.get().isGuest()
-                ) {
-                    this.setState({
-                        guestCreds: MatrixClientPeg.getCredentials(),
-                    });
-                }
                 this.setStateForNewView({
                     view: VIEWS.LOGIN,
                 });
@@ -947,7 +935,6 @@ module.exports = React.createClass({
     _onLoggedIn: function(teamToken) {
         this.setState({
             view: VIEWS.LOGGED_IN,
-            guestCreds: null,
         });
 
         if (teamToken) {
@@ -1270,14 +1257,9 @@ module.exports = React.createClass({
         this.showScreen("forgot_password");
     },
 
-    onReturnToGuestClick: function() {
+    onReturnToAppClick: function() {
-        // reanimate our guest login
+        // treat it the same as if the user had completed the login
-        if (this.state.guestCreds) {
+        this._onLoggedIn(null);
-            // TODO: this is probably a bit broken - we don't want to be
-            // clearing storage when we reanimate the guest creds.
-            Lifecycle.setLoggedIn(this.state.guestCreds);
-            this.setState({guestCreds: null});
-        }
     },
 
     // returns a promise which resolves to the new MatrixClient
@@ -1457,7 +1439,7 @@ module.exports = React.createClass({
                     onLoggedIn={this.onRegistered}
                     onLoginClick={this.onLoginClick}
                     onRegisterClick={this.onRegisterClick}
-                    onCancelClick={this.state.guestCreds ? this.onReturnToGuestClick : null}
+                    onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
                     />
             );
         }
@@ -1491,7 +1473,7 @@ module.exports = React.createClass({
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     enableGuest={this.props.enableGuest}
-                    onCancelClick={this.state.guestCreds ? this.onReturnToGuestClick : null}
+                    onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
                 />
             );
         }

src/components/structures/ScrollPanel.js

@@ -160,10 +160,6 @@ module.exports = React.createClass({
         this.checkFillState();
     },
 
-    componentWillUpdate: function(nextProps, nextState) {
-        this._saveScrollState();
-    },
-
     componentDidUpdate: function() {
         // after adding event tiles, we may need to tweak the scroll (either to
         // keep at the bottom of the timeline, or to maintain the view after