OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10322 from vector-im/travis/remove-is-flag 

Remove unused disable_identity_server config flag
pull/10334/head
Travis Ralston 2019-07-12 08:11:52 -06:00 committed by GitHub
parent 6762727826 f3e82b56e9
commit 5379a26a1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.sample.json
View File

@ -8,7 +8,6 @@
"base_url": "https://vector.im" "base_url": "https://vector.im"
} }
}, },
"disable_identity_server": false,
"disable_custom_urls": false, "disable_custom_urls": false,
"disable_guests": false, "disable_guests": false,
"disable_login_language_selector": false, "disable_login_language_selector": false,

8
docs/config.md
View File

@ -20,10 +20,10 @@ For a good example, see https://riot.im/develop/config.json.
if `default_hs_url` is used. if `default_hs_url` is used.
* The identity server is used for verifying third party identifiers like emails * The identity server is used for verifying third party identifiers like emails
and phone numbers. It is not used to store your password or account information. and phone numbers. It is not used to store your password or account information.
If not provided, the identity server defaults to vector.im unless `disable_identity_server` If not provided, the identity server defaults to vector.im. Currently the only
is set to true in the config. Currently the only two public identity servers two public identity servers are https://matrix.org and https://vector.im, however
are https://matrix.org and https://vector.im, however in future identity servers in future identity servers will be decentralised. In the future it will be possible
will be decentralised. to disable the identity server functionality.
* Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
`default_hs_url` is specified. When multiple sources are specified, it is unclear `default_hs_url` is specified. When multiple sources are specified, it is unclear
which should take priority and therefore the application cannot continue. which should take priority and therefore the application cannot continue.

1
test/app-tests/joining.js
View File

@ -104,7 +104,6 @@ describe('joining a room', function() {
hsName: "TEST_ENVIRONMENT", hsName: "TEST_ENVIRONMENT",
hsNameIsDifferent: false, // yes, we lie hsNameIsDifferent: false, // yes, we lie
isUrl: IS_URL, isUrl: IS_URL,
identityEnabled: true,
}), }),
}; };

1
test/app-tests/loading.js
View File

@ -153,7 +153,6 @@ describe('loading:', function() {
hsName: "TEST_ENVIRONMENT", hsName: "TEST_ENVIRONMENT",
hsNameIsDifferent: false, // yes, we lie hsNameIsDifferent: false, // yes, we lie
isUrl: DEFAULT_IS_URL, isUrl: DEFAULT_IS_URL,
identityEnabled: true,
}), }),
embeddedPages: { embeddedPages: {
homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==', homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',