imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/granular-settings

Browse source
This commit is contained in:
Travis Ralston 2017-11-14 19:12:48 -07:00
commit bd4102eb3d
14 changed files with 451 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/login/Login.js
View file

@ -370,6 +370,9 @@ module.exports = React.createClass({
}
*/
let serverConfig;
let header;
if (!SdkConfig.get().disable_custom_urls) {
serverConfig = <ServerConfig ref="serverConfig"
withToggleButton={true}
@ -381,9 +384,6 @@ module.exports = React.createClass({
delayTimeMs={1000} />;
}
let serverConfig;
let header;
// FIXME: remove status.im theme tweaks
const theme = SettingsStore.getValue("theme");
if (theme !== "status") {