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

src/components/structures/MatrixChat.js

@@ -104,6 +104,10 @@ module.exports = React.createClass({
         return "https://matrix.org";
     },
 
+    getFallbackHsUrl: function() {
+        return this.props.config.fallback_hs_url;
+    },
+
     getCurrentIsUrl: function() {
         if (this.state.register_is_url) {
             return this.state.register_is_url;
@@ -490,6 +494,7 @@ module.exports = React.createClass({
                             },
                             type: 'm.room.guest_access',
                             state_key: '',
+                            visibility: 'private',
                         }
                     ],
                 }).done(function(res) {
@@ -1157,6 +1162,7 @@ module.exports = React.createClass({
                     guestAccessToken={this.state.guestAccessToken}
                     defaultHsUrl={this.props.config.default_hs_url}
                     defaultIsUrl={this.props.config.default_is_url}
+                    brand={this.props.config.brand}
                     customHsUrl={this.getCurrentHsUrl()}
                     customIsUrl={this.getCurrentIsUrl()}
                     registrationUrl={this.props.registrationUrl}
@@ -1185,6 +1191,7 @@ module.exports = React.createClass({
                     defaultIsUrl={this.props.config.default_is_url}
                     customHsUrl={this.getCurrentHsUrl()}
                     customIsUrl={this.getCurrentIsUrl()}
+                    fallbackHsUrl={this.getFallbackHsUrl()}
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     onLoginAsGuestClick={this.props.enableGuest && this.props.config && this.props.config.default_hs_url ? this._registerAsGuest.bind(this, true) : undefined}
                     onCancelClick={ this.state.guestCreds ? this.onReturnToGuestClick : null }

src/components/structures/RoomView.js

@@ -677,6 +677,16 @@ module.exports = React.createClass({
 
     uploadFile: function(file) {
         var self = this;
+
+        if (MatrixClientPeg.get().isGuest()) {
+            var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
+            Modal.createDialog(NeedToRegisterDialog, {
+                title: "Please Register",
+                description: "Guest users can't upload files. Please register to upload."
+            });
+            return;
+        }
+
         ContentMessages.sendContentToRoom(
             file, this.state.room.roomId, MatrixClientPeg.get()
         ).done(undefined, function(error) {

src/components/structures/TimelinePanel.js

@@ -401,7 +401,7 @@ var TimelinePanel = React.createClass({
 
         // if we are scrolled to the bottom, do a quick-reset of our unreadNotificationCount
         // to avoid having to wait from the remote echo from the homeserver.
-        if (this.getScrollState().stuckAtBottom) {
+        if (this.isAtEndOfLiveTimeline()) {
             this.props.room.setUnreadNotificationCount('total', 0);
             this.props.room.setUnreadNotificationCount('highlight', 0);
             // XXX: i'm a bit surprised we don't have to emit an event or dispatch to get this picked up

src/components/structures/UserSettings.js

@@ -299,7 +299,7 @@ module.exports = React.createClass({
                             onValueChanged={ this.onAddThreepidClicked } />
                     </div>
                     <div className="mx_UserSettings_addThreepid">
-                         <img src="img/plus.svg" width="14" height="14" alt="Add" onClick={ this.onAddThreepidClicked }/>
+                         <img src="img/plus.svg" width="14" height="14" alt="Add" onClick={ this.onAddThreepidClicked.bind(this, undefined, true) }/>
                     </div>
                 </div>
             );
@@ -397,9 +397,14 @@ module.exports = React.createClass({
                         Logged in as {this._me}
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Version {this.state.clientVersion}
-                        <br />
-                        {this.props.version}
+                        Homeserver is { MatrixClientPeg.get().getHomeserverUrl() }
+                    </div>
+                    <div className="mx_UserSettings_advanced">
+                        Identity Server is { MatrixClientPeg.get().getIdentityServerUrl() }
+                    </div>
+                    <div className="mx_UserSettings_advanced">
+                        matrix-react-sdk version: {this.state.clientVersion}<br/>
+                        vector-web version: {this.props.version}<br/>
                     </div>
                 </div>
 

src/components/structures/login/Login.js

@@ -35,6 +35,10 @@ module.exports = React.createClass({displayName: 'Login',
         customIsUrl: React.PropTypes.string,
         defaultHsUrl: React.PropTypes.string,
         defaultIsUrl: React.PropTypes.string,
+        // Secondary HS which we try to log into if the user is using
+        // the default HS but login fails. Useful for migrating to a
+        // different home server without confusing users.
+        fallbackHsUrl: React.PropTypes.string,
 
         // login shouldn't know or care how registration is done.
         onRegisterClick: React.PropTypes.func.isRequired,
@@ -105,7 +109,9 @@ module.exports = React.createClass({displayName: 'Login',
         hsUrl = hsUrl || this.state.enteredHomeserverUrl;
         isUrl = isUrl || this.state.enteredIdentityServerUrl;
 
-        var loginLogic = new Signup.Login(hsUrl, isUrl);
+        var fallbackHsUrl = hsUrl == this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
+
+        var loginLogic = new Signup.Login(hsUrl, isUrl, fallbackHsUrl);
         this._loginLogic = loginLogic;
 
         loginLogic.getFlows().then(function(flows) {

src/components/structures/login/Registration.js

@@ -22,6 +22,7 @@ var sdk = require('../../../index');
 var dis = require('../../../dispatcher');
 var Signup = require("../../../Signup");
 var ServerConfig = require("../../views/login/ServerConfig");
+var MatrixClientPeg = require("../../../MatrixClientPeg");
 var RegistrationForm = require("../../views/login/RegistrationForm");
 var CaptchaForm = require("../../views/login/CaptchaForm");
 
@@ -40,6 +41,7 @@ module.exports = React.createClass({
         customIsUrl: React.PropTypes.string,
         defaultHsUrl: React.PropTypes.string,
         defaultIsUrl: React.PropTypes.string,
+        brand: React.PropTypes.string,
         email: React.PropTypes.string,
         username: React.PropTypes.string,
         guestAccessToken: React.PropTypes.string,
@@ -145,6 +147,26 @@ module.exports = React.createClass({
                 identityServerUrl: self.registerLogic.getIdentityServerUrl(),
                 accessToken: response.access_token
             });
+
+            if (self.props.brand) {
+                MatrixClientPeg.get().getPushers().done((resp)=>{
+                    var pushers = resp.pushers;
+                    for (var i = 0; i < pushers.length; ++i) {
+                        if (pushers[i].kind == 'email') {
+                            var emailPusher = pushers[i];
+                            emailPusher.data = { brand: self.props.brand };
+                            MatrixClientPeg.get().setPusher(emailPusher).done(() => {
+                                console.log("Set email branding to " + self.props.brand);
+                            }, (error) => {
+                                console.error("Couldn't set email branding: " + error);
+                            });
+                        }
+                    }
+                }, (error) => {
+                    console.error("Couldn't get pushers: " + error);
+                });
+            }
+
         }, function(err) {
             if (err.message) {
                 self.setState({