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

replace some of the status.im theme with general config options

This commit is contained in:
Matthew Hodgson 2017-11-11 23:47:03 +00:00
parent 47d9e7f2a1
commit 5abee4fddc
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.sample.json
View File

@ -1,6 +1,10 @@
{ {
"default_hs_url": "https://matrix.org", "default_hs_url": "https://matrix.org",
"default_is_url": "https://vector.im", "default_is_url": "https://vector.im",
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,
"brand": "Riot", "brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",

1
src/components/views/login/VectorLoginFooter.js
View File

@ -27,6 +27,7 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
// FIXME: replace this with a proper Status skin
if (UserSettingsStore.getTheme() === 'status') return <div/>; if (UserSettingsStore.getTheme() === 'status') return <div/>;
return ( return (

2
src/vector/index.js
View File

@ -332,7 +332,7 @@ async function loadApp() {
config={configJson} config={configJson}
realQueryParams={params} realQueryParams={params}
startingFragmentQueryParams={fragparts.params} startingFragmentQueryParams={fragparts.params}
enableGuest={true} enableGuest={!configJson.disable_guests}
onTokenLoginCompleted={onTokenLoginCompleted} onTokenLoginCompleted={onTokenLoginCompleted}
initialScreenAfterLogin={getScreenFromLocation(window.location)} initialScreenAfterLogin={getScreenFromLocation(window.location)}
defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()} defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}