Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access

This commit is contained in:
Luke Barnard 2017-05-30 16:11:11 +01:00
commit b51f5ac6d1

View File

@ -685,7 +685,7 @@ module.exports = React.createClass({
onLoginClick: (ev) => {
dis.dispatch({action: 'start_login'});
close();
},
},
}).close;
},
@ -991,6 +991,11 @@ module.exports = React.createClass({
dis.dispatch({
action: 'view_home_page',
});
} else if (screen == 'start') {
this.showScreen('home');
dis.dispatch({
action: 'view_set_mxid',
});
} else if (screen == 'directory') {
dis.dispatch({
action: 'view_room_directory',