gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into kegan/reg-refactor

This commit is contained in:
Kegan Dougal 2015-11-17 17:43:22 +00:00
parent 8e8b27c893 714c96283e
commit ed3527e243
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/login/Login.js
View File

@ -20,8 +20,8 @@ var React = require('react');
var ReactDOM = require('react-dom'); var ReactDOM = require('react-dom');
var sdk = require('matrix-react-sdk'); var sdk = require('matrix-react-sdk');
var Signup = require("matrix-react-sdk/lib/Signup"); var Signup = require("matrix-react-sdk/lib/Signup");
var PasswordLogin = require("matrix-react-sdk/lib/components/PasswordLogin"); var PasswordLogin = require("matrix-react-sdk/lib/components/login/PasswordLogin");
var CasLogin = require("matrix-react-sdk/lib/components/CasLogin"); var CasLogin = require("matrix-react-sdk/lib/components/login/CasLogin");
var ServerConfig = require("./ServerConfig"); var ServerConfig = require("./ServerConfig");
/** /**

10
src/skins/vector/views/pages/MatrixChat.js
View File

@ -23,10 +23,12 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');
var Matrix = require("matrix-js-sdk"); var Matrix = require("matrix-js-sdk");
var ContextualMenu = require("../../../../ContextualMenu") var ContextualMenu = require("../../../../ContextualMenu")
var Login = require("../../../../components/login/Login"); var Login = require("../../../../components/login/Login");
var Registration = require("../../../../components/login/Registration"); var Registration = require("../../../../components/login/Registration");
var Signup = require("matrix-react-sdk/lib/Signup"); var Signup = require("matrix-react-sdk/lib/Signup");
var config = require("../../../../../config.json");
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MatrixChat', displayName: 'MatrixChat',
@ -178,12 +180,16 @@ module.exports = React.createClass({
onLoggedIn={this.onLoggedIn} onLoggedIn={this.onLoggedIn}
onLoginClick={this.onLoginClick} onLoginClick={this.onLoginClick}
registerLogic={new Signup.Register( registerLogic={new Signup.Register(
"foo", "bar" config.default_hs_url, config.default_is_url
)} /> )} />
); );
} else { } else {
return ( return (
<Login onLoggedIn={this.onLoggedIn} onRegisterClick={this.onRegisterClick} /> <Login
onLoggedIn={this.onLoggedIn}
onRegisterClick={this.onRegisterClick}
homeserverUrl={config.default_hs_url}
identityServerUrl={config.default_is_url} />
); );
} }
} }