Merge branch 'develop' into matthew/notif-panel

2016-09-11 02:38:16 +01:00 · 2016-09-11 02:38:16 +01:00 · 83209197f4
commit 83209197f4
parent 34bb37aaba 86da0e0d63
13 changed files with 461 additions and 187 deletions
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@ -92,6 +92,10 @@ module.exports = React.createClass({
        }).done();
    },

+    onCasLogin: function() {
+      this._loginLogic.redirectToCas();
+    },
+
    _onLoginAsGuestClick: function() {
        var self = this;
        self.setState({
@ -228,7 +232,7 @@ module.exports = React.createClass({
                );
            case 'm.login.cas':
                return (
-                    <CasLogin />
+                    <CasLogin onSubmit={this.onCasLogin} />
                );
            default:
                if (!step) {